* [PR PATCH] budgie-desktop: update to 10.7.
@ 2023-01-29 19:57 TrueTechie
2023-02-09 1:18 ` [PR PATCH] [Updated] " TrueTechie
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: TrueTechie @ 2023-01-29 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
There is a new pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 1739 bytes --]
From 2226302c32a8917ea2645499751631b523b3ee40 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Sun, 29 Jan 2023 14:06:02 -0500
Subject: [PATCH] budgie-desktop: update to 10.7.
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
@ 2023-02-09 1:18 ` TrueTechie
2023-02-10 22:48 ` paper42
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-09 1:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 1739 bytes --]
From 2226302c32a8917ea2645499751631b523b3ee40 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Sun, 29 Jan 2023 14:06:02 -0500
Subject: [PATCH] budgie-desktop: update to 10.7.
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
2023-02-09 1:18 ` [PR PATCH] [Updated] " TrueTechie
@ 2023-02-10 22:48 ` paper42
2023-02-10 23:59 ` [PR PATCH] [Updated] " TrueTechie
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: paper42 @ 2023-02-10 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1426444075
Comment:
please rebase this PR on top of master to get rid of the merge commit
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
2023-02-09 1:18 ` [PR PATCH] [Updated] " TrueTechie
2023-02-10 22:48 ` paper42
@ 2023-02-10 23:59 ` TrueTechie
2023-02-11 0:12 ` TrueTechie
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-10 23:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 1739 bytes --]
From 2226302c32a8917ea2645499751631b523b3ee40 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Sun, 29 Jan 2023 14:06:02 -0500
Subject: [PATCH] budgie-desktop: update to 10.7.
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (2 preceding siblings ...)
2023-02-10 23:59 ` [PR PATCH] [Updated] " TrueTechie
@ 2023-02-11 0:12 ` TrueTechie
2023-02-11 0:12 ` TrueTechie
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-11 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 853299 bytes --]
From 2226302c32a8917ea2645499751631b523b3ee40 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Sun, 29 Jan 2023 14:06:02 -0500
Subject: [PATCH 001/356] budgie-desktop: update to 10.7.
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
From 81a123eb3db87af2447d90f94089489b2600edc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 27 Jan 2023 10:29:00 -0500
Subject: [PATCH 002/356] python3-ipython: update to 8.9.0.
---
srcpkgs/python3-ipython/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 6bf0006d2f2d..de43a28fb600 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=8.8.0
+version=8.9.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b
+checksum=71618e82e6d59487bea059626e7c79fb4a5b760d1510d02fab1160db6fdfa1f7
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 532e959353da3baa93940d79d3d6c11c3f8c094c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 29 Jan 2023 20:53:23 +0100
Subject: [PATCH 003/356] cppcheck: update to 2.10.
---
srcpkgs/cppcheck/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 404080560200..05d5f921679b 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
# Template file for 'cppcheck'
pkgname=cppcheck
-version=2.9.3
+version=2.10
revision=1
build_style=gnu-makefile
make_build_args="
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
homepage="http://cppcheck.sourceforge.net"
changelog="https://sourceforge.net/p/cppcheck/news/"
distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=46319ca73e33e4b2bd91981a76a0d4f184cd3f86b62dc18e8938eabacd3ad2e3
+checksum=785dcbf711048dfe43ae920b6eff2eeebb4a096e88188a40e173ca4c030f57c3
export CXXFLAGS="-DNDEBUG"
export LDFLAGS="-pthread"
From 4d0f5e920f02f59fa28773e4b41e14f61a4b06ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 29 Jan 2023 20:57:28 +0100
Subject: [PATCH 004/356] plocate: update to 1.1.18.
---
srcpkgs/plocate/patches/fix-missing-include.patch | 10 ++++++++++
srcpkgs/plocate/template | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/plocate/patches/fix-missing-include.patch
diff --git a/srcpkgs/plocate/patches/fix-missing-include.patch b/srcpkgs/plocate/patches/fix-missing-include.patch
new file mode 100644
index 000000000000..bbbc58d01beb
--- /dev/null
+++ b/srcpkgs/plocate/patches/fix-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/updatedb.cpp
++++ b/updatedb.cpp
+@@ -35,6 +35,7 @@
+ #include <arpa/inet.h>
+ #include <assert.h>
+ #include <chrono>
++#include <cinttypes>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <getopt.h>
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 04fd073d1036..f288bcf8dd32 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
# Template file for 'plocate'
pkgname=plocate
-version=1.1.17
+version=1.1.18
revision=1
build_style=meson
configure_args="
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://plocate.sesse.net/"
changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=5a622d8839de8f70aff74adca67336749cdc42a826575995b6b33a582bbf270b
+checksum=939657050b70719b01ce04fc1c8b64270062a0d53da2c72eafbe036a1964e12c
system_accounts="_plocate"
From a430239689f76edfb166e69954c1502edb129a99 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 27 Jan 2023 12:26:38 +0100
Subject: [PATCH 005/356] soju: update to 0.5.2.
---
srcpkgs/soju/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 9367a02139e5..1ed6735e63af 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,6 +1,6 @@
# Template file for 'soju'
pkgname=soju
-version=0.5.1
+version=0.5.2
revision=1
build_style=go
go_import_path="git.sr.ht/~emersion/soju"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
homepage="https://soju.im"
changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=52a8e3f832b0d897024ffcc85e2f4f4a07bb807be106cdc7090e220baba9f2d5
+checksum=243e97e89d1ab9db0757b4d9e2181bf9602bf1ca277aba665417ea788ef82d9b
conf_files="/etc/soju/config"
system_accounts="_soju"
make_dirs="/var/db/soju 0750 _soju _soju
From 16722d5958f2f013588f7907e9fe9c0b1d3148ce Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Fri, 27 Jan 2023 16:01:29 -0300
Subject: [PATCH 006/356] oil: update to 0.14.0
---
srcpkgs/oil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index c80e742d66aa..657a801d1aca 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.13.1
+version=0.14.0
revision=1
build_style=configure
configure_args="--prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=2732a7af26d569774e54c97f3817b416a05389091cc526404f1ef73b6b39db89
+checksum=66b4f6bc77db7344bd43d7bd9438b2a6d7d20b7088890b3c0a8f453838a5ee86
register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
From e7457fca29b5a2febcff36445d74b3488aa1e7f4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 27 Jan 2023 00:38:44 +0530
Subject: [PATCH 007/356] puzzles: update to 20230123.1f72a1a.
---
srcpkgs/puzzles/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 49f13196e4e7..de21b52261c2 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,6 +1,6 @@
# Template file for 'puzzles'
pkgname=puzzles
-version=20210427.8ff394d
+version=20230123.1f72a1a
revision=1
build_style=cmake
configure_args="-DNAME_PREFIX=puzzles-"
@@ -9,9 +9,9 @@ makedepends="gtk+3-devel"
short_desc="Simon Tatham's Portable Puzzle Collection"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
-homepage="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=8ff394d1cc42efc3509135bbdd6ce92498eafcf3;sf=tgz>${pkgname}-${version#*.}.tgz"
-checksum=54c507b3e6607344e9c4d6ab7beb29369ffeaacf3bbd258c6e76432d35f0ad60
+homepage="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=1f72a1a2ecc89ba789a0b665a5e39da5febe27d2;sf=tgz>${pkgname}-${version#*.}.tgz"
+checksum=2a372deda982aff951bda19cb49dcf7fc56c14b63a7969763d95f1ebbc238906
post_install() {
vlicense LICENCE LICENSE
From 9512af70b84eed60433d708ee12768f13513d352 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 29 Jan 2023 01:21:32 +0530
Subject: [PATCH 008/356] usql: update to 0.13.6.
---
srcpkgs/usql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f9df1cc58716..15b1e8c0dcd9 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
# Template file for 'usql'
pkgname=usql
-version=0.13.5
+version=0.13.6
revision=1
build_style=go
go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=c6feec52395a93b705e00f2fb613d1dd581031bbabb6c39c9125ac000cc733e9
+checksum=1a640c65f8fd34dea8aed5ca4ebac93b3d4fe814d3613c88195515da77c98812
post_install() {
vlicense LICENSE
From d8afbf00fa7b42f711e5334124fdcbab3581a063 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 28 Jan 2023 17:56:23 -0300
Subject: [PATCH 009/356] icewm: update to 3.3.1.
---
srcpkgs/icewm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 11cf51a5ce47..4c09fa790838 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
# Template file for 'icewm'
pkgname=icewm
-version=3.3.0
+version=3.3.1
revision=1
build_style=cmake
make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://ice-wm.org/"
changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=b981f22bf02793b2e78cc455234cf7120454e75f9a3375fd0aa18cf372f39302
+checksum=988113f89d6f72272bc404cda0493be5118b43a1fe696792349cdf6d069f9817
# broken tests
make_check=no
From bed16aad170e2eaf49aeda57e646340f024d8863 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 28 Jan 2023 18:00:26 -0500
Subject: [PATCH 010/356] iwgtk: update to 0.9
---
srcpkgs/iwgtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwgtk/template b/srcpkgs/iwgtk/template
index 7a0a9e2bbde1..b8ecf896e259 100644
--- a/srcpkgs/iwgtk/template
+++ b/srcpkgs/iwgtk/template
@@ -1,6 +1,6 @@
# Template file for 'iwgtk'
pkgname=iwgtk
-version=0.8
+version=0.9
revision=1
build_style=meson
hostmakedepends="scdoc pkg-config gettext"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/J-Lentz/iwgtk"
changelog="https://raw.githubusercontent.com/J-Lentz/iwgtk/master/CHANGELOG"
distfiles="https://github.com/J-Lentz/iwgtk/archive/refs/tags/v${version}.tar.gz"
-checksum=38e81e67004bbd246b6551ffc812b6ab019f84a7329f134bb8031eb61d9d732c
+checksum=84a82dc730fe536034a65d148840e975c1353f4114db527439170ff410583d31
From 43927090f143c3ac0048048e2c2de6e153aa339f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 10:25:56 +0200
Subject: [PATCH 011/356] rssguard: update to 4.3.1.
---
srcpkgs/rssguard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index ff595110d429..4659b399ad89 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
# Template file for 'rssguard'
pkgname=rssguard
-version=4.2.7
+version=4.3.1
revision=1
build_style=cmake
configure_args="-DUSE_WEBENGINE=false"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-only"
homepage="https://github.com/martinrotter/rssguard"
distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=b3256bc2152683235b9b6f46ab195a3f7fb6c3c3c1e177525dd0523923f2e8d2
+checksum=a7eafa6a7b7a8cda801c0cf7a421bdb3e33ff1b6b3cdb69748052b4abe6dd7d0
post_install() {
# Install rssguard icon manually
From d10c59b19e053420c1c730035e51d1f49866de1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 10:44:44 +0200
Subject: [PATCH 012/356] arc-theme: update to 20221218, adopt.
---
srcpkgs/arc-theme/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 86b487ffa9aa..e64b74a27b6b 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,14 +1,14 @@
# Template file for 'arc-theme'
pkgname=arc-theme
-version=20220405
+version=20221218
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
makedepends="gtk+3-devel gtk4-devel"
depends="gnome-themes-extra gtk-engine-murrine"
short_desc="Flat theme with transparent elements for GTK and GNOME Shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/jnsh/arc-theme"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e
+distfiles="https://github.com/jnsh/arc-theme/archive/${version}.tar.gz"
+checksum=aa32825da7e2329fdaac64d35f0afab85e2e2f3c71cc41547bafafa379444ccf
From a8fba9946d243c4288ddc5233c593ea7bb8ee790 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:03:26 +0200
Subject: [PATCH 013/356] audacious: update to 4.2.
---
srcpkgs/audacious/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index ebeca48a6171..7df759a2f29a 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,7 +1,7 @@
# Template file for 'audacious'
#Keep in sync with audacious-plugins!
pkgname=audacious
-version=4.1
+version=4.2
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gtk) $(vopt_enable qt) --enable-libarchive"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=1f58858f9789e867c513b5272987f13bdfb09332b03c2814ad4c6e29f525e35c
+checksum=feb304e470a481fe2b3c4ca1c9cb3b23ec262540c12d0d1e6c22a5eb625e04b3
build_options="gtk qt"
build_options_default="qt"
From 38a0bfadf0a7155b1bf13287040837f7346d4116 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:03:31 +0200
Subject: [PATCH 014/356] audacious-plugins: update to 4.2.
---
srcpkgs/audacious-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d0724c54b0ad..910ec0d1891f 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,8 +1,8 @@
# Template file for 'audacious-plugins'
#Keep in sync with audacious!
pkgname=audacious-plugins
-version=4.1
-revision=4
+version=4.2
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
hostmakedepends="gettext pkg-config glib-devel"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=dad6fc625055349d589e36e8e5c8ae7dfafcddfe96894806509696d82bb61d4c
+checksum=6fa0f69c3a1041eb877c37109513ab4a2a0a56a77d9e8c13a1581cf1439a417f
build_options="gtk qt"
build_options_default="qt"
From 119efc596b6993ca93b6d13043a7636855180ba0 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 26 Jan 2023 15:59:20 +0000
Subject: [PATCH 015/356] rofi-rbw: update to 1.1.0.
---
srcpkgs/rofi-rbw/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 7c4f3a7ce36f..0f84ee7f19d7 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,10 +1,10 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
-version=1.0.1
-revision=2
+version=1.1.0
+revision=1
build_style=python3-pep517
make_install_target="dist/rofi_rbw-${version}-py3-none-any.whl"
-hostmakedepends="python3-setuptools python3-wheel"
+hostmakedepends="python3-poetry-core"
depends="python3 python3-ConfigArgParse rbw"
short_desc="Rofi frontend for Bitwarden"
maintainer="Omar Zeghouani <omarzeghouanii@gmail.com>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/fdw/rofi-rbw"
changelog="https://raw.githubusercontent.com/fdw/rofi-rbw/HEAD/CHANGELOG.md"
distfiles="https://github.com/fdw/rofi-rbw/archive/${version}.tar.gz"
-checksum=37f14462a7a918df2ac9350db8e3822fc7bf9af490dddb60299ea73c976f6c97
+checksum=eff1adac15b80532c1092bbdad89e586913da3a2336272c18f38475ea6f2dd3b
post_install() {
vman src/rofi_rbw/docs/rofi-rbw.1
From 61fdd8d0e715dc1e5a63042b62f09f72922424f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 27 Jan 2023 00:20:55 +0530
Subject: [PATCH 016/356] gdown: update to 4.6.0.
---
srcpkgs/gdown/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index 6420b1c87e78..48c0ff75de40 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,9 +1,9 @@
# Template file for 'gdown'
pkgname=gdown
-version=4.2.0
-revision=2
+version=4.6.0
+revision=1
build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
+hostmakedepends="python3-setuptools"
depends="python3-filelock python3-requests python3-six python3-tqdm
python3-pysocks python3-BeautifulSoup4"
checkdepends="${depends} python3-pytest"
@@ -11,9 +11,8 @@ short_desc="Download a large file from Google Drive"
maintainer="travankor <travankor@tuta.io>"
license="MIT"
homepage="https://github.com/wkentaro/gdown"
-distfiles="https://github.com/wkentaro/gdown/archive/v${version}.tar.gz"
-checksum=24d159c7f9448bc864fef2dcc3d77c6b7b805654c5b2cf61bb05722fdef50049
-make_check=no # doesn't create egg-info during build
+distfiles="https://github.com/wkentaro/gdown/archive/refs/tags/v${version}.tar.gz"
+checksum=06862dc5ffae994a9cb11eb3015182c192bf80b8ed10d00d891c5560c4884128
post_install() {
vlicense LICENSE
From 85dc3ff85c77841a1c4cf1b154945e1889446bb8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 26 Jan 2023 00:44:50 +0530
Subject: [PATCH 017/356] glances: update to 3.3.1.1.
Adopt.
---
srcpkgs/glances/patches/no-check-update.patch | 52 +++++++++++--------
srcpkgs/glances/template | 8 +--
2 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/glances/patches/no-check-update.patch b/srcpkgs/glances/patches/no-check-update.patch
index 7b334f1551ff..1487ab0b3bdc 100644
--- a/srcpkgs/glances/patches/no-check-update.patch
+++ b/srcpkgs/glances/patches/no-check-update.patch
@@ -1,24 +1,30 @@
---- a/glances/main.py
-+++ b/glances/main.py
-@@ -97,6 +97,7 @@
- """Manage the command line arguments."""
- # Read the command line arguments
- self.args = self.parse_args()
-+ self.args.disable_check_update = False
+Description: Disable nagging suggestion to upgrade using pip
+Author: Sebastien Badia <sbadia@debian.org>
+Bug-Debian: https://bugs.debian.org/877127
+
+--- a/glances/standalone.py
++++ b/glances/standalone.py
+@@ -103,9 +103,6 @@
+ # Init screen
+ self.screen = GlancesCursesStandalone(config=config, args=args)
- def init_args(self):
- """Init all the command line arguments."""
-@@ -514,13 +515,6 @@
- )
- # Globals options
- parser.add_argument(
-- '--disable-check-update',
-- action='store_true',
-- default=False,
-- dest='disable_check_update',
-- help='disable online Glances version ckeck',
-- )
-- parser.add_argument(
- '--strftime',
- dest='strftime_format',
- default='',
+- # Check the latest Glances version
+- self.outdated = Outdated(config=config, args=args)
+-
+ @property
+ def quiet(self):
+ return self._quiet
+@@ -184,12 +181,3 @@
+
+ # Exit from export modules
+ self.stats.end()
+-
+- # Check Glances version versus PyPI one
+- if self.outdated.is_outdated():
+- print(
+- "You are using Glances version {}, however version {} is available.".format(
+- self.outdated.installed_version(), self.outdated.latest_version()
+- )
+- )
+- print("You should consider upgrading using: pip install --upgrade glances")
+
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index d9ad47ccd85e..ace5c3b674ad 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,18 +1,18 @@
# Template file for 'glances'
pkgname=glances
-version=3.3.0.4
+version=3.3.1.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-future python3-psutil python3-defusedxml python3-packaging"
+depends="python3-psutil python3-defusedxml python3-packaging python3-ultrajson"
checkdepends="$depends"
short_desc="Cross-platform curses-based monitoring tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="LGPL-3.0-or-later"
homepage="https://nicolargo.github.io/glances/"
changelog="https://raw.githubusercontent.com/nicolargo/glances/develop/NEWS.rst"
distfiles="https://github.com/nicolargo/glances/archive/refs/tags/v${version}.tar.gz"
-checksum=464905c9b4806b80782eb8e43552ccbfa346d6f905f8a2d28de48613ccba0e53
+checksum=450c604ddfe05398ec88bd237648c7d851ad3c537b5f785eccafab4e9789c235
post_install() {
vsconf conf/glances.conf
From c04bcd29f8f534fa3f24430392c38b234fcbaf39 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 26 Jan 2023 21:15:14 +0000
Subject: [PATCH 018/356] xmlsec1: update to 1.2.37.
---
srcpkgs/xmlsec1/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 5e924fb02e6f..d57bd4b9f645 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,6 +1,6 @@
# Template file for 'xmlsec1'
pkgname=xmlsec1
-version=1.2.33
+version=1.2.37
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gnutls-devel"
@@ -10,8 +10,9 @@ short_desc="XML Security Library is a C library based on LibXML2"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://www.aleksey.com/xmlsec/"
+changelog="https://www.aleksey.com/xmlsec/news.html"
distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931
+checksum=5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
pre_configure() {
autoreconf -if
From 03e0311d8a06118b7a55c516058e95b12d287451 Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Sat, 28 Jan 2023 11:36:44 -0300
Subject: [PATCH 019/356] chafa: update to 1.12.4
---
srcpkgs/chafa/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index 4eabb143fcf9..59b1fe14ee13 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,6 +1,6 @@
# Template file for 'chafa'
pkgname=chafa
-version=1.12.3
+version=1.12.4
revision=1
build_style=gnu-configure
configure_args="--enable-man"
@@ -10,8 +10,9 @@ short_desc="Versatile and fast Unicode/ASCII/ANSI graphics renderer"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
license="LGPL-3.0-or-later"
homepage="https://hpjansson.org/chafa/"
+changelog="https://raw.githubusercontent.com/hpjansson/chafa/master/NEWS"
distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=2456a0b6c1150e25b64cd6a92810d59bed3f061f8b86f91aba5a77bc7cc76cfa
+checksum=9774bd1a7076ea3124f7fea811e371d0e1da2e76b7ac06260d63a86c7b1a573f
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) ;;
From ed7fdead2fc79adf3e6000b0c135b600a9f835a5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 15:23:48 +0530
Subject: [PATCH 020/356] cargo-outdated: update to 0.11.2.
---
srcpkgs/cargo-outdated/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 2f4832fa7bd4..fc5ea5a43561 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,7 +1,7 @@
# Template file for 'cargo-outdated'
pkgname=cargo-outdated
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
build_style=cargo
hostmakedepends="pkg-config zlib-devel"
makedepends="libcurl-devel libgit2-devel openssl-devel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/kbknapp/cargo-outdated"
changelog="https://raw.githubusercontent.com/kbknapp/cargo-outdated/master/CHANGELOG.md"
distfiles="https://github.com/kbknapp/cargo-outdated/archive/refs/tags/v${version}.tar.gz"
-checksum=2d80f0243d70a3563c48644dd3567519c32a733fb5d20f1161fd5d9f8e6e9146
+checksum=7e82d1507594d86cb1c2007d58e329a9780a22bdb0f38d5e71d2692a7f1727d9
post_install() {
vlicense LICENSE-MIT
From f7668ff8e71a9e03c44aeecded0d2d0c60afd7e6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 12:17:53 +0530
Subject: [PATCH 021/356] glow: update to 1.5.0.
---
srcpkgs/glow/template | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index 6b283d3d6ab7..ce2cff4a3f0c 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,16 +1,22 @@
# Template file for 'glow'
pkgname=glow
-version=1.4.1
+version=1.5.0
revision=1
build_style=go
go_import_path=github.com/charmbracelet/glow
+go_ldflags="-X main.Version=${version}"
short_desc="Render markdown on the CLI, with pizzazz"
maintainer="klardotsh <josh@klar.sh>"
license="MIT"
homepage="https://github.com/charmbracelet/glow"
-distfiles="https://github.com/charmbracelet/glow/archive/v${version}.tar.gz"
-checksum=ff6dfd7568f0bac5144ffa3a429ed956dcbdb531487ef6e38ac61365322c9601
+distfiles="https://github.com/charmbracelet/glow/archive/refs/tags/v${version}.tar.gz"
+checksum=66f2a876eba15d71cfd08b56667fb07e1d49d383aa17d31696a39e794e23ba92
post_install() {
+ for shell in bash fish zsh; do
+ CGO_ENABLED=0 GOARCH= go run . completion ${shell} > glow.${shell}
+ vcompletion glow.${shell} ${shell}
+ done
+
vlicense LICENSE
}
From a7b5e7ab70d3ca151b0ee96dab5be6b874115c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 23:31:43 +0000
Subject: [PATCH 022/356] amiri-font: update to 1.000.
---
srcpkgs/amiri-font/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template
index e18346b4c78c..8b07c0a52284 100644
--- a/srcpkgs/amiri-font/template
+++ b/srcpkgs/amiri-font/template
@@ -1,6 +1,6 @@
# Template file for 'amiri-font'
pkgname=amiri-font
-version=0.117
+version=1.000
revision=1
hostmakedepends="unzip"
depends="font-util"
@@ -8,9 +8,9 @@ short_desc="Classical Arabic typeface in Naskh style"
maintainer="John <me@johnnynator.dev>"
license="OFL-1.1"
homepage="https://github.com/alif-type/amiri/"
-changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md"
+changelog="https://raw.githubusercontent.com/aliftype/amiri/main/NEWS.md"
distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"
-checksum=9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
+checksum=926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30
font_dirs="/usr/share/fonts/TTF"
do_install() {
From 4d614ff83a7fb10d5b398a30800d4ae9dae81562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 28 Jan 2023 12:58:45 +0100
Subject: [PATCH 023/356] git-cliff: update to 1.1.2.
---
srcpkgs/git-cliff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 908616fbe398..9596ab6b7436 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,6 +1,6 @@
# Template file for 'git-cliff'
pkgname=git-cliff
-version=1.1.1
+version=1.1.2
revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
homepage="https://github.com/orhun/git-cliff"
changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=b77b0c0d999b6d5fe6a175ef603c373a72e0f197b45833213c1b97758b1b7a3f
+checksum=26f05e4cfea07768d06ae92cd4b34bae786ed354089d9b5b1659d6408bf583c6
post_install() {
vdoc README.md
From 7efa755fbd6ffb58e1539613976c19946f5af599 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 30 Jan 2023 02:29:06 +0100
Subject: [PATCH 024/356] topgrade: update to 10.3.0
---
srcpkgs/topgrade/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index d75994b394d7..429c0382e66b 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
# Template file for 'topgrade'
pkgname=topgrade
-version=10.2.4
+version=10.3.0
revision=1
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/topgrade-rs/topgrade"
distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
-checksum=b7390d609259a4fa4b4c2db6fdc685e12e65d2f9bc98d442d713bf1c9bce7677
+checksum=6ed1fa0ca3c2031e183ad8852de41be77e216076508e896fc38b7ad1cce15d0d
post_install() {
local topgrade="${DESTDIR}/usr/bin/topgrade"
From ab34749ae6e813b07c4b4307f0fe13aeccb25e4e Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Sun, 29 Jan 2023 20:59:52 -0300
Subject: [PATCH 025/356] anydesk: update to 6.2.1.
---
srcpkgs/anydesk/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 90c4c112d45c..eaec4b93ad60 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,7 +1,7 @@
# Template file for 'anydesk'
pkgname=anydesk
-version=6.2.0
-revision=2
+version=6.2.1
+revision=1
archs="x86_64"
create_wrksrc=yes
hostmakedepends="patchelf"
@@ -16,8 +16,8 @@ restricted=yes
distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
-checksum="49ffb7e2a0ac1f44319cbf221606e25171cc2a6925b5b31aad484b290740d48e
- 93ce67407d855b21170e007e3dde324ad7cd0a3922206136bc0fd84d72da2b8a"
+checksum="68f8395a0c84f2560ffa425497fbf9846a61bb2dbc4b1010a8ffca7856514ab2
+ 96a7ded2144ecdaff381c34e49eee3275caaaac00847e91abf5e7783706c989c"
do_build() {
From f42e18966805e9d21bfdbcf4912c8c5bdff0a7e8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sat, 28 Jan 2023 15:00:30 +0100
Subject: [PATCH 026/356] bird: update to 2.0.12
---
srcpkgs/bird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index ba6462287da6..715f961da8a2 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.11
+version=2.0.12
revision=1
build_style=gnu-configure
hostmakedepends="flex"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
-checksum=60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6
+checksum=3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53
conf_files="/etc/bird.conf"
system_accounts="_bird"
From 3bb0cb735a4db81de2ff82e5b5fbbcdda16a28ca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 29 Jan 2023 20:03:37 +0100
Subject: [PATCH 027/356] monitoring-plugins: update to 2.3.2
---
srcpkgs/monitoring-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 1000998c221f..9fec5562a9cc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
-version=2.3.1
+version=2.3.2
revision=1
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.monitoring-plugins.org/"
changelog="https://www.monitoring-plugins.org/news/index.html"
distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=f56eb84871983fd719247249e3532228b37e2efaae657a3979bd14ac1f84a35b
+checksum=8d9405baf113a9f25e4fb961d56f9f231da02e3ada0f41dbb0fa4654534f717b
do_configure() {
./configure ${configure_args} --with-ping-command='/usr/bin/iputils-ping -n -U -w %d -c %d %s' --with-ping6-command='/usr/bin/iputils-ping6 -n -U -w %d -c %d %s'
From 476486d2a0c08d331054f63c37aa1e6dc8f99d52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Jan 2023 06:46:52 -0500
Subject: [PATCH 028/356] .github/workflows: use treeless-checkout-action
---
.github/workflows/build.yaml | 34 ++--------------------------------
.github/workflows/cycles.yml | 17 +----------------
2 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2a89fd11cd0e..22cbaa0a1ffe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,22 +27,7 @@ jobs:
steps:
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- run: common/travis/changed_templates.sh
- run: common/travis/fetch-xbps.sh
- run: common/travis/fetch-xtools.sh
@@ -87,22 +72,7 @@ jobs:
xbps-install -yu
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
ln -s "$(pwd)" /hostrepo &&
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index be631da5f274..4c3aeb42cc2b 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -27,22 +27,7 @@ jobs:
xbps-install -y python3-networkx github-cli
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
From e1ee89728ab65dff938ba68ff45338a89ba2f91c Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Fri, 27 Jan 2023 17:53:54 +0800
Subject: [PATCH 029/356] retroarch: update to 1.4.0
---
srcpkgs/retroarch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 9033ba001ca6..240d3df9db00 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.13.0
+version=1.14.0
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -24,7 +24,7 @@ license="GPL-3.0-or-later"
homepage="https://www.retroarch.com/"
changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=7f33bfb821440b2e30eb6c9d63eb4e2da1d2910ae90b43f691e3c28759739710
+checksum=aa4d579bfceb43450725171f594f69877f007a8892cb46678f8b62935c4de635
build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"
From 53be0a8afe63bf3c90259c8906f039bd957fc46b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 29 Jan 2023 21:25:34 -0600
Subject: [PATCH 030/356] python3-rich: update to 13.3.1.
---
srcpkgs/python3-rich/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 616979d4b4b5..2ad4dac03927 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
# Template file for 'python3-rich'
pkgname=python3-rich
-version=13.2.0
+version=13.3.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/willmcgugan/rich"
distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=f1a00cdd3eebf999a15d85ec498bfe0b1a77efe9b34f645768a54132ef444ac5
+checksum=125d96d20c92b946b983d0d392b84ff945461e5a06d3867e9f9e575f8697b67f
make_check=extended # some checks only work on windows
post_install() {
From 98d6538d7e6f1409dfc8bf1b991055327679c778 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 30 Jan 2023 16:33:00 +0100
Subject: [PATCH 031/356] kubernetes: update to 1.26.1.
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index bcd183b132a7..d0f32fb71150 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.26.0
+version=1.26.1
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=a0de781db6d09d91f39306740420f150c5912606f52e4c9a859649f4313fe508
+checksum=0e19d477b5123c74d12bb46bc72e5b6f4c407473af3772ef31cfff3a1d64d311
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 010e436d2d408a0902ec5f572a10b853c3230d8e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 15:04:49 +0530
Subject: [PATCH 032/356] python3-tabulate: update to 0.9.0.
---
srcpkgs/python3-tabulate/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index 742c83364fe6..dd8e240dc6ee 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,17 +1,18 @@
# Template file for 'python3-tabulate'
pkgname=python3-tabulate
-version=0.8.10
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.9.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-wcwidth"
checkdepends="python3-pytest $depends"
short_desc="Pretty-print tabular data (Python3)"
maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="MIT"
-homepage="https://github.com/astanin/python-tabulate"
+homepage="https://pypi.org/project/tabulate/"
+changelog="https://raw.githubusercontent.com/astanin/python-tabulate/master/CHANGELOG"
distfiles="${PYPI_SITE}/t/tabulate/tabulate-${version}.tar.gz"
-checksum=6c57f3f3dd7ac2782770155f3adb2db0b1a269637e42f27599925e64b114f519
+checksum=0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c
post_install() {
vlicense LICENSE
From f259a83666ce54c17073afb655e5987e9ba479da Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 15:00:15 +0530
Subject: [PATCH 033/356] python3-cli_helpers: update to 2.3.0.
---
srcpkgs/python3-cli_helpers/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index ed7c0d535b4a..84ac83a5b14c 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,18 +1,18 @@
# Template file for 'python3-cli_helpers'
pkgname=python3-cli_helpers
-version=2.2.1
-revision=2
+version=2.3.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-configobj python3-tabulate"
+depends="python3-configobj python3-tabulate python3-Pygments"
checkdepends="python3-pytest ${depends}"
short_desc="Python helpers for building command-line apps"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
-homepage="https://github.com/dbcli/cli_helpers"
+homepage="https://cli-helpers.rtfd.io/"
changelog="https://raw.githubusercontent.com/dbcli/cli_helpers/main/CHANGELOG"
distfiles="${PYPI_SITE}/c/cli_helpers/cli_helpers-${version}.tar.gz"
-checksum=0ccc1cfcda1ac64dc7ed83d7013055cf19e5979d29e56c21f3b692de01555aae
+checksum=e7174d003a2b58fd3e31a73fbbc45d5aa513de62cbd42d437f78b9658bd5f967
post_install() {
vlicense LICENSE
From 4cb08448f73fe2ab97a3ce12560746c50508e705 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 14:54:10 +0530
Subject: [PATCH 034/356] litecli: update to 1.9.0.
---
srcpkgs/litecli/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/litecli/template b/srcpkgs/litecli/template
index 2d94d3422c73..a00ddd531865 100644
--- a/srcpkgs/litecli/template
+++ b/srcpkgs/litecli/template
@@ -1,7 +1,7 @@
# Template file for 'litecli'
pkgname=litecli
-version=1.8.0
-revision=2
+version=1.9.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-click python3-Pygments python3-prompt_toolkit python3-sqlparse python3-configobj python3-cli_helpers"
@@ -10,9 +10,9 @@ short_desc="CLI for SQLite Databases with auto-completion and syntax highlightin
maintainer="Kye Shi <shi.kye@gmail.com>"
license="BSD-3-Clause"
homepage="https://litecli.com"
-distfiles="https://github.com/dbcli/litecli/archive/refs/tags/v${version}.tar.gz"
-checksum=83d55a741aa9d11ff853662e424d205b9f919bfe3ef7233a1f74a7f92075b802
-
+changelog="https://raw.githubusercontent.com/dbcli/litecli/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/litecli/litecli-${version}.tar.gz"
+checksum=21af2cfa083dd4df1e3ccaa2a2117129b5f17212756f596ea090e296776c27a1
post_install() {
vlicense LICENSE
From ac271e5f6c992e30a46b1ee8b1a69fb0c5a1a9c9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:09:36 +0100
Subject: [PATCH 035/356] sysstat: update to 12.6.2.
---
srcpkgs/sysstat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 05f8822126b8..2d60e5ef8446 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
# Template file for 'sysstat'
pkgname=sysstat
-version=12.6.1
+version=12.6.2
revision=1
build_style=gnu-configure
configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://pagesperso-orange.fr/sebastien.godard/"
distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342
+checksum=3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48
post_extract() {
vsed -i 's/lib64/lib/' configure
From 8207be9f2b1ad420cdaaaad21b56276d2077a27b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:16:07 +0100
Subject: [PATCH 036/356] sbcl: update to 2.3.1.
---
srcpkgs/sbcl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 96168debc0bf..f6c5616be56c 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.3.0
+version=2.3.1
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
@@ -15,7 +15,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=bf743949712ae02cb7493f3b8b57ce241948bf61131e36860ddb334da1439c97
+checksum=0ad5b600ea3389afe361672a54dc0d17dc519166da501b136b3013b237da049d
nocross=yes
nopie=yes
@@ -23,7 +23,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" fb3047c7a1c391b80a169197cc9fd6fe5fa97aff409a9814581852430ee39921"
+ checksum+=" 76e7c33c2f4886979bc462ab1ac04ad20ebe87165890af9aab14c902c3cdcaae"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
From 7bf396fd46eee8f09af844bd1ae648aff7262974 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:19:00 +0100
Subject: [PATCH 037/356] libimagequant: update to 2.18.0.
---
srcpkgs/libimagequant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 0d4bcf6a0b89..7d2c74b7629d 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
# Template file for 'libimagequant'
pkgname=libimagequant
-version=2.17.0
+version=2.18.0
revision=1
build_style=configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/lib/"
distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=9f6cc50182be4d2ece75118aa0b0fd3e9bbad06e94fd6b9eb3a4c08129c2dd26
+checksum=790d2593a587f9a27cec6245ee7a212b34b0aa63cac6383e550eda01236be636
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --enable-sse";;
From 0937a9ed3d5134c6f7ba532bb80a5a6bde8c648f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:19:06 +0100
Subject: [PATCH 038/356] pngquant: update to 2.18.0.
---
srcpkgs/pngquant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 8d72b2c6a6dc..3e93e4cdf81b 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
# Template file for 'pngquant'
pkgname=pngquant
-version=2.17.0
+version=2.18.0
revision=1
build_style=gnu-configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/"
distfiles="https://github.com/kornelski/pngquant/archive/${version}.tar.gz"
-checksum=bc1baa43c814b4416bb63d7b2168d4e5395cfc69a00f8997a595361caa507887
+checksum=424ff432e51dfc3cf5ff8001ad1b64198850686c5e3c26ecd477e4b69ef4fade
make_check_target=test
case "$XBPS_TARGET_MACHINE" in
From 96438cf23eba7eb3161df495ad7cfc7a436999f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 17:37:37 +0100
Subject: [PATCH 039/356] linux5.10: update to 5.10.165.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index ebc8063333e7..96fc6990aefa 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.162
+version=5.10.165
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- be4e77135f82a8990906bfdfaddd36eb679e82dfcb11f11377385a788a0a5b44"
+ 1933007150bf07d610f8cac61d25f2e650532a8f81781e6d542fd2fde4c40147"
python_version=3
skip_extraction="patch-${version}.xz"
From 295edb6043367c72b807bdaaaeb56d674b2e1e8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 24 Jan 2023 07:52:18 -0500
Subject: [PATCH 040/356] dkms: update to 3.0.10.
---
srcpkgs/dkms/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 61afd2bbf085..5da51b101a8c 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
# Template file for 'dkms'
pkgname=dkms
-version=3.0.6
-revision=2
+version=3.0.10
+revision=1
conf_files="/etc/dkms/framework.conf"
depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
short_desc="Dynamic Kernel Module Support"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/dell/dkms"
distfiles="https://github.com/dell/dkms/archive/v${version}.tar.gz"
-checksum=1e1ae273d2a72e3a89b829f3c72f482fb903f12cf766c054d11612e1d70795b4
+checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# dkms does not create this directory, but needs it
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
From d3db6fd9a82f4ffaddabba6031aba1a679763d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 30 Jan 2023 20:20:44 +0100
Subject: [PATCH 041/356] glmark2: update to 2023.01.
---
...3f53c96dc8a4048b17dc16147a8fac782d4a.patch | 24 -------------------
srcpkgs/glmark2/template | 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
diff --git a/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch b/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
deleted file mode 100644
index 3e60a442d1b4..000000000000
--- a/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001
-From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Date: Mon, 14 Feb 2022 13:54:09 +0200
-Subject: [PATCH] libmatrix: Add missing <utility> include
-
-Fixes compilation with GCC 12.
-
-Fixes #169
----
- src/libmatrix/program.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
-index f95b470..1c9de08 100644
---- a/src/libmatrix/program.h
-+++ b/src/libmatrix/program.h
-@@ -15,6 +15,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <utility>
- #include "mat.h"
-
- // Simple shader container. Abstracts all of the OpenGL bits, but leaves
diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index 91f4ed55a00c..8d4aa5f503c1 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -1,6 +1,6 @@
# Template file for 'glmark2'
pkgname=glmark2
-version=2021.12
+version=2023.01
revision=1
build_style=meson
configure_args="-Dflavors=$(vopt_if wayland 'wayland-gl,wayland-glesv2,')$(vopt_if x11 'x11-gl,x11-glesv2,')drm-gl,drm-glesv2"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/glmark2/glmark2"
changelog="https://raw.githubusercontent.com/glmark2/glmark2/master/NEWS"
distfiles="https://github.com/glmark2/glmark2/archive/${version}.tar.gz"
-checksum=9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95
+checksum=5479ce8f90fabcfee3b3e8d929f2a68e9669ac223bb4df723963534b47d32dc3
build_options="wayland x11"
build_options_default="wayland x11"
From a3c60fd094217fd91ed4cc12610a34cce5d6aa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 30 Jan 2023 21:30:19 +0100
Subject: [PATCH 042/356] adwaita-qt: update to 1.4.2.
---
srcpkgs/adwaita-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-qt/template b/srcpkgs/adwaita-qt/template
index 806050a89f3a..0d50552ecd17 100644
--- a/srcpkgs/adwaita-qt/template
+++ b/srcpkgs/adwaita-qt/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-qt'
pkgname=adwaita-qt
-version=1.4.1
+version=1.4.2
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
homepage="https://github.com/FedoraQt/adwaita-qt"
distfiles="https://github.com/FedoraQt/adwaita-qt/archive/${version}.tar.gz"
-checksum=834f2caaf031306b63b31ad6fec489482feda35e9aa260f205cbb976cde97b1d
+checksum=481bcbb9c62f278aa7eb03420e1d6a265ddd5fc53502602f5fbae69ac8a868ef
post_install() {
vdoc README.md
From 058443ba82dd3841920d256c0b1c932a1c84100c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 31 Jan 2023 16:11:33 +0100
Subject: [PATCH 043/356] firefox: update to 109.0.1.
---
srcpkgs/firefox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3683502c99ce..784ad493d3dc 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=109.0
+version=109.0.1
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351
+checksum=5e43fdfb3923ee3a7ae7bc91ef3377a3fc6f8a0c1b87436c19b29458b0d731d9
lib32disabled=yes
From 2a3e1157774ad43cddc1847f916424eb25236c94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 31 Jan 2023 16:11:41 +0100
Subject: [PATCH 044/356] firefox-i18n: update to 109.0.1.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9028fbe456a8..6037a395ef00 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=109.0
+version=109.0.1
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="ad1c07264af5102ece174f8e639c200420593ffaa83b31c8b8c3e7004e98aa6d
- 0a9e87d7b2e0ea06f82b8923dc165ff6a028d2be5fb70c9085f8b670422dfc60
- dbffb9aaa0df62f417e31a0c59c1a7cf7be8a2db6cd29832c92f843ef0f61777
- 790dcfec74f1f655dba60e849f3ed36c3a89532dedc7bbec989851ae37e633cd
- 2b116dee6b4bf3365f0ff73cb8d0ce497abcf37af922c0f0e07d5d0cd3e36d79
- 98e52b8cadafc173cc7eb575d65fd217789ab9a31bb10cbba2b2d8e48bbdcdcf
- 448029d13631fd06df67f72cd0a0085c0a4386a65b8d8065817d37f3defdd0fc
- 7d37a78a1d94634880b7ddb77c23de306176eb66fdbdac9273503fb95cf94ef4
- d4f999352230b596ac55ca4f9783a3226c5c108272372f4ea6bb2b7ca568b953
- 7e93c25c3fd345e2f5f552bba0843c8aa4af5fe1029ae443629b40295331e0d1
- e96b6083a78d8cbeb62e1f235b33e33db2ed15701b3a34b50079f77784b93747
- 18ab79f941c32b6ec6f0ace1088466dffdb9429f7a9ac30611e64f2ff10c8747
- 0d74a74b0b647c0d56aef85af469831b383d81ea997947bb303742afdff95cf5
- 253b49eb79f762fa9c1855fab6a3640d24e62ab3166a63d1ba25ccabd6d2472e
- e6f12f541fbf4c770538c712d7c435e0db9874c9dd64e609ccc84d65ce3e3c94
- dd8e343f30bd185483e2c0dcbbd51016e2b5879d3871145a04ba27e5c0c20772
- 1a9064365b03dd1aa6b04a60bf3cab2c8d5dc0ef60e8584c6927b1aeeef3b615
- b7ba8da5a61101299fa5329c9ccb3a52160a636e19dad3c8ac2a3933a0519429
- 92053a48f20325b59d2e9d7299cb428560720be6f8379f86f75fa0bb369da143
- 96ad98cad1062533e4e1c071a55b5a4195f7ee1182ff1626d2540f460a8ab939
- a22b1cb661049d8508727c1f4f22ecec9fe426932c16e3ce23d266ebc2d48f06
- 286ba6139da8f4cd0cd4e3cdea3f3cee6e0e7234082371c9090fe145009ab07a
- e4da3b03e1c710f0676b1af410ab1c7febd04fc92620ac62180abb6a61779b9a
- 72895cc614ae13f8ebc7d7f9dce21eed143db65f9903c2fbd53404ba1bbc00b2
- f4118a488a40c2f5732b1c3b0ba124cd21380f30bd4a3fe6c7280a259a3785dc
- 372442e330febcada243dc13d7d9da2df84f843b43fbf35f7150f5235eaa6b53
- 907257c5af58fab8369d53b6dbc853444ff31fd98e53fc6625a7472f80fed60c
- e731534e44144c9cc257ba877327b36dc68d485596e2a679fa08d85d976dd28f
- c53640e700d33b0116d4362eba98a414b7b74b544acccd78bb94820321332456
- 3cdbae880af63e763f3eeeb151973538acb668fd16c4a7e02d5aa9d81c431e5b
- 18b65d731b36af2abeddf8c81967dc12dcc24c28cf3f2af390777a2c3701ab0e
- 27041f682eb6c624f9efd3de6562fd5d35ab12588e759ef29d5a2dac9b46a36d
- 4d10b9d703ebf8dad7689d2f4908eccae269fe878b713bdb82e7ddf48f93d426
- 50d70a02d71409934f03308cafd06889dc3bfaffe5306fb0dace0e206dbdff39
- f3a166f0d4bad85a5d0b3a0d6766a90598cb90db2829b71cfa8fd49434580f23
- 466c4ab5152592bcc4d408304a6ab1768c3949407fc96eadd36363b0914c1c51
- 0e898583de196408db7d032228a7164c7370e0f83765ad7b201b6be0045e4f13
- ab332fbfba4cf7a8590ef74cf52040c9d1127c1d33c9366713b51c3315bca383
- 10309713093f05b30458df61df9752189067263aa1cbaec2b2f84e097d321e46
- ef81e086de88e40f4739369c308c8fbdea23e4ae986db0a2980351966ee24c00
- 1ba433ed2e487b2d1017991f9c53d1d7608c45bda30c1b872040a49f80c9b1ad
- 5c82f439876c6b96d584d7dc0cd67d1ed951e08ef16d94f0a26f54d963f9d893
- e33db77f3408a43f41f2dfc07eb4d1721bbd5b742e2867701732f48741c00ead
- 25e657fc58f8b6d90a2d1b1d61e19a04e69b27cf33911a8b076183fe6a7c0e33
- 57b798a9b539ac7830fad3087b37a4d16a3f0f12e635ff52cce0cebd7ca814be
- aa89da1272355ffe9fc045f0dc47c124f3cc52a6b732b015e12eefe87b382a94
- 26aecf208a7b19c36a88890deb49a9fdbe3df8a4fe513d4744957ad770465dd8
- a667ba25416d92a65684f3b039a24138895e092cb05bb2e831c9b40f969e1e7e
- 7c21214dcec3711a4e082780ff900528eb86bbe96569c2202c194afe558d49f6
- 661e9ca5715831c5e0ef59fb880f248d092b9be19dc94810a168d0c6af21f4fc
- 33705a6d8b31cabdd675e1aa952f7b2cbb9e3f0e726542dbf434a27c8fc2b19d
- 54b2ebf737f80bace727dcf8ef3c35bfd300c4bcc19d1780158d91645bcfcfa4
- 6b98c8a90fad1ca14c2c5fe16184b975c4e6a71073701ea0bab2669b52a40360
- ee4f64a55cca792cb500d0f969236f873030d8265f2ca427387c96b83d4fe8c7
- 1216752167975922c159a335d82e9ae2d57ece3e1cb362374c14e24cdc3130e1
- ae64421402cd98845885ef9827b83fb2e81116836afd1822a73f69bffff0efaa
- 62d1ae5129fd85d5d35d3a031dd9b021d56784d36a17a8c7a187de5dd524ca48
- 4f25d7aefc8db5dce6abb755df52fc778cb905aff041da82b8b48966b23627c0
- 25bcd72628b1f1eb9cde00390bc289061edec8d5e782bbeed61c0e8bcba95a4c
- f7c6a053db3b0ffdbbdd7d31b7a87ce17b606c9b34c9b6e2d7fa39fcd51c7abf
- 503a00c27d5fb455280026b6640a733532f34526dd3646dd90d251785deff3ab
- bbfb154a0a3f66ddf581250834b1a84ccc57e0bf31791126fc72bdf540fc53ab
- 2a3bd06b41ab5acc404c68ae79f350efae95dbb875959697b1fb073223f44bbf
- 6ce8fe5b269d130e721df5cc83b8d7751f509c722ac34c1cff65f2822c45588e
- 24f139e7026d65222877549d77a818f90227c4df1a4c55a77d8cf105196b4152
- f7134d2fcb4eae10f71d23a5cd913fa2e9f8144aec082b8bac1b6e90c5d5ccd8
- 937cbc6050fb49de1ee25ed40260cb1a2335dd3c45f36ef76c67c372abf31e2a
- 70752bf61cfb5aa796a66168a78fcdcc4b15eeae5fe833f0d7fa0f6a9a1d19bb
- b8c5de779cd49b1f3ff0aab7fdcfb3b0bc35febf0aedaf97931fc7c9929e4a30
- 8bd81860dac7b6c6ea23606a794c2e21c62e7d34e31a4b734b218a1f3087413d
- 9a83bc58005291560e4d41345b7bdde53a7d767f93800d354da50e02e9ae3d35
- e5ccdaf8da018b4e15fe9c22a3f08139530eed4fd63dbbb20c2af8d884c0ea51
- c591b6be0c4648332770ae9629dbd4218189e27fae15c7a20e50f934dd60ef04
- c6cdbaa051124cd1c5bfcc5625bb38929dccd73f45d8ede6e81e47b338165410
- 10e2fc8ad5963f4a2b6ccfa112cbbda613d599943e473ab12c832a829ee7f8c0
- f6eddf93b7f36560f2e8e48ee90d57ec7164d34f975edafd5dda138d134c56a4
- 4f64f238d148df1017a630418b9e310f3ad8c9556da38e05e714c2e3573b22ca
- 9ba2135bfcd1abcc425c0274cec8d75e131b58146149cf6c09cd0b6c32a98ba8
- 4aa78bb6c16188a46563bb915515a0594d9a35249a30f0a4146e88f17c8258ca
- 4629cd13b01ff4780f15e6910e2ab18acfecc959cf12ecc8ab4928873af4aaf6
- 6baf2ad82710e57624968ca19653ff19b807c6897108952e505bc047cc2681ba
- 90ccbec89eefe6c699c07d6c9ee4f9740ddfbcd9d5d42757f3bb04d29fdd6aa6
- 8cf650dd0fb52fba85099a79db507f9b673b73783af0dc4d4ab131b33a8c4865
- 18b480d7815a71c38afa700400986f91a329f37c5f120d5538d2800fc7287d0e
- da7a4d363c8140250f4748c6ef30e9bb758897a876b07ea9cecf837eb8c8801d
- 27a64ebb7c7ffeac4c180b8345f367d4d5a8f19f028bc7e7d3cce71387ada7a6
- 3b23c414022ec650ee1693d5afab1d3c7aead524a6a1d13a5a1aa2d89663656c
- 6629415d4104a095d51bd39d4c9c1b68bca2c8c74b4997bd58c86e38c29cb958
- 4b4628db7ef33b82489c7a0d284710ae66061ae7aa51905533a34325a963c12b
- ff6ac635724a3c7b8dbb4aa719ae08529472ed45f0548d0a114f47af35bd3cdf
- c99e343a501d33770e2d7f20c7bde511fd08513b193720311ba6be23c5cddbf9
- 88666d0e1c75df90439a0445f112b65b610ff88a533acfae8ec547923637e28d
- cb5089145a63e30c98ce5ecc4e7837dc6868ff17b7d69f8d29cf810be64c0866
- a55fa2143c1830c0c69242ec009791ad4782e89799a7c463e3011f46248377fe
- 1d7107de89100d505ce74d11668921bafec894268b14082361429ab504895db5
- b422c9d62e7f10786d897e91d97f07e17c50b6fba793590c6407bfdcf8e05be5"
+checksum="c90871f30511a1fd0239f111314df72d62bc97e0318b27b142a69061a690a433
+ 2ea425bb991cb7dcade08235bd6337541f428d81d47c6457c3e689fe2670187b
+ 391f11d828886b664313f396e9a2c37d9f84d870e44da4a20e6429f894993a3d
+ 0d16e860af4bf4469964a5e33e4b5955b279810c01f24b48a148caec33135999
+ f8169b1d0ea00a97f76170fd7fbf2f9c9410d5f5b7f76617898607afc8721659
+ f707aca4430030232dcb10db16b4e6f260eb1b190bf887c3e14f5a42f958f788
+ 8ca13bfee4ef7ecfbe56bddd39b380861a8917548ef40f845a10ef07f518b540
+ 7e92713edc65ff8220d225de0295e2e053b2ac109b9b5d1a62c4b2e6aef500b2
+ ac491c3d5762375af224ed8d3b7a3e87457d52dee8556a42984743f3664da47a
+ 43d5d15c31ff4469fb9623874fada0661e7d2d58778e83d6d387c2fbdaa62d4c
+ b7c27cedb4ad120bc7d96f4b780575a47774c104296dfb1044f087b0dfbb4cb8
+ db76502d94ae5428ce8649909d86b71af419e4d7911b60336b9336c0f336458b
+ a910a6b8fe220a3288405118cc58cf46072074beb338ed1de76ecea9b0b17483
+ e3039d85930fc2c3c91d433d910ffcf7d795a3c49a98c47a85fe7d492735cc8a
+ 62d29d77de557b0d5db21668c340ebb3126adf005e355c05efd688c45a9c9778
+ bf5435e2d4f30e7b2f2dfebbea72756ec0dd3d9c8d86e3ee783f9c5b0fbf5eab
+ de17150a12ef38ad96b413b4ea0adf6c22f9cc43acea864d147a52c343b6da48
+ 4d2f9ca150a09693860572ef3e506371eac9119380aa6fc69b4f8d765d19a47b
+ 0bdb31f365ed3faaa448655e9c84a7d45954967aeb3511dfb7ad9348e7ac8897
+ 529ab9871fd66b722500130acd4f443e04004e26af6047de6e90e48350d99a3a
+ efde26d2d7fb8f90d1d3b66ccd2d07d73aa1a68bb95982ca48af3d7e4b4ff59d
+ 563d588231f3cf0a2f2e8cfdb67f2d18cf10ab104c3c4cae158d3cb76f01a945
+ 1cecfc411164d5346221166fa6b97e61dbf049559e71a3f3b8bb4ed0168ae700
+ 2ae0ba26271ac4343eea9641676c1ca8938d580aa236266053535f4700daecef
+ edb82e33ce05e8d47f11e1ea183e6263e13bde4911494ea4df7330dcae72ca7d
+ aaf0a8b6b75e3b9b6ecb0910b00d6b331c850a0bb70dbf991150bffde4701cf9
+ af2e6bf160245b581afebaec182775ebef30a59bd0403bb1f6d40113d4e67c3c
+ ecb112af96e7a78281de6c2b8993fcf2e1a1ac553c858ec74b5071e6056c95e3
+ a2a2e3c75b493f76217374d285c39699b74199179c3147f15594655eddbeacac
+ 3cffa707743048855fab402484fd844deb82cd95a8798ecef12d2f1bcaf1b749
+ e512b0fe890cfeed3239d4ff6420dad4167f319e2a438c3518676b6b5af3a2ad
+ fb8fb5d905546e005085c060bb8a25f0a7bb6b7c32a5823276053119b95e6441
+ fbbf692126bfda1f640a66a3edd17accad2c62ef8cb9baf4f5722c910c4a5aca
+ e7efacde88f46fb5bae91751060e5af1279c8fac262a86100d22f5be9afac1a0
+ 92c701bb04ce94474ac2a00353f5fb7bba5420dd652364f5a62e2f2a939fe2e6
+ 043ac88c26986fe7c2086a87bd4e9399ad285025b313e5de1c80d5d401dde007
+ ba26a369aebcda2005ce250a2bd6ef7b420e482b604cfccb8c92b3492be7357f
+ 7c3209849d76f092c4cb506cbbf732659e36832e93638661b72b7df3038b10b1
+ f842a3b899296e7702449ebeef2aa145cd6bd19c11a3db3be44b1a1e735c297c
+ 740ab17e96fb20527965c68ec615fa9343b880caf992c48af78627ff53eac8ef
+ d6eb4f0c9fed7c5e20d7569562e812b0a93a978204e02133a86c615dc304740c
+ 1900d17b2c1fd0710a5bddd6a75e929a7a0fef1775c6392488648f09ec12a2f5
+ 84b06e36ead8be66b8b1f86e01ad97c3267111aa0167fca92dbecf3ab7196022
+ d6d2f95652d0245d475b6af4f638cb55140cc2a95a024000dd9428ea6981a06c
+ 1772f1f7a2ec0eaf19fa1beb9157d310d2ed8d18ea40faabcf84b27c377a90c2
+ 2471f410586f3e77827d3eb9d7f04e8d1965f6c2c2986f5fd500e62d1d2eb142
+ bda9f2307c199bf5073d087064feecf62cc536234f183b006bd472eb9894f508
+ a39834727af982049cafd5638cfd5b03ea562a9d4567a0c6daa70bd283304560
+ 850e06f39c51b3a41a766d431146baba25f903f3b375c57008d77910138861bb
+ 10fbc7cf3d74104601ae466b74be3925b94b54e42d37045d15a6a1ee219ccdfe
+ 02ec6d50bd6712bf3c34289d9352e0d95b934fdd835b7eb3957b1f058a93e2bc
+ ef3f2d5d7fa0c6edbc2ad039365cae0c284f3bbbc93bcba022d5ba66ccb8efb4
+ 9e9d43d3dc13a5d8086c3b967623fcd0ecc7cb40fb43206fbf108a21319398b9
+ 38a4f89f8acef81ca3971a12935e6eb099d7581ff9124db1424bb97482671e5b
+ 8eaeafc8260c983a8f34632f47ef47bca3d31aae8f06555f52268b6104426936
+ 7443367dc616d890912c2bde79524f9860017aacae895b7be11128ddf0466d39
+ 7cfe2388f3e207beafe83db99f5594d4e70fdbabeab6994f2e55b876bdab41bb
+ 5699823a1d0fa7670098db710d4e8e834234942f63890151b44c114c2871beaa
+ 08c85e71b090fc211add94883390d01899d0dcc592e9a6e9582b575cb875356e
+ b949c2430efd9ce30a198b0d02e33af14543e4f4785c2c17841eca572b5991db
+ 555d87901dc5c22eeb12b7a2704be3d8274556c387e88d46ee1cf3bf18a343c5
+ 4135f74736662a7bb40739d48cad652a478faf9a3971bc8a0748103d12ea0322
+ 93bc0c2b0bdd31c7e8e3563864721fd94ab01f6a4e7b36e339a925c865405836
+ 9bb9d2fda645d64503462731d0898216ca0f1a93e2e05b5b4ccc259462263637
+ da128795d8db727470ac1c4e7d283b6282a3cc40e35429b0ce5987ef6f4839f3
+ 02bbdb6c1951963e2210d2908c8ae654d1c72d73712306f4c9b17a5c481c2889
+ f3db9018d715ee0bc97c77467c688628a9286b164d011f61bdf2409181191a3c
+ 16101575d453cd58e2846c450d47589ccbe7a027fce8dc19006bdc98245ac80d
+ a77f8bec90e54255b15552fdea11d212c9763faed791149a30fa1715f46ff8a0
+ bfe4150c164c8aedab2246193616a4fe8417537214314b6a7c27f69e7064e0ef
+ 3ba92a02eeba86382200fa44e2e9fad0e4ab6783c2520ac4849123ed125afd28
+ 1936604c7c7dc78f2cd902a1f1ba9c575a5776f07121cada36d0db56105535ce
+ 89413f13098a132fcd9ab5230edcf03cd0f428c265f18d94567130319624faf6
+ d727e9851dd06d0e8396f5cc8b0b973ddb55d28b72666f8f1b2ae7fa91241190
+ 9890803e3b50de7ebcb88942086ba7d44c698b5019485f756203be7b071e045f
+ bfcc6b394403ccafedf0eb2194c8bd3634bdc9fba88ca7875605149df1d7cb95
+ d254fd7ec27d2a611f8e1cf39ee3b9b8d54b73bb7befc465e5e06f29c211fc1d
+ 25c6db9cea3fb8b23dfac272b1e6f980e0837ea923e7053f9ec50ad46b6ae388
+ 5acc2a35206fb82f7c11ffb44586c4eeb3bfda67bae9cd56b68c903c706867a1
+ 4eecaf6e949bc4db33bf9600c1728448d05ca57c241ec9bcf02bfa57416b22ff
+ e99e561e1540a2fd31581466c31495dfac606d85d25bab0ded5efc04f3937808
+ 936fd25b5980f7c074569c0870b872162188cf7bd542f2b2da7079a8e5c1e879
+ ebd12ebbb2acd170ed74f926815062fb869085721ebb80512f8b5b7fedb635d5
+ 38ae1ae06591304f88a2d894f7cdf1f67f18fe7cf6a9aa425df833b725990621
+ f0e83b35ffa3aa603e383a2846298a11d2dd4654b4566c8d3e5d49dd24a8e863
+ bfdb2af98916f2968a37c8755c7ba49fc1644ddd4c08f8d9615a0dcdd6b1a4d2
+ afd6b1d2f1ad6e0e4bcd206280950950e6a198694a0e6f741520be9cc286578f
+ 4d494351034b77005180260e2b1259f83f13ec8ffad12a1b64e151b8616f4acd
+ edb93b9dd44e96ac38d292f5d1a9112db152ed2495add62ac24b9a25132c9c2f
+ 864f9faef65d2afbc7955fbf96bdd55de7900865ca5b2e4870351b16d55f6327
+ 32205ee0538e995dff05036ab6d0958b16ac18ca850d952f32a1de2723196896
+ d34fe9233dde445e57b5d3a635c74a7404a4bfd58c15caf06983d4e90fc08016
+ 8876206a3affa3892ccf37d356a2bdaf13ef9c6e6b3b28fe9dae902aff77b3b7
+ c22dd129f70a222882fae0f8ce839a925b8102259f9c5a28399f8f6eb5b76b54
+ 0eb523bb0d18195e4db17560311450453f47e5d3ddb8df22dbba3328030a1d39
+ 4f6933bd681561a6c252549ac813bd9c28c25239e1899150289bf88c1109758f"
From f064b336c1ff796f076c437f9d72f216a379a336 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 31 Jan 2023 16:13:48 +0100
Subject: [PATCH 045/356] thermald: update to 2.5.2.
---
srcpkgs/thermald/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 53820690c8c1..b7947fbbddc0 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
# Template file for 'thermald'
pkgname=thermald
-version=2.5.1
+version=2.5.2
revision=1
archs="i686* x86_64*"
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/intel/thermal_daemon"
distfiles="https://github.com/intel/thermal_daemon/archive/v${version}.tar.gz"
-checksum=75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5
+checksum=9c69588b94a98b4843cd46e3bae570f55020b5e2bf1b417a0c6990f6519070c9
conf_files='/etc/thermald/*'
if [ "$CROSS_BUILD" ]; then
From bb408e52d33bf9a90d2387baca9bc8c96b10d4c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 31 Jan 2023 09:28:27 -0500
Subject: [PATCH 046/356] libtpms: update to 0.9.5.
---
srcpkgs/libtpms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..81b940cdc823 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,6 +1,6 @@
# Template file for 'libtpms'
pkgname=libtpms
-version=0.9.4
+version=0.9.5
revision=1
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause, custom:IBM"
homepage="https://github.com/stefanberger/libtpms"
distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
-checksum=61d6f947a60686ec98e7cc5861f0999bd6cdaa1fc2b8901b8dc68d1a715b35cf
+checksum=9522c69001e46a3b0e1ccd646d36db611b2366c395099d29037f2b067bf1bc60
pre_configure() {
autoreconf -f -i
From a0029504ab2c1b4bdadf7328cbc7ed60058583c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 31 Jan 2023 09:29:07 -0500
Subject: [PATCH 047/356] swtpm: update to 0.8.0.
---
srcpkgs/swtpm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..feb07c7bfb95 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,6 +1,6 @@
# Template file for 'swtpm'
pkgname=swtpm
-version=0.7.3
+version=0.8.0
revision=1
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/stefanberger/swtpm"
distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
-checksum=e856d1f5842fb3335164f02f2c545dd329efbc3416db20b7a327e991a4cd49c8
+checksum=ad433f9272fb794aafd550914d24cc0ca33d4652cfd087fa41b911fa9e54be3d
# check expects that root directory is setup fully for swtpm with e.g. tss user created
make_check=no
ignore_elf_files="/usr/share/swtpm/swtpm-localca"
From a425a12578990b6e36981294120d8864f90f095a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 5 Jan 2023 22:30:04 +0700
Subject: [PATCH 048/356] python3-Sphinx: update to 6.1.0.
---
srcpkgs/python3-Sphinx/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index d021cb7f9f29..7ff72dc54f3f 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,10 +1,10 @@
# Template file for 'python3-Sphinx'
pkgname=python3-Sphinx
-version=5.3.0
+version=6.1.0
revision=1
build_style=python3-pep517
make_install_target="dist/sphinx-$version-py3-none-any.whl"
-hostmakedepends="python3-flit_core"
+hostmakedepends="python3-flit_core python3-pyproject-hooks"
depends="python3-Jinja2 python3-docutils python3-Pygments
python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
python3-requests python3-packaging python3-sphinxcontrib-applehelp
@@ -12,13 +12,13 @@ depends="python3-Jinja2 python3-docutils python3-Pygments
python3-sphinxcontrib-jsmath python3-sphinxcontrib-qthelp
python3-sphinxcontrib-serializinghtml"
checkdepends="$depends python3-html5lib python3-mypy ImageMagick gettext
- python3-pytest"
+ python3-pytest python3-setuptools"
short_desc="Python 3 documentation generator"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="http://sphinx-doc.org"
distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5
+checksum=b0fd0a1993733492572bbd429b5ec081e17c082b5b5168ffae50524c3a90fd3c
conflicts="python-Sphinx>=0"
post_install() {
From 2b9380763db30ac366e436c1fd349441d78b5427 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 27 Jan 2023 10:45:20 -0500
Subject: [PATCH 049/356] poco: update to 1.12.4, orphan
---
common/shlibs | 26 +++++++++++++-------------
srcpkgs/poco/template | 11 ++++++-----
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..523fd15af734 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3006,19 +3006,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
libsigrokcxx.so.4 libsigrok-0.5.0_1
libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_3
-libPocoMongoDB.so.64 poco-1.9.4_3
-libPocoZip.so.64 poco-1.9.4_3
-libPocoData.so.64 poco-1.9.4_3
-libPocoNet.so.64 poco-1.9.4_3
-libPocoDataSQLite.so.64 poco-1.9.4_3
-libPocoFoundation.so.64 poco-1.9.4_3
-libPocoXML.so.64 poco-1.9.4_3
-libPocoUtil.so.64 poco-1.9.4_3
-libPocoRedis.so.64 poco-1.9.4_3
-libPocoEncodings.so.64 poco-1.9.4_3
-libPocoNetSSL.so.64 poco-1.9.4_3
-libPocoCrypto.so.64 poco-1.9.4_3
+libPocoJSON.so.94 poco-1.12.4_1
+libPocoMongoDB.so.94 poco-1.12.4_1
+libPocoZip.so.94 poco-1.12.4_1
+libPocoData.so.94 poco-1.12.4_1
+libPocoNet.so.94 poco-1.12.4_1
+libPocoDataSQLite.so.94 poco-1.12.4_1
+libPocoFoundation.so.94 poco-1.12.4_1
+libPocoXML.so.94 poco-1.12.4_1
+libPocoUtil.so.94 poco-1.12.4_1
+libPocoRedis.so.94 poco-1.12.4_1
+libPocoEncodings.so.94 poco-1.12.4_1
+libPocoNetSSL.so.94 poco-1.12.4_1
+libPocoCrypto.so.94 poco-1.12.4_1
libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 008536b67121..6ca714b9e94f 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,16 +1,17 @@
# Template file for 'poco'
pkgname=poco
-version=1.9.4
-revision=3
+version=1.12.4
+revision=1
build_style=cmake
configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre2-devel expat-devel sqlite-devel"
short_desc="C++ class libraries for building network-based applications"
-maintainer="Julien Dehos <dehos@univ-littoral.fr>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSL-1.0"
homepage="https://pocoproject.org"
distfiles="https://pocoproject.org/releases/${pkgname}-${version}/${pkgname}-${version}-all.tar.gz"
-checksum=eb34f257b11240a711ee505f1d80c754a80a990aeb48d8d93407884df288fd77
+checksum=4c3584daa5b0e973f268654dbeb1171ec7621e358b2b64363cd1abd558a68777
+conflicts="archiver"
post_install() {
vlicense LICENSE
From 4c3bf3da2a55d9957549f86b0e7ca890d4d54be9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 27 Jan 2023 10:45:43 -0500
Subject: [PATCH 050/356] remwharead: bump for poco
---
srcpkgs/remwharead/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index e72ab06131e4..4af548c46743 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
@@ -9,7 +9,7 @@ short_desc="Saves URIs of things you want to remember in a database"
maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-only"
homepage="https://schlomp.space/tastytea/remwharead"
-distfiles="https://github.com/tastytea/remwharead/archive/${version}.tar.gz"
+distfiles="https://github.com/tastytea/remwharead/archive/refs/tags/${version}.tar.gz"
checksum=87f14a611e3ae9f9babe2dff8e4a6c4f5495fa2883393edb36e796af3f19fb30
remwharead-firefox-plugin_package() {
From 7dc0412dce16dc67a14aa0fa4b1d937c14d0a3bd Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 30 Jan 2023 10:45:04 -0500
Subject: [PATCH 051/356] mumble: bump for poco, patch for openssl3
---
srcpkgs/mumble/patches/openssl3.patch | 685 ++++++++++++++++++++++++++
srcpkgs/mumble/template | 2 +-
2 files changed, 686 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mumble/patches/openssl3.patch
diff --git a/srcpkgs/mumble/patches/openssl3.patch b/srcpkgs/mumble/patches/openssl3.patch
new file mode 100644
index 000000000000..906d1790444b
--- /dev/null
+++ b/srcpkgs/mumble/patches/openssl3.patch
@@ -0,0 +1,685 @@
+From f4cea62ed95e4967d8591f25e903f5e8fc2e2a30 Mon Sep 17 00:00:00 2001
+From: Terry Geng <terry@terriex.com>
+Date: Mon, 6 Dec 2021 10:45:11 -0500
+Subject: [PATCH] BUILD(crypto): Migrate to OpenSSL 3.0-compatible API
+
+OpenSSL 3.0 deprecated several low-level APIs and the usage of them
+caused errors/warnings that prevent the binary from being built against
+OpenSSL 3.0.
+Some primitive efforts have been made in #5317 but were incomplete.
+This commit follows https://www.openssl.org/docs/man3.0/man7/migration_guide.html,
+https://code.woboq.org/qt6/qtopcua/src/opcua/x509/qopcuakeypair_openssl.cpp.html,
+and clears all errors/warnings related to the usage of deprecated APIs.
+
+Fixes #5277
+Fixes #4266
+---
+ src/SelfSignedCertificate.cpp | 235 +++++++++++-----------------------
+ src/SelfSignedCertificate.h | 5 +
+ src/crypto/CryptStateOCB2.cpp | 53 +++++---
+ src/crypto/CryptStateOCB2.h | 9 +-
+ 4 files changed, 121 insertions(+), 181 deletions(-)
+
+diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp
+index a77e5fad91..ea0dec4cc7 100644
+--- a/src/SelfSignedCertificate.cpp
++++ b/src/SelfSignedCertificate.cpp
+@@ -5,8 +5,6 @@
+
+ #include "SelfSignedCertificate.h"
+
+-#include <openssl/x509v3.h>
+-
+ #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()
+
+ static int add_ext(X509 *crt, int nid, char *value) {
+@@ -28,108 +26,86 @@ static int add_ext(X509 *crt, int nid, char *value) {
+ return 1;
+ }
+
+-bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
+- QSslCertificate &qscCert, QSslKey &qskKey) {
+- bool ok = true;
+- X509 *x509 = nullptr;
+- EVP_PKEY *pkey = nullptr;
+- RSA *rsa = nullptr;
+- BIGNUM *e = nullptr;
+- X509_NAME *name = nullptr;
+- ASN1_INTEGER *serialNumber = nullptr;
+- ASN1_TIME *notBefore = nullptr;
+- ASN1_TIME *notAfter = nullptr;
+- QString commonName;
+- bool isServerCert = certificateType == CertificateTypeServerCertificate;
+-
+- if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
+- ok = false;
+- goto out;
++EVP_PKEY *SelfSignedCertificate::generate_rsa_keypair() {
++ EVP_PKEY *pkey = EVP_PKEY_new();
++ if (!pkey) {
++ return nullptr;
+ }
+
+- x509 = X509_new();
+- if (!x509) {
+- ok = false;
+- goto out;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr);
++ if (!ctx) {
++ return nullptr;
+ }
+-
+- pkey = EVP_PKEY_new();
+- if (!pkey) {
+- ok = false;
+- goto out;
++ if (EVP_PKEY_keygen_init(ctx) <= 0) {
++ return nullptr;
+ }
+-
+- rsa = RSA_new();
++ if (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048) <= 0) {
++ return nullptr;
++ }
++ if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
++ return nullptr;
++ }
++ EVP_PKEY_CTX_free(ctx);
++#else
++ RSA *rsa = RSA_new();
++ BIGNUM *e = BN_new();
+ if (!rsa) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+- e = BN_new();
+ if (!e) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+ if (BN_set_word(e, 65537) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+ if (RSA_generate_key_ex(rsa, 2048, e, nullptr) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+ if (EVP_PKEY_assign_RSA(pkey, rsa) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
++ BN_free(e);
++ RSA_free(rsa);
++#endif
++ return pkey;
++}
+
+- if (X509_set_version(x509, 2) == 0) {
+- ok = false;
+- goto out;
++#define CHECK(statement) \
++ if (!(statement)) { \
++ ok = false; \
++ goto out; \
+ }
+
+- serialNumber = X509_get_serialNumber(x509);
+- if (!serialNumber) {
+- ok = false;
+- goto out;
+- }
+- if (ASN1_INTEGER_set(serialNumber, 1) == 0) {
+- ok = false;
+- goto out;
+- }
+
+- notBefore = X509_get_notBefore(x509);
+- if (!notBefore) {
+- ok = false;
+- goto out;
+- }
+- if (!X509_gmtime_adj(notBefore, 0)) {
+- ok = false;
+- goto out;
+- }
++bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
++ QSslCertificate &qscCert, QSslKey &qskKey) {
++ bool ok = true;
++ EVP_PKEY *pkey = nullptr;
++ X509 *x509 = nullptr;
++ X509_NAME *name = nullptr;
++ ASN1_INTEGER *serialNumber = nullptr;
++ ASN1_TIME *notBefore = nullptr;
++ ASN1_TIME *notAfter = nullptr;
++ QString commonName;
++ bool isServerCert = certificateType == CertificateTypeServerCertificate;
+
+- notAfter = X509_get_notAfter(x509);
+- if (!notAfter) {
+- ok = false;
+- goto out;
+- }
+- if (!X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20)) {
+- ok = false;
+- goto out;
+- }
++ // In Qt 5.15, a class was added to wrap up the procedures of generating a self-signed certificate.
++ // See https://doc.qt.io/qt-5/qopcuax509certificatesigningrequest.html.
++ // We should consider migrating to this class after switching to Qt 5.15.
+
+- if (X509_set_pubkey(x509, pkey) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(pkey = generate_rsa_keypair());
+
+- name = X509_get_subject_name(x509);
+- if (!name) {
+- ok = false;
+- goto out;
+- }
++ CHECK(x509 = X509_new());
++ CHECK(X509_set_version(x509, 2));
++ CHECK(serialNumber = X509_get_serialNumber(x509));
++ CHECK(ASN1_INTEGER_set(serialNumber, 1));
++ CHECK(notBefore = X509_get_notBefore(x509));
++ CHECK(X509_gmtime_adj(notBefore, 0));
++ CHECK(notAfter = X509_get_notAfter(x509));
++ CHECK(X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20))
++ CHECK(X509_set_pubkey(x509, pkey));
++ CHECK(name = X509_get_subject_name(x509));
+
+ if (isServerCert) {
+ commonName = QLatin1String("Murmur Autogenerated Certificate v2");
+@@ -141,120 +117,63 @@ bool SelfSignedCertificate::generate(CertificateType certificateType, QString cl
+ }
+ }
+
+- if (X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
+- reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0)
+- == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
++ reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0));
+
+- if (X509_set_issuer_name(x509, name) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_set_issuer_name(x509, name));
+
+- if (add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")));
+
+ if (isServerCert) {
+- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")))
+ } else {
+- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")));
+ }
+
+- if (add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")));
+
+ if (isServerCert) {
+- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")));
+ } else {
+- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")));
+ }
+
+ if (!isServerCert) {
+ if (!clientCertEmail.trimmed().isEmpty()) {
+- if (add_ext(x509, NID_subject_alt_name,
+- QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data())
+- == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_subject_alt_name,
++ QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data()));
+ }
+ }
+
+- if (X509_sign(x509, pkey, EVP_sha1()) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_sign(x509, pkey, EVP_sha1()));
+
+ {
+ QByteArray crt;
+ int len = i2d_X509(x509, nullptr);
+- if (len <= 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(len > 0);
+ crt.resize(len);
+
+ unsigned char *dptr = reinterpret_cast< unsigned char * >(crt.data());
+- if (i2d_X509(x509, &dptr) != len) {
+- ok = false;
+- goto out;
+- }
++ CHECK(i2d_X509(x509, &dptr) == len);
+
+ qscCert = QSslCertificate(crt, QSsl::Der);
+- if (qscCert.isNull()) {
+- ok = false;
+- goto out;
+- }
++ CHECK(!qscCert.isNull());
+ }
+
+ {
+ QByteArray key;
+ int len = i2d_PrivateKey(pkey, nullptr);
+- if (len <= 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(len > 0);
+ key.resize(len);
+
+ unsigned char *dptr = reinterpret_cast< unsigned char * >(key.data());
+- if (i2d_PrivateKey(pkey, &dptr) != len) {
+- ok = false;
+- goto out;
+- }
++ CHECK(i2d_PrivateKey(pkey, &dptr) == len);
+
+ qskKey = QSslKey(key, QSsl::Rsa, QSsl::Der);
+- if (qskKey.isNull()) {
+- ok = false;
+- goto out;
+- }
++ CHECK(!qskKey.isNull());
+ }
+
+ out:
+- if (e) {
+- BN_free(e);
+- }
+- // We only need to free the pkey pointer,
+- // not the RSA pointer. We have assigned
+- // our RSA key to pkey, and it will be freed
+- // once we free pkey.
+ if (pkey) {
+ EVP_PKEY_free(pkey);
+ }
+diff --git a/src/SelfSignedCertificate.h b/src/SelfSignedCertificate.h
+index b85a8752b8..7c5f59e9c5 100644
+--- a/src/SelfSignedCertificate.h
++++ b/src/SelfSignedCertificate.h
+@@ -6,6 +6,10 @@
+ #ifndef MUMBLE_SELFSIGNEDCERTIFICATE_H_
+ #define MUMBLE_SELFSIGNEDCERTIFICATE_H_
+
++#include <openssl/evp.h>
++#include <openssl/rsa.h>
++#include <openssl/x509v3.h>
++
+ #include <QtCore/QString>
+ #include <QtNetwork/QSslCertificate>
+ #include <QtNetwork/QSslKey>
+@@ -16,6 +20,7 @@ class SelfSignedCertificate {
+ private:
+ static bool generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
+ QSslCertificate &qscCert, QSslKey &qskKey);
++ static EVP_PKEY *generate_rsa_keypair();
+
+ public:
+ static bool generateMumbleCertificate(QString name, QString email, QSslCertificate &qscCert, QSslKey &qskKey);
+diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
+index 2176d64883..640fdedac8 100644
+--- a/src/crypto/CryptStateOCB2.cpp
++++ b/src/crypto/CryptStateOCB2.cpp
+@@ -30,7 +30,7 @@
+ #include <cstring>
+ #include <openssl/rand.h>
+
+-CryptStateOCB2::CryptStateOCB2() : CryptState() {
++CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
+ for (int i = 0; i < 0x100; i++)
+ decrypt_history[i] = 0;
+ memset(raw_key, 0, AES_KEY_SIZE_BYTES);
+@@ -38,6 +38,11 @@ CryptStateOCB2::CryptStateOCB2() : CryptState() {
+ memset(decrypt_iv, 0, AES_BLOCK_SIZE);
+ }
+
++CryptStateOCB2::~CryptStateOCB2() noexcept {
++ EVP_CIPHER_CTX_free(enc_ctx);
++ EVP_CIPHER_CTX_free(dec_ctx);
++}
++
+ bool CryptStateOCB2::isValid() const {
+ return bInit;
+ }
+@@ -46,8 +51,6 @@ void CryptStateOCB2::genKey() {
+ CryptographicRandom::fillBuffer(raw_key, AES_KEY_SIZE_BYTES);
+ CryptographicRandom::fillBuffer(encrypt_iv, AES_BLOCK_SIZE);
+ CryptographicRandom::fillBuffer(decrypt_iv, AES_BLOCK_SIZE);
+- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
+- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
+ bInit = true;
+ }
+
+@@ -56,8 +59,6 @@ bool CryptStateOCB2::setKey(const std::string &rkey, const std::string &eiv, con
+ memcpy(raw_key, rkey.data(), AES_KEY_SIZE_BYTES);
+ memcpy(encrypt_iv, eiv.data(), AES_BLOCK_SIZE);
+ memcpy(decrypt_iv, div.data(), AES_BLOCK_SIZE);
+- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
+- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
+ bInit = true;
+ return true;
+ }
+@@ -256,10 +257,24 @@ static void inline ZERO(keyblock &block) {
+ block[i] = 0;
+ }
+
+-#define AESencrypt(src, dst, key) \
+- AES_encrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
+-#define AESdecrypt(src, dst, key) \
+- AES_decrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
++#define AESencrypt(src, dst, key) \
++ { \
++ int outlen = 0; \
++ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
++ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++ }
++#define AESdecrypt(src, dst, key) \
++ { \
++ int outlen = 0; \
++ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
++ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++ }
+
+ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
+@@ -267,7 +282,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ bool success = true;
+
+ // Initialize
+- AESencrypt(nonce, delta, &encrypt_key);
++ AESencrypt(nonce, delta, raw_key);
+ ZERO(checksum);
+
+ while (len > AES_BLOCK_SIZE) {
+@@ -299,7 +314,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ if (flipABit) {
+ *reinterpret_cast< unsigned char * >(tmp) ^= 1;
+ }
+- AESencrypt(tmp, tmp, &encrypt_key);
++ AESencrypt(tmp, tmp, raw_key);
+ XOR(reinterpret_cast< subblock * >(encrypted), delta, tmp);
+ XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
+ if (flipABit) {
+@@ -315,7 +330,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ ZERO(tmp);
+ tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
+ XOR(tmp, tmp, delta);
+- AESencrypt(tmp, pad, &encrypt_key);
++ AESencrypt(tmp, pad, raw_key);
+ memcpy(tmp, plain, len);
+ memcpy(reinterpret_cast< unsigned char * >(tmp) + len, reinterpret_cast< const unsigned char * >(pad) + len,
+ AES_BLOCK_SIZE - len);
+@@ -325,7 +340,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+
+ S3(delta);
+ XOR(tmp, delta, checksum);
+- AESencrypt(tmp, tag, &encrypt_key);
++ AESencrypt(tmp, tag, raw_key);
+
+ return success;
+ }
+@@ -336,13 +351,13 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ bool success = true;
+
+ // Initialize
+- AESencrypt(nonce, delta, &encrypt_key);
++ AESencrypt(nonce, delta, raw_key);
+ ZERO(checksum);
+
+ while (len > AES_BLOCK_SIZE) {
+ S2(delta);
+ XOR(tmp, delta, reinterpret_cast< const subblock * >(encrypted));
+- AESdecrypt(tmp, tmp, &decrypt_key);
++ AESdecrypt(tmp, tmp, raw_key);
+ XOR(reinterpret_cast< subblock * >(plain), delta, tmp);
+ XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
+ len -= AES_BLOCK_SIZE;
+@@ -354,7 +369,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ ZERO(tmp);
+ tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
+ XOR(tmp, tmp, delta);
+- AESencrypt(tmp, pad, &encrypt_key);
++ AESencrypt(tmp, pad, raw_key);
+ memset(tmp, 0, AES_BLOCK_SIZE);
+ memcpy(tmp, encrypted, len);
+ XOR(tmp, tmp, pad);
+@@ -372,7 +387,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+
+ S3(delta);
+ XOR(tmp, delta, checksum);
+- AESencrypt(tmp, tag, &encrypt_key);
++ AESencrypt(tmp, tag, raw_key);
+
+ return success;
+ }
+@@ -381,5 +396,5 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ #undef SHIFTBITS
+ #undef SWAPPED
+ #undef HIGHBIT
+-#undef AES_encrypt
+-#undef AES_decrypt
++#undef AESencrypt
++#undef AESdecrypt
+diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
+index 53d4b4b6aa..cc3f1c0bc3 100644
+--- a/src/crypto/CryptStateOCB2.h
++++ b/src/crypto/CryptStateOCB2.h
+@@ -8,8 +8,9 @@
+
+ #include "CryptState.h"
+
+-#include <openssl/aes.h>
++#include <openssl/evp.h>
+
++#define AES_BLOCK_SIZE 16
+ #define AES_KEY_SIZE_BITS 128
+ #define AES_KEY_SIZE_BYTES (AES_KEY_SIZE_BITS / 8)
+
+@@ -17,7 +18,7 @@
+ class CryptStateOCB2 : public CryptState {
+ public:
+ CryptStateOCB2();
+- ~CryptStateOCB2(){};
++ ~CryptStateOCB2() noexcept override;
+
+ virtual bool isValid() const Q_DECL_OVERRIDE;
+ virtual void genKey() Q_DECL_OVERRIDE;
+@@ -43,8 +44,8 @@ class CryptStateOCB2 : public CryptState {
+ unsigned char decrypt_iv[AES_BLOCK_SIZE];
+ unsigned char decrypt_history[0x100];
+
+- AES_KEY encrypt_key;
+- AES_KEY decrypt_key;
++ EVP_CIPHER_CTX *enc_ctx;
++ EVP_CIPHER_CTX *dec_ctx;
+ };
+
+
+From f8d47db318f302f5a7d343f15c9936c7030c49c4 Mon Sep 17 00:00:00 2001
+From: Terry Geng <terry@terriex.com>
+Date: Sun, 12 Dec 2021 22:39:38 -0500
+Subject: [PATCH] FIX(crypto): Sharing EVP context between threads crushes
+ Mumble
+
+Functions ocb_encrypt and ocb_decrypt share the same set
+of encrypt and decrypt contexts. However, they are invoked
+in different threads (audio input thread and server
+handler thread).
+This may lead to conflicts that would crash Mumble.
+This patch separates contexts used in these two functions
+to avoid such conflicts.
+
+Fixes #5361
+---
+ src/crypto/CryptStateOCB2.cpp | 55 ++++++++++++++++++++++-------------
+ src/crypto/CryptStateOCB2.h | 6 ++--
+ 2 files changed, 38 insertions(+), 23 deletions(-)
+
+diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
+index 640fdedac8..3b3473ffec 100644
+--- a/src/crypto/CryptStateOCB2.cpp
++++ b/src/crypto/CryptStateOCB2.cpp
+@@ -30,7 +30,9 @@
+ #include <cstring>
+ #include <openssl/rand.h>
+
+-CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
++CryptStateOCB2::CryptStateOCB2()
++ : CryptState(), enc_ctx_ocb_enc(EVP_CIPHER_CTX_new()), dec_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
++ enc_ctx_ocb_dec(EVP_CIPHER_CTX_new()), dec_ctx_ocb_dec(EVP_CIPHER_CTX_new()) {
+ for (int i = 0; i < 0x100; i++)
+ decrypt_history[i] = 0;
+ memset(raw_key, 0, AES_KEY_SIZE_BYTES);
+@@ -39,8 +41,10 @@ CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()),
+ }
+
+ CryptStateOCB2::~CryptStateOCB2() noexcept {
+- EVP_CIPHER_CTX_free(enc_ctx);
+- EVP_CIPHER_CTX_free(dec_ctx);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_dec);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_dec);
+ }
+
+ bool CryptStateOCB2::isValid() const {
+@@ -257,25 +261,28 @@ static void inline ZERO(keyblock &block) {
+ block[i] = 0;
+ }
+
+-#define AESencrypt(src, dst, key) \
+- { \
+- int outlen = 0; \
+- EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+- EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
+- EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+- EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++#define AESencrypt_ctx(src, dst, key, enc_ctx) \
++ { \
++ int outlen = 0; \
++ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
++ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
+ }
+-#define AESdecrypt(src, dst, key) \
+- { \
+- int outlen = 0; \
+- EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+- EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
+- EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+- EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++#define AESdecrypt_ctx(src, dst, key, dec_ctx) \
++ { \
++ int outlen = 0; \
++ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
++ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
+ }
+
++#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_enc)
++#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_enc)
++
+ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
+ keyblock checksum, delta, tmp, pad;
+@@ -345,6 +352,12 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ return success;
+ }
+
++#undef AESencrypt
++#undef AESdecrypt
++
++#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_dec)
++#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_dec)
++
+ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *plain, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag) {
+ keyblock checksum, delta, tmp, pad;
+@@ -392,9 +405,9 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ return success;
+ }
+
++#undef AESencrypt
++#undef AESdecrypt
+ #undef BLOCKSIZE
+ #undef SHIFTBITS
+ #undef SWAPPED
+ #undef HIGHBIT
+-#undef AESencrypt
+-#undef AESdecrypt
+diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
+index cc3f1c0bc3..0fd3000ade 100644
+--- a/src/crypto/CryptStateOCB2.h
++++ b/src/crypto/CryptStateOCB2.h
+@@ -44,8 +44,10 @@ class CryptStateOCB2 : public CryptState {
+ unsigned char decrypt_iv[AES_BLOCK_SIZE];
+ unsigned char decrypt_history[0x100];
+
+- EVP_CIPHER_CTX *enc_ctx;
+- EVP_CIPHER_CTX *dec_ctx;
++ EVP_CIPHER_CTX *enc_ctx_ocb_enc;
++ EVP_CIPHER_CTX *dec_ctx_ocb_enc;
++ EVP_CIPHER_CTX *enc_ctx_ocb_dec;
++ EVP_CIPHER_CTX *dec_ctx_ocb_dec;
+ };
+
+
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 2e6f50da0140..acb6af454e0f 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.4.287
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF
From 04398ed2a6f779abd552635a0defc0edcba4e56b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 23 Jan 2023 15:30:52 -0600
Subject: [PATCH 052/356] zfs: update to 2.1.9.
---
...3-dracut-fix-typo-in-mount-zfs.sh.in.patch | 36 -------------------
srcpkgs/zfs/template | 4 +--
2 files changed, 2 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
diff --git a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch b/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
deleted file mode 100644
index 9944a9a3b8a4..000000000000
--- a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 07f2793e869196fcbcd5057d9ada377674262fe3 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 29 Jun 2022 15:33:38 -0700
-Subject: [PATCH] dracut: fix typo in mount-zfs.sh.in
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Format the `zpool get` command correctly. The -o option must
-be followed by "all" or the requested field name.
-
-Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #13602
-Signed-off-by: Alexis Ehret <git@08a.re>
----
- contrib/dracut/90zfs/mount-zfs.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in
-index fa9f1bb76..b0eb614a6 100755
---- a/contrib/dracut/90zfs/mount-zfs.sh.in
-+++ b/contrib/dracut/90zfs/mount-zfs.sh.in
-@@ -82,7 +82,7 @@ ZFS_DATASET="${ZFS_DATASET:-${root}}"
- ZFS_POOL="${ZFS_DATASET%%/*}"
-
-
--if ! zpool get -Ho name "${ZFS_POOL}" > /dev/null 2>&1; then
-+if ! zpool get -Ho value name "${ZFS_POOL}" > /dev/null 2>&1; then
- info "ZFS: Importing pool ${ZFS_POOL}..."
- # shellcheck disable=SC2086
- if ! zpool import -N ${ZPOOL_IMPORT_OPTS} "${ZFS_POOL}"; then
---
-2.37.3
-
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 910cf795319b..ae975caf9dd9 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
# Template file for 'zfs'
pkgname=zfs
-version=2.1.7
+version=2.1.9
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b
+checksum=6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
From c620021d4c8e1e5e4abe60f7c7be71459096505e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 Jan 2023 11:57:07 -0500
Subject: [PATCH 053/356] python3-phonenumbers: update to 8.13.5.
---
srcpkgs/python3-phonenumbers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 35bf51630192..40b5e4f5e8d3 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.13.4
+version=8.13.5
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
homepage="https://github.com/daviddrysdale/python-phonenumbers"
changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=6d63455012fc9431105ffc7739befca61c3efc551b287dca58d2be2e745475a9
+checksum=6eb2faf29c19f946baf10f1c977a1f856cab90819fe7735b8e141d5407420c4a
From 1c2c90f873b252ea28178173f63fb76caee18559 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 Jan 2023 11:57:34 -0500
Subject: [PATCH 054/356] synapse: update to 1.76.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index d23b55dedcd6..632c181aed96 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.75.0
+version=1.76.0
revision=1
build_style=python3-pep517
build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=8b66a6b36c9d9b9e952d6b0616925343de7d7313699984202cfe69287b985fb7
+checksum=c72320850455b554c0a091577bc12fe9cfe336dfd137d2cbf4342146fb6442b3
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From 85ed705a4b36af9469eb31d4bdea6ca155496e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 31 Jan 2023 15:00:36 +0000
Subject: [PATCH 055/356] ImageMagick: update to 7.1.0.60.
---
srcpkgs/ImageMagick/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 14ddd0784ed3..e98161479198 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
-version=7.1.0.58
+version=7.1.0.60
revision=1
_upstream_version="${version/.${version##*.}/-${version##*.}}"
build_style=gnu-configure
@@ -19,7 +19,7 @@ license="ImageMagick"
homepage="https://www.imagemagick.org"
changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=5767f49cf94bff82b558d79c8039f60c8ea4b51753c6e4b0f16a9442293cfa67
+checksum=94424cc13c5ba18e0e5d5badb834ce74eab11207b00ea32c1f533a5e34c85887
subpackages="libmagick libmagick-devel"
From afa63aaa7b75b914b8cc0231fc66639a4326f78f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 31 Jan 2023 13:41:33 +0100
Subject: [PATCH 056/356] topgrade: update to 10.3.1
---
srcpkgs/topgrade/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 429c0382e66b..dfcca5c8dd8a 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
# Template file for 'topgrade'
pkgname=topgrade
-version=10.3.0
+version=10.3.1
revision=1
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/topgrade-rs/topgrade"
distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
-checksum=6ed1fa0ca3c2031e183ad8852de41be77e216076508e896fc38b7ad1cce15d0d
+checksum=9b94eb5c0fbffcbcf7a4862bf239e31cb9700f517f909d17aa109ba030efe17e
post_install() {
local topgrade="${DESTDIR}/usr/bin/topgrade"
From 1841a8acd4235d0c58685714e81400567695c019 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 21:46:24 -0500
Subject: [PATCH 057/356] fragments: update to 2.1
---
srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------
srcpkgs/fragments/template | 12 ++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch
index 2fdc1521e03d..ecabe0e7804b 100644
--- a/srcpkgs/fragments/patches/no-git.patch
+++ b/srcpkgs/fragments/patches/no-git.patch
@@ -1,11 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 0cb46023cc..eec7e4f694 100644
--- a/meson.build
+++ b/meson.build
-@@ -17,7 +17,7 @@
- name = 'Fragments'
- app_id = 'de.haeckerfelix.Fragments'
- profile = get_option('profile')
+@@ -20,7 +20,7 @@ name = 'Fragments'
+ base_id = 'de.haeckerfelix.Fragments'
+ path_id = '/de/haeckerfelix/Fragments'
+ app_id = base_id
-vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+vcs_tag = 'none'
+ profile = get_option('profile')
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
localedir = join_paths(get_option('prefix'), get_option('localedir'))
- datadir = get_option('datadir')
- pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index ec3a4f9bd315..f26e0aa4585e 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,10 +1,11 @@
# Template file for 'fragments'
pkgname=fragments
-version=2.0.2
+version=2.1
revision=1
build_style=meson
build_helper="rust"
-hostmakedepends="cargo pkg-config gettext glib-devel"
+hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
+ gtk4-update-icon-cache"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
short_desc="BitTorrent Client"
@@ -12,12 +13,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/Fragments"
distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf
+checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
post_patch() {
if [ "$CROSS_BUILD" ]; then
- vsed -i build-aux/cargo.sh \
- -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
- -e '/CARGO_HOME/d'
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
fi
}
From 62cf51e750e28dadad677338778b3732c2a79651 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 31 Jan 2023 17:40:00 -0600
Subject: [PATCH 058/356] qprompt: update to 1.1.4.
---
srcpkgs/qprompt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qprompt/template b/srcpkgs/qprompt/template
index 82027308fa01..40bb29c3a73c 100644
--- a/srcpkgs/qprompt/template
+++ b/srcpkgs/qprompt/template
@@ -1,6 +1,6 @@
# Template file for 'qprompt'
pkgname=qprompt
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-devel kcoreaddons extra-cmake-modules
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://qprompt.app/"
distfiles="https://github.com/Cuperino/QPrompt/archive/refs/tags/v${version}.tar.gz"
-checksum=532d135d7cf854eaa4cb97e9ff54cbd1dfde71c8b29e2aef17dac6936dc84faa
+checksum=71f5dc53e9dc65453cd6a503bd448bfd4d2078edd1d6a2c8bc751c5dc2939631
post_install() {
mv "${DESTDIR}/usr/doc" "${DESTDIR}/usr/share/doc"
From 163fb48a6def6b4eec2f268212b401c69f69c854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 1 Feb 2023 15:42:22 +0700
Subject: [PATCH 059/356] neovim: reduce log
Fix: #42010
---
.../patches/cmake-allow-build-type-none.patch | 13 +++++++++----
srcpkgs/neovim/template | 9 +++++++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
index d6d8c8f1b15f..d98563e00252 100644
--- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
+++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
@@ -1,7 +1,14 @@
-diff --git a/cmake/Util.cmake b/cmake/Util.cmake
-index 343a729..d7d15e1 100644
--- a/cmake/Util.cmake
+++ b/cmake/Util.cmake
+@@ -162,7 +162,7 @@ endfunction()
+ # Passing CMAKE_BUILD_TYPE for multi-config generators will now not only
+ # not be used, but also generate a warning for the user.
+ function(set_default_buildtype)
+- set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo)
++ set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo None)
+
+ get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+ if(isMultiConfig)
@@ -177,7 +177,7 @@ function(set_default_buildtype)
message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'")
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build" FORCE)
@@ -11,8 +18,6 @@ index 343a729..d7d15e1 100644
else()
message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
endif()
-diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim
-index be56658..46fdd0f 100644
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -135,7 +135,7 @@ function! s:check_performance() abort
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 95c1f0731068..2cd7bafd0dd3 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,10 +1,12 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
-configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
+# MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3
+configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)
+ -DMIN_LOG_LEVEL=3"
hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
$(vopt_if luajit LuaJIT lua51)"
makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
@@ -31,6 +33,9 @@ alternatives="
vim:vim:/usr/bin/nvim
vim:vim.1:/usr/share/man/man1/nvim.1"
+# They want assertion
+CFLAGS=-UNDEBUG
+
pre_configure() {
vsed -i runtime/CMakeLists.txt \
-e "s|\".*/bin/nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"
From e91c5982b8b7b4efdf97aeba3226fad2fff44266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 5 Sep 2021 22:23:25 +0200
Subject: [PATCH 060/356] New package: openpgp-ca-0.11.2
---
srcpkgs/openpgp-ca/template | 16 ++++++++++++++++
srcpkgs/openpgp-ca/update | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/openpgp-ca/template
create mode 100644 srcpkgs/openpgp-ca/update
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
new file mode 100644
index 000000000000..ca62b5987975
--- /dev/null
+++ b/srcpkgs/openpgp-ca/template
@@ -0,0 +1,16 @@
+# Template file for 'openpgp-ca'
+pkgname=openpgp-ca
+version=0.11.2
+revision=1
+build_style=cargo
+make_install_args="--path openpgp-ca-bin"
+hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"
+makedepends="openssl-devel nettle-devel clang sqlite-devel"
+depends="gnupg"
+short_desc="Tool for handling OpenPGP keys in organizaations"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://openpgp-ca.org/"
+distfiles="https://gitlab.com/openpgp-ca/openpgp-ca/-/archive/openpgp-ca/v${version}/openpgp-ca-openpgp-ca-v${version}.tar.gz"
+checksum=162f60cdb937a9db897f699a35266da00adeb14c42a21f806d13bfbed03f921e
+make_check=no # Tests require gpg-agent being set up
diff --git a/srcpkgs/openpgp-ca/update b/srcpkgs/openpgp-ca/update
new file mode 100644
index 000000000000..0b887cabce9b
--- /dev/null
+++ b/srcpkgs/openpgp-ca/update
@@ -0,0 +1,2 @@
+site="https://gitlab.com/openpgp-ca/openpgp-ca/-/tags?format=atom"
+pattern="<title>(openpgp-ca/v)?\K[\d.]+(?=</title>)"
From 63c9389f24ee701d97b13836a334dd6e49ea78d0 Mon Sep 17 00:00:00 2001
From: Gavin Howard <gavin@yzena.com>
Date: Tue, 31 Jan 2023 20:06:51 -0700
Subject: [PATCH 061/356] bc-gh: update upstream address and use the GNU bc
predefined build
Signed-off-by: Gavin Howard <gavin@yzena.com>
Signed-off-by: Gavin D. Howard <gavin@yzena.com>
---
srcpkgs/bc-gh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index a8fa2b682baf..c589ca0f6e64 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,9 +1,9 @@
# Template file for 'bc-gh'
pkgname=bc-gh
version=6.2.2
-revision=1
+revision=2
short_desc="Implementation of POSIX bc with GNU extensions"
-maintainer="Gavin D. Howard <yzena.tech@gmail.com>"
+maintainer="Gavin D. Howard <gavin@gavinhoward.com>"
license="BSD-2-Clause"
homepage="https://git.yzena.com/gavin/bc"
changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
@@ -20,7 +20,7 @@ alternatives="
do_configure() {
PREFIX=/usr DESTDIR="${DESTDIR}" EXECSUFFIX=-gh CC="${CC}" CFLAGS="${CFLAGS}" \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="${CFLAGS_FOR_BUILD}" ./configure.sh -GM \
- -sbc.banner -sdc.tty_mode
+ -pGNU
}
do_build() {
make ${makejobs}
From 8de16a7f1aa40e6ece1c63032abc004d4a42f08c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 1 Feb 2023 13:49:34 +0100
Subject: [PATCH 062/356] typioca: update to 2.0.8.
---
srcpkgs/typioca/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index 0248425270b3..57bf17f8dc83 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,6 +1,6 @@
# Template file for 'typioca'
pkgname=typioca
-version=2.0.6
+version=2.0.8
revision=1
build_style=go
go_import_path="github.com/bloznelis/typioca"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/bloznelis/typioca"
distfiles="https://github.com/bloznelis/typioca/archive/refs/tags/${version}.tar.gz"
-checksum=63b1a2411fbf3ee530dfe2d48cbd7bc01cb1d9d64e66f2739d9273408db99f5f
+checksum=6d40b65205af3707cf6da401fa4acee4bd86b173f82cb6ad334403e0e0117ba2
post_install() {
vlicense LICENSE
From c6766834b8b3918bf435cd6eb6a5d1dd6181a00d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:15:40 +0100
Subject: [PATCH 063/356] mpop: update to 1.4.18.
---
srcpkgs/mpop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index a718f7c06571..b909fd27a50d 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
# Template file for 'mpop'
pkgname=mpop
-version=1.4.17
+version=1.4.18
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/mpop/"
distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=42ae494bad2941d9f647c48c3ed98c38ba9aa5cf3fe48fb0fe06e5b6dadf8bd5
+checksum=6099950184f7d094a782d1e7ab9833736f12308d34a544a59b46a8471d9f85b7
From 213fc194e19555e908dfc3e71498c9b1f9dce2d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:16:34 +0100
Subject: [PATCH 064/356] msmtp: update to 1.8.23.
---
srcpkgs/msmtp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 7f72af900000..0310b6bf284e 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
# Template file for 'msmtp'
pkgname=msmtp
-version=1.8.22
+version=1.8.23
revision=1
build_style=gnu-configure
configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/msmtp/"
distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7
+checksum=cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8
build_options="idn sasl gnome msmtpd"
build_options_default="idn sasl msmtpd"
From f189eb3e073343157aec1ef917e2e9b025cedd66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:20:01 +0100
Subject: [PATCH 065/356] linux5.15: update to 5.15.90.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index ada56640b4a5..f7f24a4111be 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.85
+version=5.15.90
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- bcf81892e467380e79f54b7856cbcf9d0de5dc33ac32570e788b980d7027620c"
+ 19f841835ae4fada8c4f52a67dae051cd81e0415047c6535fd871fe68ff2ae81"
skip_extraction="patch-${version}.xz"
python_version=3
From 8a2fc2c6e6846b8dc7990de815b5af1bd68ec3a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:02:39 +0100
Subject: [PATCH 066/356] tgt: update to 1.0.86.
---
srcpkgs/tgt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index be369a9e693e..73995ee243c5 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
# Template file for 'tgt'
pkgname=tgt
-version=1.0.85
+version=1.0.86
revision=1
build_style=gnu-makefile
make_install_args="sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/fujita/tgt"
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=b8454e06eaf6f024c1fa39de976c167c1ba7f43535bea96c3c364bd138552d8c
+checksum=af84c16bf8893d65666afcc0424b46dafddd2d0e5dcf818b319ea9ed3c3315a7
post_extract() {
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
From 0d7d581af3b3b87d9168e572174f13f4d07eecde Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:03:51 +0100
Subject: [PATCH 067/356] ugrep: update to 3.9.7.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index f9f322c6128a..202ce7557dd2 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.9.6
+version=3.9.7
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=4ff066c4d6afb46df598f184069eb2d96134642dca1e97f1161eebaa1d97a455
+checksum=7f44e2198e2dc3ad1ed88759ece848364c4ba632aca60aefe9c53d5b0c584628
post_install() {
vlicense LICENSE.txt LICENSE
From 6bab1922ec14fd481560cd0ce3bf0b440d5d0053 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:05:12 +0100
Subject: [PATCH 068/356] xlbiff: update to 4.6.5.
---
srcpkgs/xlbiff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index d93788c836e9..6a34a355129d 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
# Template file for 'xlbiff'
pkgname=xlbiff
-version=4.6.4
+version=4.6.5
revision=1
build_style=gnu-configure
configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://www.edsantiago.com/xlbiff/"
distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=42a24e1bb42a07fd870d78a5c296f6c1f7aa0f8992a57a553e47d8f3e6506780
+checksum=16f0ec3a6853a9f6abf0ce96e9fda553fb9f34c3f9348c5f87a8d69db035f1f8
pre_configure() {
autoreconf -fi
From 62c3d6ac07b09bc4725ec02f140caa359129d373 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:07:05 +0100
Subject: [PATCH 069/356] bmake: update to 20230127.
---
srcpkgs/bmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 8985bfd2d409..e382b2077151 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
# Template file for 'bmake'
pkgname=bmake
-version=20230123
+version=20230127
revision=1
short_desc="Portable version of the NetBSD make build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=6557c48d144a6b531fa26c7273c090c656280ba7b43df376971a5b2cdbe01b2f
+checksum=6056866f69496699c815b2af7144701fce7f1ccb6a4743dac5d221ff157d8915
python_version=3
do_configure() {
From f980db941fc3cd8dc245bf67df054d8e58ca7e1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:15:32 +0100
Subject: [PATCH 070/356] cmark-gfm: update to 0.29.0.gfm.9.
---
srcpkgs/cmark-gfm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmark-gfm/template b/srcpkgs/cmark-gfm/template
index 231c86a6a49c..7239d59a4d43 100644
--- a/srcpkgs/cmark-gfm/template
+++ b/srcpkgs/cmark-gfm/template
@@ -1,6 +1,6 @@
# Template file for 'cmark-gfm'
pkgname=cmark-gfm
-version=0.29.0.gfm.8
+version=0.29.0.gfm.9
revision=1
build_style=cmake
short_desc="GitHub's fork of cmark, a CommonMark markdown renderer"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/github/cmark-gfm"
distfiles="https://github.com/github/cmark-gfm/archive/${version}.tar.gz"
-checksum=94a145b7bc18cd4e85edce0a65ac71f24cbafe8e4402c3213835517408a10118
+checksum=07cd91514c29f8d68bcd1bd159661bf92ac060fdb08f6b2e33ce01d3b3000f54
pre_configure() {
# Fix the SONAME version to use just the major number
From 7a71fdf911ee4dbd1d29dc4938003437b7219814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 23:43:23 +0000
Subject: [PATCH 071/356] lynx: update to 2.9.0dev.12.
---
srcpkgs/lynx/patches/21_do_not_strip_-g.diff | 17 +++++++++++++++++
srcpkgs/lynx/template | 11 +++++++----
2 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/lynx/patches/21_do_not_strip_-g.diff
diff --git a/srcpkgs/lynx/patches/21_do_not_strip_-g.diff b/srcpkgs/lynx/patches/21_do_not_strip_-g.diff
new file mode 100644
index 000000000000..851e303a6b58
--- /dev/null
+++ b/srcpkgs/lynx/patches/21_do_not_strip_-g.diff
@@ -0,0 +1,17 @@
+Description: Stop ./configure from stripping out -g from CFLAGS
+Author: Andreas Metzler <ametzler@debian.org>,
+ Simon Ruderich <simon@ruderich.org>
+Origin: vendor
+Last-Update: 2021-07-27
+
+--- a/configure
++++ b/configure
+@@ -4098,7 +4098,7 @@
+ test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
+ ;;
+ (*)
+- test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
++ :
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 880266b18190..0aa406d830f8 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,16 +1,19 @@
# Template file for 'lynx'
pkgname=lynx
-version=2.9.0dev.10
+version=2.9.0dev.12
revision=1
build_style=gnu-configure
-configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
+configure_args="--with-screen=ncurses --enable-widec --with-zlib --with-bzlib
+ --with-ssl --enable-ipv6
+ cf_cv_header_path_ssl=${XBPS_CROSS_BASE}/usr/include/openssl"
makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
short_desc="Text browser for the World Wide Web"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912
+changelog="https://lynx.invisible-island.net/current/CHANGES"
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
+checksum=a6455b159d00776d8ec1051285c972dc1f0c552d0571a0cff02a23ec146ee8e5
pre_configure() {
sed -i configure \
From 6091a485cbc4dbe070252702057e1302c29028f2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 31 Jan 2023 20:43:22 +0000
Subject: [PATCH 072/356] oniguruma: update to 6.9.8.
---
srcpkgs/oniguruma/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/oniguruma/template b/srcpkgs/oniguruma/template
index 60dc2a6cfd45..f31cd677b4eb 100644
--- a/srcpkgs/oniguruma/template
+++ b/srcpkgs/oniguruma/template
@@ -1,16 +1,16 @@
# Template file for 'oniguruma'
pkgname=oniguruma
-version=6.9.5.rev1
+version=6.9.8
revision=1
-_ver="${version%.*}_${version##*.}"
build_style=gnu-configure
configure_args="--enable-posix-api=yes"
short_desc="Multi-charset regular expressions library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/kkos/oniguruma"
-distfiles="${homepage}/releases/download/v${_ver}/onig-${_ver}.tar.gz"
-checksum=d33c849d1672af227944878cefe0a8fcf26fc62bedba32aa517f2f63c314a99e
+changelog="https://github.com/kkos/oniguruma/releases"
+distfiles="https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"
+checksum=28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e
post_install() {
vlicense COPYING
From 672a66ce54ee0e976f72fc1bd2322eafb38cbc0d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 13:54:35 -0500
Subject: [PATCH 073/356] stunnel: update to 5.67
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..63fd3676298e 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,6 +1,6 @@
# Template file for 'stunnel'
pkgname=stunnel
-version=5.66
+version=5.67
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
-checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
+checksum=3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456
pre_check() {
# GitHub's CI doesn't support IPv6
From 212764432b55fc7ce3efc1f228610a28c40a87e4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 15:01:38 +0530
Subject: [PATCH 074/356] usql: update to 0.13.8.
---
srcpkgs/usql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 15b1e8c0dcd9..3e349f3ae783 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
# Template file for 'usql'
pkgname=usql
-version=0.13.6
+version=0.13.8
revision=1
build_style=go
go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=1a640c65f8fd34dea8aed5ca4ebac93b3d4fe814d3613c88195515da77c98812
+checksum=1e6b48c7eacaf870e7cb1fe95835840b729e263e0d7cf489f05c73625a5cea7a
post_install() {
vlicense LICENSE
From 4463cc1ce14978a5dff08ef4162eaf135418c6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Jan 2023 14:32:56 -0300
Subject: [PATCH 075/356] rxvt-unicode: add changelog
---
srcpkgs/rxvt-unicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 10a9be9ba29f..b0b9bf7a9009 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -23,6 +23,7 @@ short_desc="Terminal emulator supporting Xft fonts and Unicode"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
+changelog="http://cvs.schmorp.de/rxvt-unicode/Changes"
distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8
From 39a86dbc1c8d45c7486cace1907c561f56eb3c60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:50:05 +0100
Subject: [PATCH 076/356] usql: fix checksum.
---
srcpkgs/usql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 3e349f3ae783..dfe140e8b129 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=1e6b48c7eacaf870e7cb1fe95835840b729e263e0d7cf489f05c73625a5cea7a
+checksum=b2736ddfc597bbfd57d900f63e7cc56976100677a39c02fb4b9a0cada029ac0a
post_install() {
vlicense LICENSE
From 256fa8da229cd88f32abbb72b5d45edc76a2d9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:03:52 +0100
Subject: [PATCH 077/356] New package: python3-mdurl-0.1.2
---
srcpkgs/python3-mdurl/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-mdurl/template
diff --git a/srcpkgs/python3-mdurl/template b/srcpkgs/python3-mdurl/template
new file mode 100644
index 000000000000..7ee46dbd91a8
--- /dev/null
+++ b/srcpkgs/python3-mdurl/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mdurl'
+pkgname=python3-mdurl
+version=0.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+short_desc="Python port of the JavaScript mdurl package"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/executablebooks/mdurl"
+distfiles="${PYPI_SITE}/m/mdurl/mdurl-${version}.tar.gz"
+checksum=bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
+# Tests not shipped in PYPI tarball
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 8ec94db7c82f47d90713928e0c9f8246196e3916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:04:00 +0100
Subject: [PATCH 078/356] New package: python3-markdown-it-2.1.0
---
srcpkgs/python3-markdown-it/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-markdown-it/template
diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
new file mode 100644
index 000000000000..40104b64dd37
--- /dev/null
+++ b/srcpkgs/python3-markdown-it/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-markdown-it'
+pkgname=python3-markdown-it
+version=2.1.0
+revision=1
+build_style=python3-pep517
+make_install_target="dist/markdown_it_py-${version}-*-*-*.whl"
+hostmakedepends="python3-flit_core"
+depends="python3-mdurl"
+short_desc="Python port of the JavaScript mardown-it package"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/executablebooks/markdown-it-py"
+changelog="https://raw.githubusercontent.com/executablebooks/markdown-it-py/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/m/markdown-it-py/markdown-it-py-${version}.tar.gz"
+checksum=cf7e59fed14b5ae17c0006eff14a2d9a00ed5f3a846148153899a0224e2c07da
+# Tests not shipped in PYPI tarball
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 85d1fa0222a2af515a16d15fe950b3a1764d0f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:04:07 +0100
Subject: [PATCH 079/356] python3-rich: update dependencies
---
srcpkgs/python3-rich/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 2ad4dac03927..b7cd3d84633d 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,11 +1,10 @@
# Template file for 'python3-rich'
pkgname=python3-rich
version=13.3.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions python3-Pygments python3-commonmark
- python3-colorama"
+depends="python3-Pygments python3-markdown-it"
checkdepends="python3-wheel $depends"
short_desc="Library for rich text and beautiful formatting in the terminal"
maintainer="Andrew Benson <abenson+void@gmail.com>"
From 62917d97a37d793fcc91d9505221ecc3c3d818fc Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Tue, 24 Jan 2023 15:42:30 +0100
Subject: [PATCH 080/356] gitea: update to 1.18.3
---
srcpkgs/gitea/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index c04a9bc94fe9..67413f5d9674 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
# Template file for 'gitea'
pkgname=gitea
-version=1.18.0
+version=1.18.3
revision=1
build_style=go
go_import_path=code.gitea.io/gitea
@@ -31,7 +31,7 @@ license="MIT"
homepage="https://gitea.io"
changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
-checksum=5f42af201d89bd2a21d8c47d15cc0a39b433a1dd86c6129e1aa20a53908a4c43
+checksum=8ea8e96c381c9b066873fa2f81bbab15e7ad6bd98024e9b3ef2aef994280c115
system_accounts="_gitea"
_gitea_homedir="/var/lib/gitea"
From 360051d068aa7e2637ef8465cbe48ebe328a12cb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 23 Jan 2023 17:45:50 -0500
Subject: [PATCH 081/356] sbsigntool: patch for openss3, add CFLAG
---
...84869c9590682ac3253d583bf59b890bb826.patch | 60 +++++++++++++++++++
srcpkgs/sbsigntool/patches/openssl3.patch | 35 +++++++++++
srcpkgs/sbsigntool/template | 4 +-
3 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
create mode 100644 srcpkgs/sbsigntool/patches/openssl3.patch
diff --git a/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch b/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
new file mode 100644
index 000000000000..82b3d139ade5
--- /dev/null
+++ b/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
@@ -0,0 +1,60 @@
+From f12484869c9590682ac3253d583bf59b890bb826 Mon Sep 17 00:00:00 2001
+From: dann frazier <dann.frazier@canonical.com>
+Date: Wed, 12 Aug 2020 15:27:08 -0600
+Subject: sbkeysync: Don't ignore errors from insert_new_keys()
+
+If insert_new_keys() fails, say due to a full variable store, we currently
+still exit(0). This can make it difficult to know something is wrong.
+For example, Debian and Ubuntu implement a secureboot-db systemd service
+to update the DB and DBX, which calls:
+
+ ExecStart=/usr/bin/sbkeysync --no-default-keystores --keystore /usr/share/secureboot/updates --verbose
+
+But although this seemed to succeed on my system, looking at the logs shows
+a different story:
+
+Inserting key update /usr/share/secureboot/updates/dbx/dbxupdate_x64.bin into dbx
+Error writing key update: Invalid argument
+Error syncing keystore file /usr/share/secureboot/updates/dbx/dbxupdate_x64.bin
+
+Signed-off-by: dann frazier <dann.frazier@canonical.com>
+Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
+---
+ src/sbkeysync.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/sbkeysync.c b/src/sbkeysync.c
+index e51f177..7748990 100644
+--- a/src/sbkeysync.c
++++ b/src/sbkeysync.c
+@@ -889,10 +889,12 @@ int main(int argc, char **argv)
+ {
+ bool use_default_keystore_dirs;
+ struct sync_context *ctx;
++ int rc;
+
+ use_default_keystore_dirs = true;
+ ctx = talloc_zero(NULL, struct sync_context);
+ list_head_init(&ctx->new_keys);
++ rc = EXIT_SUCCESS;
+
+ for (;;) {
+ int idx, c;
+@@ -985,10 +987,10 @@ int main(int argc, char **argv)
+ if (ctx->verbose)
+ print_new_keys(ctx);
+
+- if (!ctx->dry_run)
+- insert_new_keys(ctx);
++ if (!ctx->dry_run && insert_new_keys(ctx))
++ rc = EXIT_FAILURE;
+
+ talloc_free(ctx);
+
+- return EXIT_SUCCESS;
++ return rc;
+ }
+--
+cgit 1.2.3-1.el7
+
+
diff --git a/srcpkgs/sbsigntool/patches/openssl3.patch b/srcpkgs/sbsigntool/patches/openssl3.patch
new file mode 100644
index 000000000000..cd0d025ada7b
--- /dev/null
+++ b/srcpkgs/sbsigntool/patches/openssl3.patch
@@ -0,0 +1,35 @@
+Subject: [PATCH] Fix openssl-3.0 issue involving ASN1 xxx_it
+From: Jeremi Piotrowski <jeremi.piotrowski@microsoft.com>
+Origin: https://groups.io/g/sbsigntools/message/54
+
+Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it.
+
+openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to
+`const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind
+OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is
+available. This change should have been transparent to the application, but
+only if the `ASN1_ITEM_rptr()` macro is used.
+
+This change passes `make check` with both openssl 1.1 and 3.0.
+
+Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
+---
+ src/idc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idc.c b/src/idc.c
+index 6d87bd4..0a82218 100644
+--- a/src/idc.c
++++ b/src/idc.c
+@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image)
+
+ idc->data->type = OBJ_nid2obj(peid_nid);
+ idc->data->value = ASN1_TYPE_new();
+- type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it);
++ type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID));
+
+ idc->digest->alg->parameter = ASN1_TYPE_new();
+ idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256);
+--
+2.25.1
+
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 42b2545d23ef..1bdee8c5b784 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,7 +1,7 @@
# Template file for 'sbsigntool'
pkgname=sbsigntool
version=0.9.4
-revision=4
+revision=5
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config help2man"
@@ -20,6 +20,8 @@ checksum="eddb7d21263ee2b07be8f0ed93b6ba021c3f943964730b2d86f44736fa1924d5
1dc1e1de5f2dda50dbd2e6a83355fe7ae38ca0f79daeb404026421af70606653"
skip_extraction="sbsigntool_0.9.2.orig.tar.gz"
conf_files="/etc/default/sbsigntool-kernel-hook"
+# openssl3 fix
+CFLAGS+=" -Wno-error=deprecated-declarations"
post_extract() {
bsdtar -xzf $XBPS_SRCDISTDIR/$pkgname-$version/sbsigntool_0.9.2.orig.tar.gz
From 0b005fb837e480c5bcef0ea9747d28eb00734ab7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 25 Jan 2023 23:13:37 +0100
Subject: [PATCH 082/356] libgit2: update to 1.5.1
---
...lar-remove-ftrunacte-from-libgit2-tests.patch | 16 +++-------------
srcpkgs/libgit2/template | 6 +++---
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
index b084896b4e65..4fb8488f82bb 100644
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -1,14 +1,7 @@
-From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
-From: Peter Pettersson <boretrk@hotmail.com>
-Date: Thu, 14 Jul 2022 18:28:58 +0200
-Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
-
----
- tests/libgit2/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Backported from:
+https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
-index 27f421ad6..7f6fafe77 100644
--- a/tests/libgit2/CMakeLists.txt
+++ b/tests/libgit2/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
@@ -17,9 +10,6 @@ index 27f421ad6..7f6fafe77 100644
add_clar_test(libgit2_tests offline -v -xonline)
-add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert)
+ add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
---
-2.38.0
-
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 0253f5c9c727..d8040d3be1c5 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.0
+version=1.5.1
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -10,8 +10,8 @@ short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 1abb20fd6f300f355ccc5b844adf5e1baf10bad6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 23 Jan 2023 00:45:05 +0530
Subject: [PATCH 083/356] iwd: update to 2.2.
---
srcpkgs/iwd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 8aba54594dbe..17c0799ce7be 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
# Template file for 'iwd'
pkgname=iwd
-version=2.0
+version=2.2
revision=1
build_style=gnu-configure
configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="https://iwd.wiki.kernel.org/"
changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=5a0bfbc567092476d60a8f9700f68a273e39fd46e7177ce2d69bbc74255a930c
+checksum=dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570
make_dirs="/var/lib/iwd 0600 root root
/var/lib/ead 0600 root root
/etc/iwd 755 root root"
From 9a7b2ba93e85d91deb664de7f61451bc9c6679b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:49 +0700
Subject: [PATCH 084/356] fpc: no needs rpmextract
---
srcpkgs/fpc/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index c867802cf756..d6d20a0c19c6 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -3,10 +3,8 @@ pkgname=fpc
version=3.2.0
revision=1
archs="x86_64* i686* ppc64le ppc64 ppc"
-create_wrksrc=yes
build_wrksrc="${pkgname}build-${version}"
conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
-hostmakedepends="rpmextract"
makedepends="ncurses-devel zlib-devel expat-devel"
short_desc="Free Pascal Compiler"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From aba7e2c1db03fb84ac656732825bfb9641c41cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 08:40:11 +0700
Subject: [PATCH 085/356] gnucash: update to 4.13.
---
srcpkgs/gnucash/template | 6 +++---
srcpkgs/gnucash/update | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnucash/update
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 6e8ddbac22bc..aebccbadc567 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
-version=4.12
-revision=3
+version=4.13
+revision=1
build_style=cmake
make_check_target=check
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
@@ -15,7 +15,7 @@ maintainer="ManfredU <mu@usselmann.it>"
license="GPL-2.0-or-later"
homepage="http://www.gnucash.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=cc8c051a56b8bb433566d6e2890df59f3d895a395c8cf5246c1b728102ce10ae
+checksum=401a158086635ea17fbb145325558537289aa1d24d022f7c3317e12f3dabd8e7
pycompile_dirs="usr/share/gnucash/python"
conf_files="/etc/gnucash/environment"
diff --git a/srcpkgs/gnucash/update b/srcpkgs/gnucash/update
new file mode 100644
index 000000000000..e980afc360d1
--- /dev/null
+++ b/srcpkgs/gnucash/update
@@ -0,0 +1 @@
+ignore="*.9??"
From 3bcebef3e693c85df5a6c67e50efd8e224fed803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:29 +0700
Subject: [PATCH 086/356] linux6.1: update to 6.1.9.
---
srcpkgs/linux6.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index c2aa2477de3b..4fd43fad4089 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.1'
pkgname=linux6.1
-version=6.1.8
+version=6.1.9
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- b66c64b8288bfdaa1ce8e9f06af53697e2f538698786c2b6bae79084d8c74323"
+ 64e27f1de56225372d29ff92dc2d8fca6ae961e7470f2364e98c5af0aef261dc"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 948fb768717b2d4bc92496f868f5b7a9e0ca46d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 19:13:18 +0700
Subject: [PATCH 087/356] lint-commits: forbid localhost email, too
---
common/scripts/lint-commits | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index f4bb47c8f9f4..56f16ff194b3 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -36,6 +36,10 @@ do
print "::error title=Commit Lint::" C ": authored by noreply email";
ret=1;
}
+ /^author .*(localhost|localdomain|[(]none[)])/ && !msg {
+ print "::error title=Commit Lint::" C ": authored by localhost email";
+ ret=1;
+ }
!msg { next }
# 3: long-line-is-banned-except-footnote-like-this-for-url
(NF > 2) && (length > 80) {
From 7904d44c5c908336854c5814dc950a9c8c52f4c6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 2 Feb 2023 15:04:18 +0100
Subject: [PATCH 088/356] terragrunt: update to 0.43.1.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index d5c160424509..e557ae9e4d3a 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.43.0
+version=0.43.1
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8a4c257ee3f65f9c97d17400aeae705c644fc371393a2df3cd264afa77a1f813
+checksum=282179f73e4269df2311aa90d6b13f504f49bf0f3ee0c1dd573f60bc96053567
post_install() {
vlicense LICENSE.txt
From d29d9c160f482c7f66fbd573094de430b85a7bb8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:17:04 +0100
Subject: [PATCH 089/356] console-setup: update to 1.216.
---
srcpkgs/console-setup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index f0f9268344e0..204d0a237488 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,6 +1,6 @@
# Template file for 'console-setup'
pkgname=console-setup
-version=1.215
+version=1.216
revision=1
hostmakedepends="perl"
depends="kbd ckbcomp"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/console-setup"
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=d04bcf1b514b5986fe47eb484e959cad99e1744faa29a5fc1b3d1ca0ef7b636b
+checksum=8f913bcf669529c45fc32fdff53030d825c625f3622e062c88b19d971508282b
conf_files="/etc/console-setup/console-setup
/etc/console-setup/keyboard"
From 993d13478677853a810acee8514866fa9a7aaf0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:19:45 +0100
Subject: [PATCH 090/356] libcbor: update to 0.10.2.
---
srcpkgs/libcbor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libcbor/template b/srcpkgs/libcbor/template
index a4f27d8bb9b3..708198ff2502 100644
--- a/srcpkgs/libcbor/template
+++ b/srcpkgs/libcbor/template
@@ -1,6 +1,6 @@
# Template file for 'libcbor'
pkgname=libcbor
-version=0.10.1
+version=0.10.2
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/PJK/libcbor"
distfiles="https://github.com/PJK/libcbor/archive/v${version}.tar.gz"
-checksum=e8fa0a726b18861c24428561c80b3c95aca95f468df4e2f3e3ac618be12d3047
+checksum=e75f712215d7b7e5c89ef322a09b701f7159f028b8b48978865725f00f79875b
post_install() {
vlicense LICENSE.md
From 6ccee002e5a052364003ad070e20fe2d94a51c10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:23:49 +0100
Subject: [PATCH 091/356] swi-prolog: update to 9.0.4.
---
srcpkgs/swi-prolog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 1b61b473becc..674f1505bf0d 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
-version=9.0.3
+version=9.0.4
revision=1
build_style=cmake
build_helper="qemu"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.swi-prolog.org/"
changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=e2919bc58710abd62b9cd40179a724c30bdbe9aa428af49d7fdc6d0158921afb
+checksum=feb2815a51d34fa81cb34e8149830405935a7e1d1c1950461239750baa8b49f0
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 17563f68ef2bce972d5f297697ccedd9570bf2f1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 2 Feb 2023 09:52:51 -0500
Subject: [PATCH 092/356] kore: ignore certain warnings (openssl3)
---
srcpkgs/kore/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 0927bc637dc7..175ae14d6a53 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
# Template file for 'kore'
pkgname=kore
version=4.2.3
-revision=2
+revision=3
# arch specific seccomp stuff
archs="x86_64* aarch64* ppc64*"
build_style=gnu-makefile
@@ -16,6 +16,8 @@ homepage="https://kore.io"
distfiles="https://kore.io/releases/kore-${version}.tar.gz"
checksum=f9a9727af97441ae87ff9250e374b9fe3a32a3348b25cb50bd2b7de5ec7f5d82
disable_parallel_build=yes
+# openssl3 fix
+CFLAGS+=" -Wno-deprecated-declarations -Wno-discarded-qualifiers"
export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}
From eca8f1e086f7b28aac0be0477c73a23578ea2397 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 17:26:47 +0100
Subject: [PATCH 093/356] mathcomp: update to 1.16.0.
---
srcpkgs/mathcomp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 09394c7e38ef..37acff40743e 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
-version=1.15.0
-revision=3
+version=1.16.0
+revision=1
build_wrksrc="mathcomp"
build_style=gnu-makefile
hostmakedepends="coq ocaml-findlib"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="CECILL-B"
homepage="https://github.com/math-comp/math-comp"
distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
-checksum=33105615c937ae1661e12e9bc00e0dbad143c317a6ab78b1a15e1d28339d2d95
+checksum=36fe4f5487f4685db9c6e6affa92abb47248440e6d4dfaaa01ab31df5fd4b513
nocross="ocaml"
do_install() {
From e93cbc9e109a39e5956cda9f3df5f61d674bc006 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 28 Jan 2023 10:48:00 +0100
Subject: [PATCH 094/356] github-cli: update to 2.22.1
---
srcpkgs/github-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 351c497e0dda..510a07a6b4cd 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
# Template file for 'github-cli'
pkgname=github-cli
-version=2.22.0
+version=2.22.1
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://cli.github.com"
changelog="https://github.com/cli/cli/releases"
distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=fc9aacccd6a07da6fb2cfa57e2a08d72bdc3a3476f6abec6250cda1e59ae6e16
+checksum=09cdd1c435d453a0c610f407979ecf8d314aec41d7b8004794f136f05b0fe688
pre_build() {
local _date
From 14f2b9a39126610958f30237caae480fb3e807fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 1 Feb 2023 11:22:00 -0500
Subject: [PATCH 095/356] pkcs11-helper: update to 1.29.0
---
srcpkgs/pkcs11-helper/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index 90f10d0c2538..ac8ebe5138ca 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,25 +1,22 @@
# Template file for 'pkcs11-helper'
pkgname=pkcs11-helper
-version=1.25.1
-revision=6
+version=1.29.0
+revision=1
build_style=gnu-configure
configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
-hostmakedepends="automake libtool pkg-config doxygen"
+hostmakedepends="libtool pkg-config doxygen"
makedepends="openssl-devel"
short_desc="Library to help simplify interacting with PKCS#11 providers"
maintainer="Aloz1 <kno0001@gmail.com>"
license="GPL-2.0-only, BSD-3-Clause"
-homepage="https://github.com/OpenSC/${pkgname}/wiki"
-distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=fbcec9dd15a71d6ef22b09f63934c66d7d0292fefbaf3a60703ee4a9a73bf6a5
+homepage="https://github.com/OpenSC/pkcs11-helper"
+changelog="https://raw.githubusercontent.com/OpenSC/pkcs11-helper/master/ChangeLog"
+distfiles="https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${version}/pkcs11-helper-${version}.tar.bz2"
+checksum=996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6
build_options="threading"
build_options_default="threading"
desc_option_threading="Enable threading and slotevent support"
-pre_configure() {
- autoreconf -fi
-}
-
post_install() {
vlicense COPYING
vlicense COPYING.GPL
From 2453868316a4fa788c7e51fa2d5a326795f61a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 28 Oct 2022 18:59:37 -0300
Subject: [PATCH 096/356] python3-fastjsonschema: update to 2.16.2.
---
srcpkgs/python3-fastjsonschema/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
index 707f9852cb87..ab5f04f4fb55 100644
--- a/srcpkgs/python3-fastjsonschema/template
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -1,7 +1,7 @@
# Template file for 'python3-fastjsonschema'
pkgname=python3-fastjsonschema
-version=2.15.3
-revision=3
+version=2.16.2
+revision=1
build_style=python3-module
make_check_args="--deselect tests/benchmarks/test_benchmark.py"
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/seznam/python-fastjsonschema"
changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
-checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+checksum=552e8b07a076f4628e9a3c78f040ed673bed9b5b860d3cb51b323da50e2e3d47
post_install() {
vlicense LICENSE
From 41a6e818443ff2e96d96bdc062645b09b10bb868 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 14:57:19 +0100
Subject: [PATCH 097/356] knot: update to 3.2.5.
---
srcpkgs/knot/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index e2e81817260f..8696b58ca7e9 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
# Template file for 'knot'
pkgname=knot
-version=3.2.4
+version=3.2.5
revision=1
build_style=gnu-configure
configure_args="
@@ -18,9 +18,9 @@ short_desc="High-performance authoritative-only DNS server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.knot-dns.cz/"
-changelog="https://github.com/CZ-NIC/knot/raw/master/NEWS"
+changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13
+checksum=c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820
system_accounts="_knot"
_knot_homedir="/var/lib/knot"
From 9538a33dc9f84d975fac7041638bf4e81e5e8799 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 18:16:33 +0100
Subject: [PATCH 098/356] binwalk: update to 2.3.4.
---
srcpkgs/binwalk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 3fd78853fc14..b5a3c78f4f01 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,7 +1,7 @@
# Template file for 'binwalk'
pkgname=binwalk
-version=2.3.3
-revision=3
+version=2.3.4
+revision=1
build_style=python3-module
hostmakedepends="python3"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/ReFirmLabs/binwalk"
distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=7e32b94dc77632b51d18732b5456e2a3ef85e4521d7d4a54410e36f93859501f
+checksum=60416bfec2390cec76742ce942737df3e6585c933c2467932f59c21e002ba7a9
post_extract() {
vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
From 35b7b4fa61560add7a4fefcd842fd4d398dde0f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 18:31:18 +0100
Subject: [PATCH 099/356] gnumeric: update to 1.12.55.
---
srcpkgs/gnumeric/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 9d8eeebe3784..bb5db0bfb433 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,6 +1,6 @@
# Template file for 'gnumeric'
pkgname=gnumeric
-version=1.12.54
+version=1.12.55
revision=1
build_style=gnu-configure
hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="http://gnumeric.org/"
changelog="https://github.com/GNOME/gnumeric/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz"
-checksum=46904062fd1c4a4c93596d26bf67932cd72fc0f8d2c5a67c17918527fee82b74
+checksum=c69a09cd190b622acca476bbc3d4c03d68d7ccf59bba61bf036ce60885f9fb65
# This isn't a direct dependency but when soname bumping perl it will
# cause build failures
From 21738e409974fc8f3346050c579331955913d45b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:13:55 +0100
Subject: [PATCH 100/356] falkon: update to 22.12.2.
---
srcpkgs/falkon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 1ebf93e88577..e7d69ffe683f 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,6 +1,6 @@
# Template file for 'falkon'
pkgname=falkon
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext pkg-config
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-3.0-or-later"
homepage="https://www.falkon.org"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7dea2defd57d6d6db3a3413cc0e480db8fc9b56f56f40d7a22725308667c9693
+checksum=8e2838716646f6fd6c2c811210a92688b70c603d3bff0b0457a7748a02eeddb4
LDFLAGS="-Wl,--no-fatal-warnings"
From 3e8223d0018d127ffd9a216f607658986abfdde8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:16:34 +0100
Subject: [PATCH 101/356] libkdcraw5: update to 22.12.2.
---
srcpkgs/libkdcraw5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 85327ad1dcc6..c30f692acdbf 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
# Template file for 'libkdcraw5'
pkgname=libkdcraw5
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="https://www.kde.org/applications/graphics/"
distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8b0a71937f7ed4926c2c047e0bd36001e5e98f52b1cf633d8bfbe4e4eeac65eb
+checksum=1f060a20bfe22d2874484d2294a4398ef8055b763e32a0a2f739c6bdd55af686
libkdcraw5-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 39f3d798dfa4baa6f4d713ccf3ad2d1753ced59a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:28:05 +0100
Subject: [PATCH 102/356] gwenview: update to 22.12.2.
---
srcpkgs/gwenview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 66105668037f..3e8dd094ceb4 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
# Template file for 'gwenview'
pkgname=gwenview
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
build_helper=qemu
@@ -19,4 +19,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="https://www.kde.org/applications/graphics/gwenview"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4bbf8cdd69c4918b457251d6f906c5ec5ea60ad4d08635fd7212f67a62fe278a
+checksum=7dc1066d03e4b8975109af637929cd391ff2e591b6d3ccc46ac8426b9b7f6fb6
From dfb906e1bf6e602d552fa626b09cfc9ccc08f7a5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:04 +0100
Subject: [PATCH 103/356] ETL: update to 1.4.4
---
srcpkgs/ETL/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index 86c878478638..a2dab21bc501 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,6 +1,7 @@
# Template file for 'ETL'
+# Should be kept in sync with 'synfig' and 'synfigstudio'
pkgname=ETL
-version=1.4.3
+version=1.4.4
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz"
-checksum=f0bf2e6ee6aa96c586657d64a9a49def3544eb1b3068e226a737e423049f73a0
+checksum=cc87e478d8e808b1a2266f8f6a3eb54396ba54ff63abb30ea5b9b7bcfb85caca
From 2729344d4986b5b6ff52a6bd9ccb1a9935ab45f2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:27 +0100
Subject: [PATCH 104/356] synfig: update to 1.4.4
---
srcpkgs/synfig/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 390f097c0f05..182dc3cd280f 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,8 @@
# Template file for 'synfig'
+# Should be kept in sync with 'synfigstudio' and 'ETL'
pkgname=synfig
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
@@ -13,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz"
-checksum=0c8d02ff6c77e468021a4497be34323d38246208d199ab1c3bbf65c9794752e7
+checksum=cd9882a091433e22e484e47d7bfe542aaefd3f62bfd746d306be4ce964756f06
CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
From b93a9d6907327cbfc226c96d7e349b8eec19fc9c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:47 +0100
Subject: [PATCH 105/356] synfigstudio: update to 1.4.4
---
srcpkgs/synfigstudio/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 4b36350f8768..61d50676c6e1 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,8 @@
# Template file for 'synfigstudio'
+# Should be kept in sync with 'synfig' and 'ETL'
pkgname=synfigstudio
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
@@ -12,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfigstudio-${version}.tar.gz"
-checksum=500d08e94b803aa261fa17eebb3ed74cd1573296477f866e3fe8cceab2f7c1ba
+checksum=8893c681ccda6bc34f173d5183e28fbf78feb348f26a7661bc3c038e837eb21f
python_version=3
CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1"
export DATADIRNAME=share
From 5e638ecbc9cfe962a3b21d7babac9745c8e32b21 Mon Sep 17 00:00:00 2001
From: Youssef Eddaif <jo9unreal@gmail.com>
Date: Thu, 2 Feb 2023 19:50:26 +0100
Subject: [PATCH 106/356] go : update to 1.19.5
---
srcpkgs/go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 230b040d9090..029c00cc09e1 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
# Template file for 'go'
pkgname=go
-version=1.19.4
+version=1.19.5
revision=1
create_wrksrc=yes
build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368
+checksum=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
nostrip=yes
noverifyrdeps=yes
# on CI it tries to use `git submodule`, which is not part of chroot-git
From 8572eb8385b54364b6c0215a1337e474010df451 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 22 Jan 2023 20:03:26 +0530
Subject: [PATCH 107/356] toot: update to 0.34.0.
---
srcpkgs/toot/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index c04382d273c7..9f7fd36d09f5 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,20 +1,16 @@
# Template file for 'toot'
pkgname=toot
-version=0.29.0
+version=0.34.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-BeautifulSoup4 python3-requests python3-wcwidth
python3-urwid"
-checkdepends="python3-wheel python3-pytest ${depends}"
+checkdepends="${depends} python3-psycopg2 python3-pytest-xdist"
short_desc="Mastodon CLI client"
maintainer="Jon Levin <jon@jefferiestube.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/ihabunek/toot"
changelog="https://raw.githubusercontent.com/ihabunek/toot/master/CHANGELOG.md"
-distfiles="https://github.com/ihabunek/toot/archive/${version}.tar.gz"
-checksum=821d549798453da8ad669a605cddc1ead8a797d716723158526534549a4b0d4d
-
-pre_check() {
- make dist
-}
+distfiles="https://github.com/ihabunek/toot/archive/refs/tags/${version}.tar.gz"
+checksum=56e1bfd5d8a0ebb837ed92b5de5682a93336b87828476ca20b5d7ac7fa20ad33
From 8ea57e6a654b44af54528513dc4ed2017e9cbac5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Fri, 3 Feb 2023 10:22:58 +0100
Subject: [PATCH 108/356] vscode: update to 1.75.0
---
srcpkgs/vscode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a06fd59bca1e..ac5a91cb37bf 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.74.3
+version=1.75.0
revision=1
_electronver=19.0.8
_npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=f3db2b1132977ddd0309e7c3da5c594a5d77bc423d5e64b3c9900890a43be9ac
+checksum=719c1efeca10a163b18618b5b689d4843247d3e86a27a6e898113219274cb99c
nocross=yes # x64 build does not cut it, it contains native code
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From 696c0329efebfce528ab385ee14117f6b691362b Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Wed, 1 Feb 2023 15:21:43 -0800
Subject: [PATCH 109/356] podman: update to 4.4.0
---
srcpkgs/podman/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index fef36038e424..0c7265f3dfb0 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
# Template file for 'podman'
pkgname=podman
-version=4.3.1
-revision=2
+version=4.4.0
+revision=1
build_style=go
go_import_path="github.com/containers/podman/v4"
go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -16,7 +16,7 @@ license="Apache-2.0"
homepage="https://podman.io/"
changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813
+checksum=4bb966fd960b0aae05181e30672a6b20be365225758110eb251b81214414cb25
if [ "$CROSS_BUILD" ]; then
go_build_tags+=" containers_image_openpgp"
From cea950e8e24a4b328080cbd45ab8dc50d10a288e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 00:57:37 +0530
Subject: [PATCH 110/356] black: update to 23.1.0.
---
srcpkgs/black/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index 88846fc3ac43..0b1553e3b528 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,11 +1,12 @@
# Template file for 'black'
pkgname=black
-version=22.12.0
+version=23.1.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling hatch-vcs"
-depends="python3-click python3-platformdirs python3-pathspec python3-mypy_extensions"
-checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
+depends="python3-click python3-platformdirs python3-pathspec python3-packaging
+ python3-mypy_extensions"
+checkdepends="${depends} python3-pytest-xdist python3-aiohttp
python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
maintainer="icp <pangolin@vivaldi.net>"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://black.readthedocs.io/en/stable/"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f
+checksum=b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac
make_check_pre="env PYTHONPATH=src"
post_check() {
From 29e00748a43306686076ce3a8c01344448a0d8bc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 111/356] seahorse: allow building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..fca2c139b3c6
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
+--
+2.39.1
+
From 8f40e45e3b07d904d62434cf086fad1057c3ab59 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 112/356] etc/xbps.d/repos-*.conf: add bootstrap repo
---
etc/xbps.d/repos-local-x86_64-multilib.conf | 1 +
etc/xbps.d/repos-local.conf | 1 +
etc/xbps.d/repos-remote-aarch64-musl.conf | 1 +
etc/xbps.d/repos-remote-aarch64.conf | 1 +
etc/xbps.d/repos-remote-musl.conf | 1 +
etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
etc/xbps.d/repos-remote.conf | 1 +
7 files changed, 7 insertions(+)
diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
# DON'T EDIT THIS FILE
# x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
repository=/host/binpkgs/multilib
repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
# DON'T EDIT THIS FILE
# Local repositories
+repository=/host/binpkgs/bootstrap
repository=/host/binpkgs
repository=/host/binpkgs/nonfree
repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
# aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
# aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
# voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
repository=https://repo-default.voidlinux.org/current/musl
repository=https://repo-default.voidlinux.org/current/musl/nonfree
repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
# voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
repository=https://repo-default.voidlinux.org/current/multilib
repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
# voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
repository=https://repo-default.voidlinux.org/current
repository=https://repo-default.voidlinux.org/current/nonfree
repository=https://repo-default.voidlinux.org/current/debug
From 6694c47a45e58062ae8b8a768577f050d0d3d500 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 113/356] common/xbps-src/shutils/: add bootstrap repo
---
common/xbps-src/shutils/bulk.sh | 4 ++--
common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
return $?
;;
local)
- bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+ bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
return $?
;;
esac
@@ -122,6 +122,6 @@ bulk_update() {
if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
echo
msg_normal "xbps-src: updating your system, confirm to proceed...\n"
- ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+ ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
fi
}
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
# Update xbps alternative repository if set.
mkdir -p $confdir
if [ -n "$XBPS_ALT_REPOSITORY" ]; then
- ( \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
- ) > $confdir/00-repository-alt-local.conf
+ cat <<- ! > $confdir/00-repository-alt-local.conf
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+ !
if [ "$XBPS_MACHINE" = "x86_64" ]; then
- ( \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
- ) >> $confdir/00-repository-alt-local.conf
+ cat <<- ! >> $confdir/00-repository-alt-local.conf
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+ !
fi
else
rm -f $confdir/00-repository-alt-local.conf
From fac9dcea3cd2a342fcebf9704eb41f42ba742045 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 114/356] common/scripts/lint-conflicts: add bootstrap repo
---
common/scripts/lint-conflicts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
fi
declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
rv=0
template_exists() {
From 9403397e4ec338f1189d732ab8736b4a8cb1c743 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 115/356] common/travis/: add bootstrap repo to CI scripts
---
common/travis/check-install.sh | 4 +++-
common/travis/show_files.sh | 3 ++-
common/travis/xpkgdiff.sh | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
ROOTDIR="-r /usr/$triplet"
fi
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
- xbps-query --repository=$HOME/hostdir/binpkgs \
+ xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+ --repository=$HOME/hostdir/binpkgs \
--repository=$HOME/hostdir/binpkgs/nonfree \
-i -f "$subpkg" ||
/bin/echo -e "\x1b[33m $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
- if xbps-query --repository=$HOME/hostdir/binpkgs \
+ if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+ --repository=$HOME/hostdir/binpkgs \
--repository=$HOME/hostdir/binpkgs/nonfree \
-i "$subpkg" >&/dev/null; then
/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
From 4c3e68e5f0f01a370c7487c1dd58dfda5fc463d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 116/356] chroot-bash: move to bootstrap repo
---
srcpkgs/chroot-bash/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/bash/bash.html"
distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
for _p in $(seq -w 001 ${_bash_patchlevel}); do
From f319ec47554da19d7c40b3e18ef4a143c4d1ba29 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 117/356] chroot-distcc: move to bootstrap repo
---
srcpkgs/chroot-distcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://distcc.github.io"
distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
conflicts="distcc>=0"
CFLAGS="-fcommon"
From 58d7b02d80c83b1263203092f15dd7ffd56a006d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 118/356] chroot-gawk: move to bootstrap repo
---
srcpkgs/chroot-gawk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://directory.fsf.org/wiki/Gawk"
distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
bootstrap=yes
provides="awk-0_1"
From 512873df035f107827fa1dd3020efa4d29f063cc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 119/356] chroot-git: move to bootstrap repo
---
srcpkgs/chroot-git/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
if [ "$CHROOT_READY" ]; then
checkdepends="perl gnupg"
From ffbbad8278645b46bd2decbf5834b73cda246d0a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 120/356] chroot-grep: move to bootstrap repo
---
srcpkgs/chroot-grep/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
conflicts="grep>=0"
provides="grep-${version}_${revision}"
make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
From 1526acf54cdbf6f1208c53a413bce9967e488f27 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 121/356] chroot-util-linux: move to bootstrap repo
---
srcpkgs/chroot-util-linux/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
conflicts="util-linux>=0"
provides="util-linux-${version}_${revision}"
+repository=bootstrap
if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
From 2e0d81381cfa1f309b68f89d972b0a5bc9654af7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 122/356] curl: move chroot- subpkg to bootstrap repo
---
srcpkgs/curl/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
chroot-curl_package() {
short_desc+=" - for build infra use"
+ repository=bootstrap
pkg_install() {
vbin $DESTDIR/usr/bin/curl chroot-curl
}
From aea66ac0432ecac594a53e5ea92b588e54d56613 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 123/356] cargo-bootstrap: move to bootstrap repo
---
srcpkgs/cargo-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
conflicts="cargo>=0"
lib32disabled=yes
nostrip=yes
+repository=bootstrap
_bootstrap_url="https://static.rust-lang.org/dist"
From a2bc8fa1e37b28b5043c992cd88347b839fb465e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 124/356] cargo-auditable-bootstrap: move to bootstrap repo
---
srcpkgs/cargo-auditable-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
post_install() {
vlicense ../LICENSE-MIT
From a16cd02821bc79ae655ae4b2a0eab72c5029c022 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 125/356] dmd-bootstrap: move to bootstrap repo
---
srcpkgs/dmd-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
provides="d-compiler-${version}_${revision}"
+repository=bootstrap
post_extract() {
rm -rf dmd druntime phobos
From c84e14d5b94629890fac853db8adda578bd7bfb2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 126/356] go1.12-bootstrap: move to bootstrap repo
---
srcpkgs/go1.12-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
noverifyrdeps=yes
nocross=yes
lib32disabled=yes
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
depends+=" gcompat"
From 06ef1bbe0b060d26e06a2168035a439fd3811c4d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 127/356] rust-bootstrap: move to bootstrap repo
---
srcpkgs/rust-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
conflicts="rust>=0"
lib32disabled=yes
nostrip=yes
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
depends="libexecinfo-devel"
From 523de5047eade68f945d0b61d861ae11ef92e06e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 128/356] openjdk7-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk7-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="https://icedtea.classpath.org/"
lib32disabled=yes
make_check=no # requires full jdk build
+repository=bootstrap
if [ -n "$XBPS_DEBUG_PKGS" ]; then
configure_args+=" --enable-native-debuginfo"
From 3207577b93c5956e2132604787a7905af646cf1f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 129/356] openjdk9-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk9-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea
From e7db6cd398e9e13d41709c0b5acd65a7119e019f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 130/356] openjdk10-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk10-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
lib32disabled=yes
+repository=bootstrap
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 94f3d2a3d5e06ba95dbdae397742083bca0189b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 131/356] openjdk12-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk12-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
provides="java-environment-${version}_1 java-runtime-${version}_1"
lib32disabled=yes
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From c177fff22ffc3ed7c7f056f31f3583fcce5e6f91 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 132/356] openjdk13-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk13-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
provides="java-environment-${version}_1 java-runtime-${version}_1"
lib32disabled=yes
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From d4b07dfabab91edeabf78cf909301c16aea095c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 133/356] openjdk14-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk14-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 3815ed88753150f968b03227bcbce4f5bbb1be3e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 134/356] openjdk15-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk15-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 5c98f2dea970761157cee40dfae907c1b8a4b499 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 135/356] openjdk16-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk16-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 4d8289fb27a8540c5bb17bc81e20e91edcd628b0 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 3 Feb 2023 21:34:36 -0600
Subject: [PATCH 136/356] .github/workflows: update masterdirs
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 22cbaa0a1ffe..9065af2e31df 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230111RC01-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 4c3aeb42cc2b..6a9a433e1d65 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230111RC01-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From 26b6e6b3c5db707e74acc42122bfe48a0f179f07 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 3 Feb 2023 22:57:53 -0600
Subject: [PATCH 137/356] .github/workflows: Use a different vintage of
masterdir
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9065af2e31df..f3ad322862d9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 6a9a433e1d65..15783160916c 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From a992b2794ed922ed8f8386665a6b76bcb889279c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 4 Feb 2023 15:05:05 +0100
Subject: [PATCH 138/356] .github/workflows: update containers to latest
masterdir image
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f3ad322862d9..6d86820ae7e2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230204RC01-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 15783160916c..7803c91b39cb 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230204RC01-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From 26a28b1228a99472ea161ac34b8a3f5e6f6e4923 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 3 Feb 2023 21:05:02 -0500
Subject: [PATCH 139/356] python3: fix checks on x86_64-musl
---
srcpkgs/python3/template | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 972a3cf5a2ec..3b37f46a8a91 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -73,22 +73,29 @@ do_configure() {
}
do_check() {
- # Tests ignored due to expected failures:
- # test_chown_*: relies on sane group membership not found in xbps-src
- # test_getspnam_exception: expects shadow passwd db unreadable by user
- # test_find_library_with_*: expects functionality patched out for musl
- # test_openssl_version: LibreSSL version and OpenSSL_version_num disagree
- # test_shared_ciphers: SSL advertises unexpected ciphers
- # test_freeze_simple_script: requires in-tree expat, which we removed
- #
- # Test ignored due to failures for unknown reasons:
- # test_session*: anomalies in SSL session handling
- # test_localtime_daylight_*_dst_true: overflow in datetime.time.mktime
- local opts="-i test_chown_* -i test_getspnam_exception \
- -i test_find_library_with_* -i test_openssl_version \
- -i test_shared_ciphers -i test_session* \
- -i test_localtime_daylight_*_dst_true \
- -i test_freeze_simple_script"
+ local opts
+
+ # relies on sane group membership not found in xbps-src
+ opts="-i test_chown_*"
+ # expects shadow passwd db unreadable by user
+ opts+=" -i test_getspnam_exception"
+ # expects functionality patched out for musl
+ opts+=" -i test_find_library_with_*"
+ # SSL advertises unexpected ciphers
+ opts+=" -i test_shared_ciphers"
+ # requires in-tree expat, which we removed
+ opts+=" -i test_freeze_simple_script"
+ # anomalies in SSL session handling
+ opts+=" -i test_session*"
+ # overflow in datetime.time.mktime
+ opts+=" -i test_localtime_daylight_*_dst_true"
+
+ if [ "${XBPS_TARGET_LIBC}" = "musl" ]; then
+ # musl doesn't work with locales
+ opts+=" -i test_locale* -i test_c_locale* -i test__locale"
+ opts+=" -i test_fpathconf"
+ fi
+
make ${makejobs} EXTRATESTOPTS="${opts}" quicktest
}
From df3b62873a82f070d20f56b2049364f29d4110db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 20:19:15 +0200
Subject: [PATCH 140/356] postgis-postgresql13: remove
---
srcpkgs/postgis-postgresql13/template | 32 ---------------------------
srcpkgs/postgis-postgresql13/update | 2 --
2 files changed, 34 deletions(-)
delete mode 100644 srcpkgs/postgis-postgresql13/template
delete mode 100644 srcpkgs/postgis-postgresql13/update
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
deleted file mode 100644
index b95707840357..000000000000
--- a/srcpkgs/postgis-postgresql13/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'postgis-postgresql13'
-pkgname=postgis-postgresql13
-version=3.2.1
-revision=3
-build_style=gnu-configure
-configure_args="
- --with-projdir=${XBPS_CROSS_BASE}/usr
- --with-jsondir=${XBPS_CROSS_BASE}/usr
- --with-protobufdir=${XBPS_CROSS_BASE}/usr
- --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
-hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql13-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql13-libs-devel
- proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
-short_desc="Spatial database extender for PostgreSQL"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://postgis.net/"
-changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
-distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
-nocross="FIXME: Cannot run test program to determine PROJ version"
-
-pre_configure() {
- ./autogen.sh
-}
-
-pre_check() {
- # regression tests require running postgresql
- vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/update b/srcpkgs/postgis-postgresql13/update
deleted file mode 100644
index e5577e6b068a..000000000000
--- a/srcpkgs/postgis-postgresql13/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=postgis
-ignore="*alpha* *beta* *rc*"
From 31c3e8de0f2da0060654bf968ebec42ffb2a69cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 20:22:27 +0200
Subject: [PATCH 141/356] postgresql13: remove
---
srcpkgs/postgresql13-client | 1 -
srcpkgs/postgresql13-contrib | 1 -
srcpkgs/postgresql13-doc | 1 -
srcpkgs/postgresql13-libs | 1 -
srcpkgs/postgresql13-libs-devel | 1 -
srcpkgs/postgresql13-plperl | 1 -
srcpkgs/postgresql13-plpython | 1 -
srcpkgs/postgresql13-pltcl | 1 -
srcpkgs/postgresql13/files/pg_config.sh.in | 143 -----------
srcpkgs/postgresql13/files/postgresql.confd | 17 --
srcpkgs/postgresql13/files/postgresql.pam | 3 -
.../postgresql13/files/postgresql13/control/t | 2 -
.../postgresql13/files/postgresql13/log/run | 2 -
srcpkgs/postgresql13/files/postgresql13/run | 27 ---
srcpkgs/postgresql13/files/profile.sh | 14 --
.../patches/pg_config-cross-value.patch | 45 ----
srcpkgs/postgresql13/patches/relocate.patch | 22 --
srcpkgs/postgresql13/template | 228 ------------------
srcpkgs/postgresql13/update | 2 -
19 files changed, 513 deletions(-)
delete mode 120000 srcpkgs/postgresql13-client
delete mode 120000 srcpkgs/postgresql13-contrib
delete mode 120000 srcpkgs/postgresql13-doc
delete mode 120000 srcpkgs/postgresql13-libs
delete mode 120000 srcpkgs/postgresql13-libs-devel
delete mode 120000 srcpkgs/postgresql13-plperl
delete mode 120000 srcpkgs/postgresql13-plpython
delete mode 120000 srcpkgs/postgresql13-pltcl
delete mode 100644 srcpkgs/postgresql13/files/pg_config.sh.in
delete mode 100644 srcpkgs/postgresql13/files/postgresql.confd
delete mode 100644 srcpkgs/postgresql13/files/postgresql.pam
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/control/t
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/log/run
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/run
delete mode 100644 srcpkgs/postgresql13/files/profile.sh
delete mode 100644 srcpkgs/postgresql13/patches/pg_config-cross-value.patch
delete mode 100644 srcpkgs/postgresql13/patches/relocate.patch
delete mode 100644 srcpkgs/postgresql13/template
delete mode 100644 srcpkgs/postgresql13/update
diff --git a/srcpkgs/postgresql13-client b/srcpkgs/postgresql13-client
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-client
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-contrib b/srcpkgs/postgresql13-contrib
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-contrib
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-doc b/srcpkgs/postgresql13-doc
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-doc
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-libs b/srcpkgs/postgresql13-libs
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-libs
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-libs-devel b/srcpkgs/postgresql13-libs-devel
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-libs-devel
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-plperl b/srcpkgs/postgresql13-plperl
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-plperl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-plpython b/srcpkgs/postgresql13-plpython
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-plpython
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-pltcl b/srcpkgs/postgresql13-pltcl
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-pltcl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13/files/pg_config.sh.in b/srcpkgs/postgresql13/files/pg_config.sh.in
deleted file mode 100644
index 3d20d215d0b3..000000000000
--- a/srcpkgs/postgresql13/files/pg_config.sh.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Released to Public Domain by Doan Tran Cong Danh
-
-print() {
- printf '%s\n' "$@"
-}
-
-sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
-
-BINDIR="$sysroot/@PREFIX@/bin"
-DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-INCLUDEDIR="$sysroot/usr/include"
-PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
-LIBDIR="$sysroot/@PREFIX@/lib"
-PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
-LOCALEDIR="$sysroot/@PREFIX@/share/locale"
-MANDIR="$sysroot/@PREFIX@/share/man"
-SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
-SYSCONFDIR="$sysroot/@PREFIX@/etc/postgresql"
-PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
-
-CONFIGURE="@configure_args@"
-CC="@CC@"
-CPPFLAGS="@CPPFLAGS@"
-CFLAGS="@CFLAGS@"
-CFLAGS_SL="@CFLAGS_SL@"
-LDFLAGS="@LDFLAGS@"
-LDFLAGS_EX="@LDFLAGS_EX@"
-LDFLAGS_SL="@LDFLAGS_SL@"
-LIBS="@LIBS@"
-VERSION="PostgreSQL @FULL_VERSION@"
-
-if [ "$sysroot" != "/" ]; then
- CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
- CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
- LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
-fi
-
-usage() {
- cat <<-EOF
- $0 provides information about the installed version of PostgreSQL.
-
- Usage:
- $0 [OPTION]...
-
- Options:
- --bindir show location of user executables
- --docdir show location of documentation files
- --htmldir show location of HTML documentation files
- --includedir show location of C header files of the client interfaces
- --pkgincludedir show location of other C header files
- --includedir-server show location of C header files for the server
- --libdir show location of object code libraries
- --pkglibdir show location of dynamically loadable modules
- --localedir show location of locale support files
- --mandir show location of manual pages
- --sharedir show location of architecture-independent support files
- --sysconfdir show location of system-wide configuration files
- --pgxs show location of extension makefile
- --configure show options given to PostgreSQL was built
- --cc show CC value used when PostgreSQL was built
- --cppflags show CPPFLAGS value used when PostgreSQL was built
- --cflags show CFLAGS value used when PostgreSQL was built
- --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
- --ldflags show LDFLAGS value used when PostgreSQL was built
- --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
- --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
- --libs show LIBS value used when PostgreSQL was built
- --version show the PostgreSQL version
- -?, --help show this help, then exit
-
- With no arguments, all known items are shown.
-
- Report bugs to <pgsql-bugs@postgresql.org>.
- EOF
-}
-
-if test $# -eq 0; then
- cat <<-EOF
- BINDIR = $BINDIR
- DOCDIR = $DOCDIR
- HTMLDIR = $HTMLDIR
- INCLUDEDIR = $INCLUDEDIR
- PKGINCLUDEDIR = $PKGINCLUDEDIR
- INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
- LIBDIR = $LIBDIR
- PKGLIBDIR = $PKGLIBDIR
- LOCALEDIR = $LOCALEDIR
- MANDIR = $MANDIR
- SHAREDIR = $SHAREDIR
- SYSCONFDIR = $SYSCONFDIR
- PGXS = $PGXS
- CONFIGURE = $CONFIGURE
- CC = $CC
- CPPFLAGS = $CPPFLAGS
- CFLAGS = $CFLAGS
- CFLAGS_SL = $CFLAGS_SL
- LDFLAGS = $LDFLAGS
- LDFLAGS_EX = $LDFLAGS_EX
- LDFLAGS_SL = $LDFLAGS_SL
- LIBS = $LIBS
- VERSION = $VERSION
- EOF
-fi
-
-for arg
-do
- if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
- usage
- exit 0
- fi
-done
-
-for arg
-do
- case "$arg" in
- --bindir) print "$BINDIR" ;;
- --docdir) print "$DOCDIR" ;;
- --htmldir) print "$HTMLDIR" ;;
- --includedir) print "$INCLUDEDIR" ;;
- --pkgincludedir) print "$PKGINCLUDEDIR" ;;
- --includedir-server) print "$INCLUDEDIR_SERVER" ;;
- --libdir) print "$LIBDIR" ;;
- --pkglibdir) print "$PKGLIBDIR" ;;
- --localedir) print "$LOCALEDIR" ;;
- --mandir) print "$MANDIR" ;;
- --sharedir) print "$SHAREDIR" ;;
- --sysconfdir) print "$SYSCONFDIR" ;;
- --pgxs) print "$PGXS" ;;
- --configure) print "$CONFIGURE" ;;
- --cc) print "$CC" ;;
- --cppflags) print "$CPPFLAGS" ;;
- --cflags) print "$CFLAGS" ;;
- --cflags_sl) print "$CFLAGS_SL" ;;
- --ldflags) print "$LDFLAGS" ;;
- --ldflags_ex) print "$LDFLAGS_EX" ;;
- --ldflags_sl) print "$LDFLAGS_SL" ;;
- --libs) print "$LIBS" ;;
- --version) print "$VERSION" ;;
- esac
-done
diff --git a/srcpkgs/postgresql13/files/postgresql.confd b/srcpkgs/postgresql13/files/postgresql.confd
deleted file mode 100644
index fe7106626fa5..000000000000
--- a/srcpkgs/postgresql13/files/postgresql.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for the PostgreSQL server.
-
-# PostgreSQL's database directory
-PGROOT="/var/lib/postgresql@VERSION@"
-
-# PostgreSQL's log file.
-PGLOG="/var/log/postgresql@VERSION@.log"
-
-# Passed to initdb if necessary
-INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql13/files/postgresql.pam b/srcpkgs/postgresql13/files/postgresql.pam
deleted file mode 100644
index 53724d1f86a7..000000000000
--- a/srcpkgs/postgresql13/files/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/srcpkgs/postgresql13/files/postgresql13/control/t b/srcpkgs/postgresql13/files/postgresql13/control/t
deleted file mode 100755
index dcedfaa20180..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql13/files/postgresql13/log/run b/srcpkgs/postgresql13/files/postgresql13/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql13/files/postgresql13/run b/srcpkgs/postgresql13/files/postgresql13/run
deleted file mode 100755
index 9d044e9a1ce1..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/run
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-. /@PREFIX@/etc/default/postgresql
-: ${PGDATA:="$PGROOT/data"}
-
-if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
- echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
- ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
-fi
-
-
-if [ ! -d "$PGDATA" ]; then
- echo "Initializing database in $PGDATA"
-
- mkdir -p "$PGDATA" || exit 1
- chown -R postgres:postgres "$PGDATA"
- chmod 0700 "$PGDATA"
- su - postgres -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" 2>&1 || {
- rm -fr "$PGDATA"
- exit 1
- }
-
- if [ -f /@PREFIX@/etc/postgresql/postgresql.conf ]; then
- ln -sf /@PREFIX@/etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
- fi
-fi
-
-exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql13/files/profile.sh b/srcpkgs/postgresql13/files/profile.sh
deleted file mode 100644
index 54be2ca50a4f..000000000000
--- a/srcpkgs/postgresql13/files/profile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-appendpath () {
- case ":$PATH:" in
- *:"$1":*)
- ;;
- *)
- PATH="${PATH:+$PATH:}$1"
- esac
-}
-
-appendpath '/@PREFIX@/bin'
-
-unset appendpath
-
-export PATH
diff --git a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch b/srcpkgs/postgresql13/patches/pg_config-cross-value.patch
deleted file mode 100644
index cc0a9fc19133..000000000000
--- a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Sources: Doan Tran Cong Danh
-Upstream: No
- - First part needs to be rework in configure script to be usable
- upstream
- - Second part would un-usable for Windows
-diff --git src/common/Makefile src/common/Makefile
-index ec04710..2af845f 100644
---- a/src/common/Makefile
-+++ b/src/common/Makefile
-@@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global
-
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-+STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
-+STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-+STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-+override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
- GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
- GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
-
--all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
-+all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
-+
-+pg_config.sh: pg_config.sh.in
-+ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
-+ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
-+ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
-+ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
-+ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
-+ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
-+ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
-+ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
-+ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
-+ $< >$@
-
- distprep: kwlist_d.h
-
diff --git a/srcpkgs/postgresql13/patches/relocate.patch b/srcpkgs/postgresql13/patches/relocate.patch
deleted file mode 100644
index d2cc14281e3a..000000000000
--- a/srcpkgs/postgresql13/patches/relocate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Sat, 18 Jan 2020 12:19:45 +0100
-Subject: [PATCH] relocate
-
-
-diff --git src/port/path.c src/port/path.c
-index 710988b..20dc57d 100644
---- a/src/port/path.c
-+++ b/src/port/path.c
-@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
- int tail_len;
- int i;
-
-+ goto no_match; // we relocate only binaries
-+
- /*
- * Determine the common prefix --- note we require it to end on a
- * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
---
-2.23.0
-
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
deleted file mode 100644
index 0f1ea0072b11..000000000000
--- a/srcpkgs/postgresql13/template
+++ /dev/null
@@ -1,228 +0,0 @@
-# Template file for 'postgresql13'
-pkgname=postgresql13
-version=13.8
-revision=3
-build_style=gnu-configure
-make_build_target=world
-_major="${version%%.*}"
-_prefix="usr/lib/psql${_major}"
-configure_args="--with-openssl --with-python
- --with-pam --enable-thread-safety
- --with-perl --with-tcl --without-ldap --without-gssapi
- --without-bonjour --with-libxml --with-libxslt
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
-hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
- python3-devel readline-devel tcl-devel"
-short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="PostgreSQL"
-homepage="https://www.postgresql.org"
-changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
-distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
-make_check=ci-skip # Postgres server can't be run as root
-
-conf_files="
- /${_prefix}/etc/default/postgresql
- /${_prefix}/etc/pam.d/postgresql
- /${_prefix}/etc/postgresql/postgresql.conf
-"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/postgresql"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-make_dirs="
- /var/lib/postgresql 0750 postgres postgres
- /var/lib/postgresql${_major} 0750 postgres postgres"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --without-perl --without-python --without-tcl"
-fi
-
-post_patch() {
- cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
- _substitute src/common/pg_config.sh.in
- vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
-}
-
-pre_configure() {
- _style_configure_args="${configure_args}"
- configure_args=" "
- for arg in ${_style_configure_args}; do
- case $arg in
- --prefix=*|*dir=*) : ;; # skip
- *) configure_args+=" $arg"
- esac
- done
- configure_args="--prefix=/${_prefix}
- --sysconfdir=/${_prefix}/etc
- --includedir=/usr/include
- ${configure_args}"
-}
-
-post_build() {
- make -C contrib ${makejobs}
-}
-
-pre_check() {
- ln -sr tmp_install/${_prefix} /${_prefix%/*}
-}
-
-post_install() {
- vmkdir usr/share/man
- cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
- for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
- mv $i ${i%.*}-${_major}.${i##*.}
- done
- vmkdir ${_prefix}/share/doc
- cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
- vsv ${pkgname}
- find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
- vlicense COPYRIGHT
-
- vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
- _substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
- vinstall ${FILESDIR}/postgresql.confd 644 ${_prefix}/etc/default postgresql
- _substitute ${DESTDIR}/${_prefix}/etc/default/postgresql
- vinstall ${FILESDIR}/postgresql.pam 644 ${_prefix}/etc/pam.d postgresql
- _substitute ${DESTDIR}/${_prefix}/etc/pam.d/postgresql
- vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
- 644 ${_prefix}/etc/postgresql postgresql.conf
- vbin src/common/pg_config.sh
-
- vsed -i 's/install_bin = .*/install_bin = install/g' \
- ${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
-}
-
-_substitute() {
- sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
-}
-
-postgresql13-doc_package() {
- short_desc="PostgreSQL documentation"
- pkg_install() {
- vmove ${_prefix}/share/doc
- }
-}
-
-postgresql13-libs_package() {
- short_desc="PostgreSQL shared libraries"
- conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0"
- pkg_install() {
- vmove "${_prefix}/lib/*.so*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name libpq5\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
- }
-}
-
-postgresql13-libs-devel_package() {
- depends="postgresql-libs>=${version}_${revision} openssl-devel"
- short_desc="PostgreSQL shared libraries (development files)"
- conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0"
- pkg_install() {
- vmkdir usr/bin
- vmkdir usr/lib
- for f in pg_config ecpg; do
- vmove ${_prefix}/bin/${f}
- vmove "usr/share/man/man1/$(basename ${f})*"
- ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
- done
- vmove usr/bin/pg_config.sh
- vmove usr/include
- vmove "${_prefix}/lib/*.a"
- mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
- vmove usr/share/man/man3
- vmove ${_prefix}/lib/postgresql/pgxs
- for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
- ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
- done
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pg_config\* -o -name ecpg\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-# XXX disabled for now in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-
-postgresql13-plperl_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Perl procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/plperl*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name plperl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql13-plpython_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Python procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/plpython*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name plpython\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql13-pltcl_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Tcl procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/pltcl*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pltcl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-fi # !CROSS_BUILD
-
-postgresql13-client_package() {
- short_desc="Client frontends programs for PostgreSQL"
- pkg_install() {
- for f in clusterdb createdb createuser dropdb \
- dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
- vacuumdb; do
- vmove ${_prefix}/bin/${f}
- vmove usr/share/man/man1/$(basename ${f})-${_major}.1
- done
- vmove usr/share/man/man7
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pgscripts\* -o \
- -name psql\* -o \
- -name pg_dump\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
- ${PKGDESTDIR}/${_prefix}/share
- vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
- _substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
- }
-}
-
-postgresql13-contrib_package() {
- short_desc="PostgreSQL contributed programs and extensions"
- pkg_install() {
- make -C contrib install DESTDIR=${PKGDESTDIR}
- mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
- }
-}
diff --git a/srcpkgs/postgresql13/update b/srcpkgs/postgresql13/update
deleted file mode 100644
index 160ccf143338..000000000000
--- a/srcpkgs/postgresql13/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K${version%%.*}[\d.]+(?!\w)"
From 86230fb251cc48c80eb1d7d57c4231d50a4912e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:49:49 +0200
Subject: [PATCH 142/356] New package: postgresql15-15.1
---
common/shlibs | 8 +-
srcpkgs/postgresql-libs | 2 +-
srcpkgs/postgresql-libs-devel | 2 +-
srcpkgs/postgresql15-client | 1 +
srcpkgs/postgresql15-contrib | 1 +
srcpkgs/postgresql15-doc | 1 +
srcpkgs/postgresql15-plperl | 1 +
srcpkgs/postgresql15-plpython | 1 +
srcpkgs/postgresql15-pltcl | 1 +
srcpkgs/postgresql15/files/pg_config.sh.in | 143 +++++++++++
srcpkgs/postgresql15/files/postgresql.confd | 17 ++
srcpkgs/postgresql15/files/postgresql.pam | 3 +
.../postgresql15/files/postgresql15/control/t | 2 +
.../postgresql15/files/postgresql15/log/run | 2 +
srcpkgs/postgresql15/files/postgresql15/run | 27 +++
srcpkgs/postgresql15/files/profile.sh | 14 ++
.../patches/pg_config-cross-value.patch | 45 ++++
srcpkgs/postgresql15/patches/relocate.patch | 22 ++
srcpkgs/postgresql15/template | 229 ++++++++++++++++++
srcpkgs/postgresql15/update | 2 +
20 files changed, 518 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/postgresql15-client
create mode 120000 srcpkgs/postgresql15-contrib
create mode 120000 srcpkgs/postgresql15-doc
create mode 120000 srcpkgs/postgresql15-plperl
create mode 120000 srcpkgs/postgresql15-plpython
create mode 120000 srcpkgs/postgresql15-pltcl
create mode 100644 srcpkgs/postgresql15/files/pg_config.sh.in
create mode 100644 srcpkgs/postgresql15/files/postgresql.confd
create mode 100644 srcpkgs/postgresql15/files/postgresql.pam
create mode 100755 srcpkgs/postgresql15/files/postgresql15/control/t
create mode 100755 srcpkgs/postgresql15/files/postgresql15/log/run
create mode 100755 srcpkgs/postgresql15/files/postgresql15/run
create mode 100644 srcpkgs/postgresql15/files/profile.sh
create mode 100644 srcpkgs/postgresql15/patches/pg_config-cross-value.patch
create mode 100644 srcpkgs/postgresql15/patches/relocate.patch
create mode 100644 srcpkgs/postgresql15/template
create mode 100644 srcpkgs/postgresql15/update
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..af1fd992b5da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -568,10 +568,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
libKF5Purpose.so.5 purpose-5.48.0_1
libKF5PulseAudioQt.so.3 pulseaudio-qt-1.3_1
libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-14.0_1
-libecpg.so.6 postgresql-libs-14.0_1
-libpgtypes.so.3 postgresql-libs-14.0_1
-libpq.so.5 postgresql-libs-14.0_1
+libecpg_compat.so.3 postgresql-libs-15.1_1
+libecpg.so.6 postgresql-libs-15.1_1
+libpgtypes.so.3 postgresql-libs-15.1_1
+libpq.so.5 postgresql-libs-15.1_1
libmypaint.so.0 libmypaint-1.6.1_1
libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
libgssrpc.so.4 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/postgresql-libs b/srcpkgs/postgresql-libs
index 13d0224a054b..a44b462efd15 120000
--- a/srcpkgs/postgresql-libs
+++ b/srcpkgs/postgresql-libs
@@ -1 +1 @@
-postgresql14
\ No newline at end of file
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql-libs-devel b/srcpkgs/postgresql-libs-devel
index 13d0224a054b..a44b462efd15 120000
--- a/srcpkgs/postgresql-libs-devel
+++ b/srcpkgs/postgresql-libs-devel
@@ -1 +1 @@
-postgresql14
\ No newline at end of file
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-client b/srcpkgs/postgresql15-client
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-client
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-contrib b/srcpkgs/postgresql15-contrib
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-contrib
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-doc b/srcpkgs/postgresql15-doc
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-doc
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-plperl b/srcpkgs/postgresql15-plperl
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-plperl
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-plpython b/srcpkgs/postgresql15-plpython
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-plpython
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-pltcl b/srcpkgs/postgresql15-pltcl
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-pltcl
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15/files/pg_config.sh.in b/srcpkgs/postgresql15/files/pg_config.sh.in
new file mode 100644
index 000000000000..68068a82e01e
--- /dev/null
+++ b/srcpkgs/postgresql15/files/pg_config.sh.in
@@ -0,0 +1,143 @@
+#!/bin/sh
+# Released to Public Domain by Doan Tran Cong Danh
+
+print() {
+ printf '%s\n' "$@"
+}
+
+sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
+
+BINDIR="$sysroot/@PREFIX@/bin"
+DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+INCLUDEDIR="$sysroot/usr/include"
+PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
+INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
+LIBDIR="$sysroot/@PREFIX@/lib"
+PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
+LOCALEDIR="$sysroot/@PREFIX@/share/locale"
+MANDIR="$sysroot/@PREFIX@/share/man"
+SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
+SYSCONFDIR="$sysroot/etc/psql@VERSION@/postgresql"
+PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
+
+CONFIGURE="@configure_args@"
+CC="@CC@"
+CPPFLAGS="@CPPFLAGS@"
+CFLAGS="@CFLAGS@"
+CFLAGS_SL="@CFLAGS_SL@"
+LDFLAGS="@LDFLAGS@"
+LDFLAGS_EX="@LDFLAGS_EX@"
+LDFLAGS_SL="@LDFLAGS_SL@"
+LIBS="@LIBS@"
+VERSION="PostgreSQL @FULL_VERSION@"
+
+if [ "$sysroot" != "/" ]; then
+ CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+ CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+ LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
+fi
+
+usage() {
+ cat <<-EOF
+ $0 provides information about the installed version of PostgreSQL.
+
+ Usage:
+ $0 [OPTION]...
+
+ Options:
+ --bindir show location of user executables
+ --docdir show location of documentation files
+ --htmldir show location of HTML documentation files
+ --includedir show location of C header files of the client interfaces
+ --pkgincludedir show location of other C header files
+ --includedir-server show location of C header files for the server
+ --libdir show location of object code libraries
+ --pkglibdir show location of dynamically loadable modules
+ --localedir show location of locale support files
+ --mandir show location of manual pages
+ --sharedir show location of architecture-independent support files
+ --sysconfdir show location of system-wide configuration files
+ --pgxs show location of extension makefile
+ --configure show options given to PostgreSQL was built
+ --cc show CC value used when PostgreSQL was built
+ --cppflags show CPPFLAGS value used when PostgreSQL was built
+ --cflags show CFLAGS value used when PostgreSQL was built
+ --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
+ --ldflags show LDFLAGS value used when PostgreSQL was built
+ --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
+ --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
+ --libs show LIBS value used when PostgreSQL was built
+ --version show the PostgreSQL version
+ -?, --help show this help, then exit
+
+ With no arguments, all known items are shown.
+
+ Report bugs to <pgsql-bugs@postgresql.org>.
+ EOF
+}
+
+if test $# -eq 0; then
+ cat <<-EOF
+ BINDIR = $BINDIR
+ DOCDIR = $DOCDIR
+ HTMLDIR = $HTMLDIR
+ INCLUDEDIR = $INCLUDEDIR
+ PKGINCLUDEDIR = $PKGINCLUDEDIR
+ INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
+ LIBDIR = $LIBDIR
+ PKGLIBDIR = $PKGLIBDIR
+ LOCALEDIR = $LOCALEDIR
+ MANDIR = $MANDIR
+ SHAREDIR = $SHAREDIR
+ SYSCONFDIR = $SYSCONFDIR
+ PGXS = $PGXS
+ CONFIGURE = $CONFIGURE
+ CC = $CC
+ CPPFLAGS = $CPPFLAGS
+ CFLAGS = $CFLAGS
+ CFLAGS_SL = $CFLAGS_SL
+ LDFLAGS = $LDFLAGS
+ LDFLAGS_EX = $LDFLAGS_EX
+ LDFLAGS_SL = $LDFLAGS_SL
+ LIBS = $LIBS
+ VERSION = $VERSION
+ EOF
+fi
+
+for arg
+do
+ if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
+ usage
+ exit 0
+ fi
+done
+
+for arg
+do
+ case "$arg" in
+ --bindir) print "$BINDIR" ;;
+ --docdir) print "$DOCDIR" ;;
+ --htmldir) print "$HTMLDIR" ;;
+ --includedir) print "$INCLUDEDIR" ;;
+ --pkgincludedir) print "$PKGINCLUDEDIR" ;;
+ --includedir-server) print "$INCLUDEDIR_SERVER" ;;
+ --libdir) print "$LIBDIR" ;;
+ --pkglibdir) print "$PKGLIBDIR" ;;
+ --localedir) print "$LOCALEDIR" ;;
+ --mandir) print "$MANDIR" ;;
+ --sharedir) print "$SHAREDIR" ;;
+ --sysconfdir) print "$SYSCONFDIR" ;;
+ --pgxs) print "$PGXS" ;;
+ --configure) print "$CONFIGURE" ;;
+ --cc) print "$CC" ;;
+ --cppflags) print "$CPPFLAGS" ;;
+ --cflags) print "$CFLAGS" ;;
+ --cflags_sl) print "$CFLAGS_SL" ;;
+ --ldflags) print "$LDFLAGS" ;;
+ --ldflags_ex) print "$LDFLAGS_EX" ;;
+ --ldflags_sl) print "$LDFLAGS_SL" ;;
+ --libs) print "$LIBS" ;;
+ --version) print "$VERSION" ;;
+ esac
+done
diff --git a/srcpkgs/postgresql15/files/postgresql.confd b/srcpkgs/postgresql15/files/postgresql.confd
new file mode 100644
index 000000000000..fe7106626fa5
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql.confd
@@ -0,0 +1,17 @@
+# Configuration file for the PostgreSQL server.
+
+# PostgreSQL's database directory
+PGROOT="/var/lib/postgresql@VERSION@"
+
+# PostgreSQL's log file.
+PGLOG="/var/log/postgresql@VERSION@.log"
+
+# Passed to initdb if necessary
+INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
+
+# Extra options to run postmaster with, e.g.:
+# -N is the maximal number of client connections
+# -B is the number of shared buffers and has to be at least 2x the value for -N
+# Please read the man-page to postmaster for more options. Many of these options
+# can be set directly in the configuration-file.
+#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql15/files/postgresql.pam b/srcpkgs/postgresql15/files/postgresql.pam
new file mode 100644
index 000000000000..53724d1f86a7
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql.pam
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
diff --git a/srcpkgs/postgresql15/files/postgresql15/control/t b/srcpkgs/postgresql15/files/postgresql15/control/t
new file mode 100755
index 000000000000..dcedfaa20180
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql15/files/postgresql15/log/run b/srcpkgs/postgresql15/files/postgresql15/log/run
new file mode 100755
index 000000000000..815d9c974079
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql15/files/postgresql15/run b/srcpkgs/postgresql15/files/postgresql15/run
new file mode 100755
index 000000000000..3aee9440e847
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/run
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /etc/psql@VERSION@/default/postgresql
+: ${PGDATA:="$PGROOT/data"}
+
+if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
+ echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
+ ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
+fi
+
+
+if [ ! -d "$PGDATA" ]; then
+ echo "Initializing database in $PGDATA"
+
+ mkdir -p "$PGDATA" || exit 1
+ chown -R postgres:postgres "$PGDATA"
+ chmod 0700 "$PGDATA"
+ su - postgres -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" 2>&1 || {
+ rm -fr "$PGDATA"
+ exit 1
+ }
+
+ if [ -f /etc/psql@VERSION@/postgresql/postgresql.conf ]; then
+ ln -sf /etc/psql@VERSION@/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
+ fi
+fi
+
+exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql15/files/profile.sh b/srcpkgs/postgresql15/files/profile.sh
new file mode 100644
index 000000000000..54be2ca50a4f
--- /dev/null
+++ b/srcpkgs/postgresql15/files/profile.sh
@@ -0,0 +1,14 @@
+appendpath () {
+ case ":$PATH:" in
+ *:"$1":*)
+ ;;
+ *)
+ PATH="${PATH:+$PATH:}$1"
+ esac
+}
+
+appendpath '/@PREFIX@/bin'
+
+unset appendpath
+
+export PATH
diff --git a/srcpkgs/postgresql15/patches/pg_config-cross-value.patch b/srcpkgs/postgresql15/patches/pg_config-cross-value.patch
new file mode 100644
index 000000000000..cc0a9fc19133
--- /dev/null
+++ b/srcpkgs/postgresql15/patches/pg_config-cross-value.patch
@@ -0,0 +1,45 @@
+Sources: Doan Tran Cong Danh
+Upstream: No
+ - First part needs to be rework in configure script to be usable
+ upstream
+ - Second part would un-usable for Windows
+diff --git src/common/Makefile src/common/Makefile
+index ec04710..2af845f 100644
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global
+
+ # don't include subdirectory-path-dependent -I and -L switches
+ STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
++STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
++STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
+ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
++STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
+ override CPPFLAGS += -DVAL_CC="\"$(CC)\""
+ override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
+-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
++override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
+ override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
+ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
+@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
+ GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
+ GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
+
+-all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
++all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
++
++pg_config.sh: pg_config.sh.in
++ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
++ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
++ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
++ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
++ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
++ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
++ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
++ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
++ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
++ $< >$@
+
+ distprep: kwlist_d.h
+
diff --git a/srcpkgs/postgresql15/patches/relocate.patch b/srcpkgs/postgresql15/patches/relocate.patch
new file mode 100644
index 000000000000..d2cc14281e3a
--- /dev/null
+++ b/srcpkgs/postgresql15/patches/relocate.patch
@@ -0,0 +1,22 @@
+From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 18 Jan 2020 12:19:45 +0100
+Subject: [PATCH] relocate
+
+
+diff --git src/port/path.c src/port/path.c
+index 710988b..20dc57d 100644
+--- a/src/port/path.c
++++ b/src/port/path.c
+@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
+ int tail_len;
+ int i;
+
++ goto no_match; // we relocate only binaries
++
+ /*
+ * Determine the common prefix --- note we require it to end on a
+ * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
+--
+2.23.0
+
diff --git a/srcpkgs/postgresql15/template b/srcpkgs/postgresql15/template
new file mode 100644
index 000000000000..01bcb1759747
--- /dev/null
+++ b/srcpkgs/postgresql15/template
@@ -0,0 +1,229 @@
+# Template file for 'postgresql15'
+pkgname=postgresql15
+version=15.1
+revision=1
+build_style=gnu-configure
+make_build_target=world
+_major="${version%%.*}"
+_prefix="usr/lib/psql${_major}"
+_sysconfdir="etc/psql${_major}"
+configure_args="--with-openssl --with-python
+ --with-pam --enable-thread-safety
+ --with-perl --with-tcl --without-ldap --without-gssapi
+ --without-bonjour --with-libxml --with-libxslt
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
+hostmakedepends="docbook2x gettext flex openjade"
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
+ python3-devel readline-devel tcl-devel"
+short_desc="Sophisticated open-source Object-Relational DBMS"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="PostgreSQL"
+homepage="https://www.postgresql.org"
+changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
+distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
+checksum=64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae
+make_check=ci-skip # Postgres server can't be run as root
+
+conf_files="
+ /${_sysconfdir}/default/postgresql
+ /${_sysconfdir}/pam.d/postgresql
+ /${_sysconfdir}/postgresql/postgresql.conf
+"
+
+# Create 'postgres' user for the server.
+system_accounts="postgres"
+postgres_homedir="/var/lib/postgresql"
+postgres_shell="/bin/sh"
+postgres_descr="PostgreSQL database server user"
+make_dirs="
+ /var/lib/postgresql 0750 postgres postgres
+ /var/lib/postgresql${_major} 0750 postgres postgres"
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" --without-perl --without-python --without-tcl"
+fi
+
+post_patch() {
+ cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
+ _substitute src/common/pg_config.sh.in
+ vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
+}
+
+pre_configure() {
+ _style_configure_args="${configure_args}"
+ configure_args=" "
+ for arg in ${_style_configure_args}; do
+ case $arg in
+ --prefix=*|*dir=*) : ;; # skip
+ *) configure_args+=" $arg"
+ esac
+ done
+ configure_args="--prefix=/${_prefix}
+ --sysconfdir=/${_sysconfdir}
+ --includedir=/usr/include
+ ${configure_args}"
+}
+
+post_build() {
+ make -C contrib ${makejobs}
+}
+
+pre_check() {
+ ln -sr tmp_install/${_prefix} /${_prefix%/*}
+}
+
+post_install() {
+ vmkdir usr/share/man
+ cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
+ for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
+ mv $i ${i%.*}-${_major}.${i##*.}
+ done
+ vmkdir ${_prefix}/share/doc
+ cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
+ vsv ${pkgname}
+ find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
+ vlicense COPYRIGHT
+
+ vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+ _substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
+ vinstall ${FILESDIR}/postgresql.confd 644 ${_sysconfdir}/default postgresql
+ _substitute ${DESTDIR}/${_sysconfdir}/default/postgresql
+ vinstall ${FILESDIR}/postgresql.pam 644 ${_sysconfdir}/pam.d postgresql
+ _substitute ${DESTDIR}/${_sysconfdir}/pam.d/postgresql
+ vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
+ 644 ${_sysconfdir}/postgresql postgresql.conf
+ vbin src/common/pg_config.sh
+
+ vsed -i 's/install_bin = .*/install_bin = install/g' \
+ ${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
+}
+
+_substitute() {
+ sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
+}
+
+postgresql15-doc_package() {
+ short_desc="PostgreSQL documentation"
+ pkg_install() {
+ vmove ${_prefix}/share/doc
+ }
+}
+
+postgresql-libs_package() {
+ short_desc="PostgreSQL shared libraries"
+ conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0 postgresql13-libs>=0 postgresql14-libs>=0"
+ pkg_install() {
+ vmove "${_prefix}/lib/*.so*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name libpq5\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
+ }
+}
+
+postgresql-libs-devel_package() {
+ depends="postgresql-libs>=${version}_${revision} openssl-devel"
+ short_desc="PostgreSQL shared libraries (development files)"
+ conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0 postgresql13-libs-devel>=0 postgresql14-libs-devel>=0"
+ pkg_install() {
+ vmkdir usr/bin
+ vmkdir usr/lib
+ for f in pg_config ecpg; do
+ vmove ${_prefix}/bin/${f}
+ vmove "usr/share/man/man1/$(basename ${f})*"
+ ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
+ done
+ vmove usr/bin/pg_config.sh
+ vmove usr/include
+ vmove "${_prefix}/lib/*.a"
+ mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
+ vmove usr/share/man/man3
+ vmove ${_prefix}/lib/postgresql/pgxs
+ for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
+ ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
+ done
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pg_config\* -o -name ecpg\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+# XXX disabled for now in cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+
+postgresql15-plperl_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Perl procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/plperl*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name plperl\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+postgresql15-plpython_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Python procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/plpython*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name plpython\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+postgresql15-pltcl_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Tcl procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/pltcl*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pltcl\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+fi # !CROSS_BUILD
+
+postgresql15-client_package() {
+ short_desc="Client frontends programs for PostgreSQL"
+ pkg_install() {
+ for f in clusterdb createdb createuser dropdb \
+ dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
+ vacuumdb; do
+ vmove ${_prefix}/bin/${f}
+ vmove usr/share/man/man1/$(basename ${f})-${_major}.1
+ done
+ vmove usr/share/man/man7
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pgscripts\* -o \
+ -name psql\* -o \
+ -name pg_dump\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
+ ${PKGDESTDIR}/${_prefix}/share
+ vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+ _substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
+ }
+}
+
+postgresql15-contrib_package() {
+ short_desc="PostgreSQL contributed programs and extensions"
+ pkg_install() {
+ make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
+ }
+}
diff --git a/srcpkgs/postgresql15/update b/srcpkgs/postgresql15/update
new file mode 100644
index 000000000000..160ccf143338
--- /dev/null
+++ b/srcpkgs/postgresql15/update
@@ -0,0 +1,2 @@
+site="https://ftp.postgresql.org/pub/source/"
+pattern="v\K${version%%.*}[\d.]+(?!\w)"
From 7d7d8a6f66ebd464da300f121caa19f43f9db206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:52:48 +0200
Subject: [PATCH 143/356] New package: postgresql14-libs-14.5
---
srcpkgs/postgresql14-libs | 1 +
srcpkgs/postgresql14-libs-devel | 1 +
srcpkgs/postgresql14/template | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/postgresql14-libs
create mode 120000 srcpkgs/postgresql14-libs-devel
diff --git a/srcpkgs/postgresql14-libs b/srcpkgs/postgresql14-libs
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-libs
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-libs-devel b/srcpkgs/postgresql14-libs-devel
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-libs-devel
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
index 9c1d31ce1444..3dc23d8a952f 100644
--- a/srcpkgs/postgresql14/template
+++ b/srcpkgs/postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql14'
pkgname=postgresql14
version=14.5
-revision=3
+revision=4
build_style=gnu-configure
make_build_target=world
_major="${version%%.*}"
@@ -109,7 +109,7 @@ postgresql14-doc_package() {
}
}
-postgresql-libs_package() {
+postgresql14-libs_package() {
short_desc="PostgreSQL shared libraries"
conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0 postgresql13-libs>=0"
pkg_install() {
@@ -123,7 +123,7 @@ postgresql-libs_package() {
}
}
-postgresql-libs-devel_package() {
+postgresql14-libs-devel_package() {
depends="postgresql-libs>=${version}_${revision} openssl-devel"
short_desc="PostgreSQL shared libraries (development files)"
conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0 postgresql13-libs-devel>=0"
From 7ed0b01a517e3ba5feff819b3572adb47c54c3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:56:13 +0200
Subject: [PATCH 144/356] postgis-postgresql14: build with postgresql14-libs
---
srcpkgs/postgis-postgresql14/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 5b07a5bd027d..1891f6b9ea2d 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -9,8 +9,8 @@ configure_args="
--with-protobufdir=${XBPS_CROSS_BASE}/usr
--with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ libgdal-tools postgresql14-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql14-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
From f5d2d38a2aff36a350c020f37d7b3cf41f17e999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 23:05:06 +0200
Subject: [PATCH 145/356] New package: postgis-postgresql15-3.2.1
---
srcpkgs/postgis | 2 +-
srcpkgs/postgis-postgresql14/template | 6 -----
srcpkgs/postgis-postgresql15/template | 38 +++++++++++++++++++++++++++
srcpkgs/postgis-postgresql15/update | 2 ++
4 files changed, 41 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/postgis-postgresql15/template
create mode 100644 srcpkgs/postgis-postgresql15/update
diff --git a/srcpkgs/postgis b/srcpkgs/postgis
index 07d2a298867d..3bacb4f025ed 120000
--- a/srcpkgs/postgis
+++ b/srcpkgs/postgis
@@ -1 +1 @@
-postgis-postgresql14
\ No newline at end of file
+postgis-postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 1891f6b9ea2d..3b0fd21b5a65 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -30,9 +30,3 @@ pre_check() {
# regression tests require running postgresql
vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
}
-
-postgis_package() {
- build_style=meta
- short_desc+=" (meta package)"
- depends="postgis-postgresql14"
-}
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
new file mode 100644
index 000000000000..ae140613c292
--- /dev/null
+++ b/srcpkgs/postgis-postgresql15/template
@@ -0,0 +1,38 @@
+# Template file for 'postgis-postgresql15'
+pkgname=postgis-postgresql15
+version=3.2.1
+revision=6
+build_style=gnu-configure
+configure_args="
+ --with-projdir=${XBPS_CROSS_BASE}/usr
+ --with-jsondir=${XBPS_CROSS_BASE}/usr
+ --with-protobufdir=${XBPS_CROSS_BASE}/usr
+ --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
+hostmakedepends="automake libtool perl pkg-config geos
+ libgdal-tools postgresql-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ proj-devel protobuf-c-devel pcre-devel json-c-devel"
+checkdepends="libxslt CUnit-devel"
+short_desc="Spatial database extender for PostgreSQL"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="GPL-2.0-or-later"
+homepage="https://postgis.net/"
+changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
+distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
+checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+nocross="FIXME: Cannot run test program to determine PROJ version"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
+
+postgis_package() {
+ build_style=meta
+ short_desc+=" (meta package)"
+ depends="${sourcepkg}"
+}
diff --git a/srcpkgs/postgis-postgresql15/update b/srcpkgs/postgis-postgresql15/update
new file mode 100644
index 000000000000..e5577e6b068a
--- /dev/null
+++ b/srcpkgs/postgis-postgresql15/update
@@ -0,0 +1,2 @@
+pkgname=postgis
+ignore="*alpha* *beta* *rc*"
From ae9e94ecf8a6f558b15ed8cc632d668f921ea7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 23:05:19 +0200
Subject: [PATCH 146/356] postgresql: update to 15.
---
srcpkgs/postgresql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 349e0c92ac16..99f8adc3d420 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
-version=14
-revision=2
+version=15
+revision=1
build_style=meta
depends="postgresql${version}"
short_desc="PostgreSQL server meta package"
From eff18f09f32b8b744500f78476dd70b751b6228a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 4 Feb 2023 19:46:42 +0100
Subject: [PATCH 147/356] postgis-postgresql14: update to 3.3.2.
---
srcpkgs/postgis-postgresql14/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 3b0fd21b5a65..e15977173795 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
-version=3.2.1
-revision=5
+version=3.3.2
+revision=1
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+checksum=9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068
nocross="FIXME: Cannot run test program to determine PROJ version"
pre_configure() {
From e628bdf67e2ded19ce60e2a04983cf094f3e99e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 4 Feb 2023 19:46:43 +0100
Subject: [PATCH 148/356] postgis-postgresql15: update to 3.3.2.
---
srcpkgs/postgis-postgresql15/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ae140613c292..eb8650e16755 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
-version=3.2.1
-revision=6
+version=3.3.2
+revision=1
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+checksum=9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068
nocross="FIXME: Cannot run test program to determine PROJ version"
pre_configure() {
From d3ffd94b4839b01383185f74529aace00a99b33e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 17:16:02 +0000
Subject: [PATCH 149/356] python3-autobahn: update to 23.1.1.
---
srcpkgs/python3-autobahn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
index 1d43cf46a7e1..197ff6f6a5f2 100644
--- a/srcpkgs/python3-autobahn/template
+++ b/srcpkgs/python3-autobahn/template
@@ -1,6 +1,6 @@
# Template file for 'python3-autobahn'
pkgname=python3-autobahn
-version=22.12.1
+version=23.1.1
revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://crossbar.io/autobahn"
changelog="https://raw.githubusercontent.com/crossbario/autobahn-python/master/docs/changelog.rst"
distfiles="${PYPI_SITE}/a/autobahn/autobahn-${version}.tar.gz"
-checksum=43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925
+checksum=a88882ab4700ee9eee46c69c38e2b625f6fda48ab1ce61cf7b58b23cf2fadcb8
make_check=no # https://github.com/crossbario/autobahn-python/issues/1117
post_install() {
From ea8364fc647dfe3fb29da8b2c2aee5425e0e3f2e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:58:51 +0000
Subject: [PATCH 150/356] swaylock: update to 1.7.2.
---
.../fix-shm_unlink-undefined-reference.patch | 29 -------------------
srcpkgs/swaylock/template | 9 +++---
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
diff --git a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
deleted file mode 100644
index e155d7f85ca8..000000000000
--- a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d9e71c87c7af8687750901d71409140f1bd181bd Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Sun, 27 Nov 2022 18:46:05 -0500
-Subject: [PATCH] Fix build on Debian Stable
-
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ace7c933..13548b74 100644
---- a/meson.build
-+++ b/meson.build
-@@ -47,6 +47,7 @@ fish_comp = dependency('fish', required: false)
- libpam = cc.find_library('pam', required: get_option('pam'))
- crypt = cc.find_library('crypt', required: not libpam.found())
- math = cc.find_library('m')
-+rt = cc.find_library('rt')
-
- git = find_program('git', required: false)
- scdoc = find_program('scdoc', required: get_option('man-pages'))
-@@ -112,6 +113,7 @@ dependencies = [
- client_protos,
- gdk_pixbuf,
- math,
-+ rt,
- xkbcommon,
- wayland_client,
- ]
diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index 1675363faf95..0212a1fab532 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
# Template file for 'swaylock'
pkgname=swaylock
-version=1.7
+version=1.7.2
revision=1
build_style=meson
conf_files="/etc/pam.d/swaylock"
@@ -10,9 +10,10 @@ makedepends="wayland-protocols cairo-devel gdk-pixbuf-devel pam-devel
short_desc="Screen locker for Wayland"
maintainer="Derriick <derriick.ensiie@yahoo.com>"
license="MIT"
-homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaylock/archive/${version}.tar.gz"
-checksum=4c4d3c3ed838c085feb0b237b9aaaabdf66cbc05e2b034b2cb5c552957e620d6
+homepage="https://github.com/swaywm/swaylock"
+changelog="https://github.com/swaywm/swaylock/releases"
+distfiles="https://github.com/swaywm/swaylock/releases/download/v${version}/swaylock-${version}.tar.gz"
+checksum=bf965d47fb6fc1402f854d4679d21a9459713fc0f330bc607c9585db097b4304
post_install() {
vlicense LICENSE
From 1fd5858af4ae53dba6318de3fc2b2044f35c650c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:27:46 +0000
Subject: [PATCH 151/356] gspell: update to 1.12.0.
---
srcpkgs/gspell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ac19b14b08da..8023ec79544d 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
# Template file for 'gspell'
pkgname=gspell
-version=1.11.1
+version=1.12.0
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gspell"
changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292
+checksum=40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad
make_check_pre="xvfb-run"
# Package build options
From 20fbb400ad485cb2d944342ac35d92bc669fc8d0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 4 Feb 2023 15:39:39 -0600
Subject: [PATCH 152/356] python3-blessed: update to 1.20.0.
---
srcpkgs/python3-blessed/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 5558e0cd1dbe..a57a272b2128 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,7 +1,7 @@
# Template file for 'python3-blessed'
pkgname=python3-blessed
-version=1.19.1
-revision=2
+version=1.20.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-six python3-wcwidth"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/blessed"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=69d5bdd7f14ab1982c9a4b51b27ea4620625bc7d59bf96faaa4206bf5ccf3095
+checksum=2bc8cfe68b210f3eaca9095bbc0752ca98de5a8845fbc68371fe5f5cf406a63d
post_install() {
vlicense LICENSE
From d512e68a66e90682178c5726c21449262e85d884 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 4 Feb 2023 15:41:18 -0600
Subject: [PATCH 153/356] sqlmap: update to 1.7.2.
---
srcpkgs/sqlmap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 0542f944d077..2253f5922fe7 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
# Template file for 'sqlmap'
pkgname=sqlmap
-version=1.7
+version=1.7.2
revision=1
pycompile_dirs="usr/libexec/sqlmap"
depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://sqlmap.org"
distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=aa00e08007bfdb06a362a0c2798073af8e7053a97ead8ed7cca86393a94ec2e1
+checksum=58db9fb0a79332927634cdb8de6df7e62997ec85b77daef0ce733612a1d79de1
python_version=3
do_install() {
From 6fa96587a5a3d28b343fd74e5950e91b22335b63 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 26 Jan 2023 20:54:43 +0000
Subject: [PATCH 154/356] graphene: update to 1.10.8.
---
...rision-in-graphene_ray_intersect_box.patch | 12 --
...5d2280d02812669ac38e3981692b98de7c10.patch | 26 ----
...6339c70cef3ce767841385d8eb3a2a5e852f.patch | 41 ------
...5d6cd3abcf7586f32e222131849c66cc6ad8.patch | 30 -----
...25109898fa4894df810a546b26c387eaae93.patch | 112 ----------------
...dad5a3f38ddbe543ee8c236b4315bba111b9.patch | 51 -------
.../patches/fix-gcc-vector-check.patch | 25 ----
.../patches/gcc-vectors-fix-pragmas.patch | 125 ------------------
srcpkgs/graphene/template | 7 +-
9 files changed, 4 insertions(+), 425 deletions(-)
delete mode 100644 srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
delete mode 100644 srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
delete mode 100644 srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
delete mode 100644 srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
delete mode 100644 srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
delete mode 100644 srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
delete mode 100644 srcpkgs/graphene/patches/fix-gcc-vector-check.patch
delete mode 100644 srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
diff --git a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
deleted file mode 100644
index 6a2533fe7ea0..000000000000
--- a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/graphene-ray.c src/graphene-ray.c
-index 66c3393..9151300 100644
---- a/src/graphene-ray.c
-+++ b/src/graphene-ray.c
-@@ -563,7 +563,7 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
- #else
- if (ty_min > tx_min || fpclassify (tx_min) == FP_NAN)
- tx_min = ty_min;
-- if (ty_max > tx_max || fpclassify (tx_max) == FP_NAN)
-+ if (ty_max < tx_max || fpclassify (tx_max) == FP_NAN)
- tx_max = ty_max;
- #endif
diff --git a/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch b/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
deleted file mode 100644
index deea8eb3e47f..000000000000
--- a/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2aae5d2280d02812669ac38e3981692b98de7c10 Mon Sep 17 00:00:00 2001
-From: Dor Askayo <dor.askayo@gmail.com>
-Date: Sat, 3 Apr 2021 16:37:30 +0300
-Subject: [PATCH] graphene-config: Enable NEON for AArch64 on Linux
-
-NEON is fully supported by AArch64. However, GCC doesn't seem to define
-__ARM_NEON__ or _M_ARM64 for AArch64.
-
-Using __aarch64__ should allow a proper detection of this case.
----
- include/graphene-config.h.meson | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/graphene-config.h.meson b/include/graphene-config.h.meson
-index 949eee7..96192cc 100644
---- a/include/graphene-config.h.meson
-+++ b/include/graphene-config.h.meson
-@@ -19,7 +19,7 @@ extern "C" {
- #mesondefine GRAPHENE_HAS_SSE
- # endif
-
--# if defined(__ARM_NEON__) || defined (_M_ARM64)
-+# if defined(__ARM_NEON__) || defined (_M_ARM64) || defined (__aarch64__)
- #mesondefine GRAPHENE_HAS_ARM_NEON
- # endif
-
diff --git a/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch b/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
deleted file mode 100644
index 30fdb212e1c3..000000000000
--- a/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5b746339c70cef3ce767841385d8eb3a2a5e852f Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 23:14:16 +0100
-Subject: [PATCH] Avoid shadowing for nested cross/dot calls
-
----
- include/graphene-simd4f.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index ca711e5..f95fe04 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -897,19 +897,19 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_cross3(a,b) \
- (__extension__ ({ \
-- const graphene_simd4f_t __a = (a); \
-- const graphene_simd4f_t __b = (b); \
-- graphene_simd4f_init (__a[1] * __b[2] - __a[2] * __b[1], \
-- __a[2] * __b[0] - __a[0] * __b[2], \
-- __a[0] * __b[1] - __a[1] * __b[0], \
-+ const graphene_simd4f_t __cross_a = (a); \
-+ const graphene_simd4f_t __cross_b = (b); \
-+ graphene_simd4f_init (__cross_a[1] * __cross_b[2] - __cross_a[2] * __cross_b[1], \
-+ __cross_a[2] * __cross_b[0] - __cross_a[0] * __cross_b[2], \
-+ __cross_a[0] * __cross_b[1] - __cross_a[1] * __cross_b[0], \
- 0.f); \
- }))
-
- # define graphene_simd4f_dot3(a,b) \
- (__extension__ ({ \
-- const graphene_simd4f_t __a = (a); \
-- const graphene_simd4f_t __b = (b); \
-- const float __res = __a[0] * __b[0] + __a[1] * __b[1] + __a[2] * __b[2]; \
-+ const graphene_simd4f_t __dot_a = (a); \
-+ const graphene_simd4f_t __dot_b = (b); \
-+ const float __res = __dot_a[0] * __dot_b[0] + __dot_a[1] * __dot_b[1] + __dot_a[2] * __dot_b[2]; \
- graphene_simd4f_init (__res, __res, __res, __res); \
- }))
-
diff --git a/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch b/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
deleted file mode 100644
index cb29300ae653..000000000000
--- a/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 74845d6cd3abcf7586f32e222131849c66cc6ad8 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 22:58:34 +0100
-Subject: [PATCH] Fix the GCC check in graphene-config.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We want GCC ≥ 4.9 on non-ARM architectures, so we need to check for:
-
- - GCC
- - GCC ≥ 5 or GCC == 4.9
- - !ARM
----
- include/graphene-config.h.meson | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/graphene-config.h.meson b/include/graphene-config.h.meson
-index ab72d53..949eee7 100644
---- a/include/graphene-config.h.meson
-+++ b/include/graphene-config.h.meson
-@@ -23,7 +23,7 @@ extern "C" {
- #mesondefine GRAPHENE_HAS_ARM_NEON
- # endif
-
--# if defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 9) && !defined(__arm__)
-+# if defined(__GNUC__) && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && !defined(__arm__)
- #mesondefine GRAPHENE_HAS_GCC
- # endif
-
diff --git a/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch b/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
deleted file mode 100644
index db2e2ecc7de3..000000000000
--- a/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 8e5c25109898fa4894df810a546b26c387eaae93 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 23:13:06 +0100
-Subject: [PATCH] Ignore float equality checks
-
-There is a well-defined representation for 0 with single precision
-floating point values, so we can disable the float-equal warning.
----
- include/graphene-simd4f.h | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index 55a1b5b..ca711e5 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -856,12 +856,15 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_reciprocal(v) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / (v)[0] : 0.f, \
- (v)[1] != 0.f ? 1.f / (v)[1] : 0.f, \
- (v)[2] != 0.f ? 1.f / (v)[2] : 0.f, \
- (v)[3] != 0.f ? 1.f / (v)[3] : 0.f, \
- }; \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_sqrt(v) \
-@@ -876,12 +879,15 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_rsqrt(v) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / sqrtf ((v)[0]) : 0.f, \
- (v)[1] != 0.f ? 1.f / sqrtf ((v)[1]) : 0.f, \
- (v)[2] != 0.f ? 1.f / sqrtf ((v)[2]) : 0.f, \
- (v)[3] != 0.f ? 1.f / sqrtf ((v)[3]) : 0.f, \
- }; \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_add(a,b) (__extension__ ({ (graphene_simd4f_t) ((a) + (b)); }))
-@@ -994,49 +1000,64 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_cmp_eq(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) == (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_neq(a,b) (!graphene_simd4f_cmp_eq (a,b))
-
- # define graphene_simd4f_cmp_lt(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) < (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_le(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) <= (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_ge(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) >= (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_gt(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) > (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_neg(s) \
diff --git a/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch b/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
deleted file mode 100644
index 124448fb7c68..000000000000
--- a/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fbfbdad5a3f38ddbe543ee8c236b4315bba111b9 Mon Sep 17 00:00:00 2001
-From: Dor Askayo <dor.askayo@gmail.com>
-Date: Sat, 3 Apr 2021 16:40:30 +0300
-Subject: [PATCH] meson: Fix detection of AArch64 on Linux
-
-Neither __ARM_EABI__ nor __ARM_NEON__ are defined by GCC for AArch64,
-and -mfpu=neon is not required as NEON is always supported in AArch64.
----
- meson.build | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index c96aded..86d8eb8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -10,6 +10,7 @@ project('graphene', 'c',
-
- cc = meson.get_compiler('c')
- host_system = host_machine.system()
-+host_cpu_family = host_machine.cpu_family()
-
- add_project_arguments([ '-D_GNU_SOURCE' ], language: 'c')
-
-@@ -352,11 +353,13 @@ neon_cflags = []
- if get_option('arm_neon')
- neon_prog = '''
- #if !defined (_MSC_VER) || defined (__clang__)
--# ifndef __ARM_EABI__
--# error "EABI is required (to be sure that calling conventions are compatible)"
--# endif
--# ifndef __ARM_NEON__
--# error "No ARM NEON instructions available"
-+# if !defined (_M_ARM64) && !defined (__aarch64__)
-+# ifndef __ARM_EABI__
-+# error "EABI is required (to be sure that calling conventions are compatible)"
-+# endif
-+# ifndef __ARM_NEON__
-+# error "No ARM NEON instructions available"
-+# endif
- # endif
- #endif
- #include <arm_neon.h>
-@@ -376,7 +379,7 @@ int main () {
-
- test_neon_cflags = []
-
-- if cc.get_id() != 'msvc'
-+ if cc.get_id() != 'msvc' and host_cpu_family != 'aarch64'
- test_neon_cflags += ['-mfpu=neon']
- endif
-
diff --git a/srcpkgs/graphene/patches/fix-gcc-vector-check.patch b/srcpkgs/graphene/patches/fix-gcc-vector-check.patch
deleted file mode 100644
index 26e805641ce0..000000000000
--- a/srcpkgs/graphene/patches/fix-gcc-vector-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2da1217742648496c44dff86fd0b477d40d9b067 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Jun 2021 15:47:14 +0200
-Subject: [PATCH] fix gcc vector 64-bit check
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0ef4f5a..669773f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -311,7 +311,7 @@ if get_option('gcc_vector')
- # error "GCC vector intrinsics are disabled on GCC prior to 4.9"
- # elif defined(__arm__)
- # error "GCC vector intrinsics are disabled on ARM"
--# elif !defined(__x86_64__)
-+# elif (__SIZEOF_POINTER__ < 8)
- # error "GCC vector intrinsics are disabled on 32bit"
- # endif
- #else
---
-2.31.1
-
diff --git a/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch b/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
deleted file mode 100644
index 6d9b92872083..000000000000
--- a/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 2756f97c802d6c461cab2a865a98a09504410083 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 5 Sep 2021 15:21:39 +0200
-Subject: [PATCH] Fix various broken macros when using GCC extension vectors
-
-Commit 8e5c25109898fa4894df810a546b26c387eaae93 introduced
-some pragmas, however those unintentionally change the types
-of the macros, as the diagnostic pop pragma becomes the last
-statement and the type of the expression becomes void.
-
-Work around this by using a temporary and evaluating to that
-before popping.
----
- include/graphene-simd4f.h | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index f95fe04..ea29ba3 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -858,13 +858,14 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- (__extension__ ({ \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
-- (graphene_simd4f_t) { \
-+ const graphene_simd4f_t __val = (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / (v)[0] : 0.f, \
- (v)[1] != 0.f ? 1.f / (v)[1] : 0.f, \
- (v)[2] != 0.f ? 1.f / (v)[2] : 0.f, \
- (v)[3] != 0.f ? 1.f / (v)[3] : 0.f, \
- }; \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_sqrt(v) \
-@@ -881,13 +882,14 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- (__extension__ ({ \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
-- (graphene_simd4f_t) { \
-+ const graphene_simd4f_t __val = (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / sqrtf ((v)[0]) : 0.f, \
- (v)[1] != 0.f ? 1.f / sqrtf ((v)[1]) : 0.f, \
- (v)[2] != 0.f ? 1.f / sqrtf ((v)[2]) : 0.f, \
- (v)[3] != 0.f ? 1.f / sqrtf ((v)[3]) : 0.f, \
- }; \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_add(a,b) (__extension__ ({ (graphene_simd4f_t) ((a) + (b)); }))
-@@ -1003,11 +1005,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) == (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_neq(a,b) (!graphene_simd4f_cmp_eq (a,b))
-@@ -1017,11 +1020,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) < (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_le(a,b) \
-@@ -1029,11 +1033,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) <= (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_ge(a,b) \
-@@ -1041,11 +1046,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) >= (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_gt(a,b) \
-@@ -1053,11 +1059,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) > (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_neg(s) \
---
-2.32.0
-
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 6be39623eeae..f0c41f527d86 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,7 +1,7 @@
# Template file for 'graphene'
pkgname=graphene
-version=1.10.6
-revision=3
+version=1.10.8
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dinstalled_tests=false
@@ -12,8 +12,9 @@ short_desc="Thin layer of types for graphic libraries"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://github.com/ebassi/graphene"
+changelog="https://github.com/ebassi/graphene/releases"
distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
-checksum=80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25
+checksum=a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" -Dsse2=true" ;;
From 4ec07d3793f805cb1bb3d33b6cb1a82831e1654c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 19:55:26 +0000
Subject: [PATCH 155/356] double-conversion: update to 3.2.1.
---
srcpkgs/double-conversion/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template
index 8386838c0755..6f05d58cf9a4 100644
--- a/srcpkgs/double-conversion/template
+++ b/srcpkgs/double-conversion/template
@@ -1,16 +1,20 @@
# Template file for 'double-conversion'
pkgname=double-conversion
-version=3.1.5
+version=3.2.1
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON"
+configure_args="-DBUILD_SHARED_LIBS=ON"
short_desc="Efficient binary-decimal and decimal-binary routines for IEEE doubles"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/google/double-conversion"
-changelog="https://raw.githubusercontent.com/google/double-conversion/master/Changelog"
+changelog="https://github.com/google/double-conversion/releases"
distfiles="https://github.com/google/double-conversion/archive/v${version}.tar.gz"
-checksum=a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13
+checksum=e40d236343cad807e83d192265f139481c51fc83a1c49e406ac6ce0a0ba7cd35
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTING=ON"
+fi
post_install() {
vlicense LICENSE
From d1657a39464c2449aec82c364bef444cf8b07b11 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:57:42 +0000
Subject: [PATCH 156/356] StyLua: update to 0.16.0.
---
srcpkgs/StyLua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index 153647da60a8..234a9ff7bfd2 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
# Template file for 'StyLua'
pkgname=StyLua
-version=0.15.3
+version=0.16.0
revision=1
build_style=cargo
configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if lua53 '--features lua53')
@@ -11,7 +11,7 @@ license="MPL-2.0"
homepage="https://github.com/JohnnyMorganz/StyLua"
changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/main/CHANGELOG.md"
distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=37feff9a52c2355419cb5dabdc6dac15f6fbef7d91b7cd9f33bd593efe278306
+checksum=a42305c175e44c87f4d3c210e7b89d499d81053b48f4aa05bde841a3702ef07a
build_options="lua52 lua53 lua54 luau"
build_options_default="lua52 lua53 lua54 luau"
From e8dae15c5819d9863348a4cbe6246e82a6ad8005 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:18:23 +0000
Subject: [PATCH 157/356] dialog: update to 1.3.20221229.
---
srcpkgs/dialog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 94c275c2d0a3..a75d023f61fc 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
# Template file for 'dialog'
pkgname=dialog
-version=1.3.20220728
+version=1.3.20221229
revision=1
_distver=${version%.*}
_date=${version##*.}
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
-distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=54418973d559a461b00695fafe68df62f2bc73d506b436821d77ca3df454190b
+distfiles="https://invisible-mirror.net/archives/dialog/dialog-${_distver}-${_date}.tgz"
+checksum=d5663d016003e5260fa485f5e9c2ddffb386508f3bd0687d4fa3635ea9942b8e
post_install() {
rm -r ${DESTDIR}/usr/lib
From 0032dc89f9d135d11bcd4396046fc2a5744cb8c9 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Wed, 1 Feb 2023 19:47:52 -0600
Subject: [PATCH 158/356] Signal-Desktop: update to 6.4.1.
Closes: #42023 [via git-merge-pr]
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 26cfc3892ea1..c7389f4ed0e2 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=6.3.0
+version=6.4.1
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension
@@ -13,7 +13,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=07c71bd31157873d5d1f57830a636fe61ad551bacf4a87a4f13336f16e524a1a
+checksum=899af104afe358413ebba2971ddb273ee788f7ffad9fdf96ece30e527eda3475
nostrip_files="signal-desktop"
post_extract() {
From a1bd280382da03f54b4869c5cc90a6f73acf82b0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:30:32 +0000
Subject: [PATCH 159/356] babl: update to 0.1.98.
---
srcpkgs/babl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index c220d2ccbdf1..38b773c933aa 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,6 +1,6 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.96
+version=0.1.98
revision=1
build_style=meson
build_helper=gir
@@ -13,7 +13,7 @@ license="LGPL-3.0-only"
homepage="https://gegl.org/babl/"
changelog="https://gitlab.gnome.org/GNOME/babl/-/raw/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6
+checksum=f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1
case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
From 82655829dc7211800314224941280a7f06641d5d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 18 Jan 2023 22:28:40 +0530
Subject: [PATCH 160/356] python3-gnupg: update to 0.5.0.
Fix update reporting.
---
srcpkgs/python3-gnupg/template | 8 ++++----
srcpkgs/python3-gnupg/update | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index 2870ab8f1489..597b6888818b 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'python3-gnupg'
pkgname=python3-gnupg
-version=0.4.9
-revision=2
+version=0.5.0
+revision=1
build_style=python3-pep517
make_install_target="dist/python_gnupg-${version}-py2.py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
@@ -11,8 +11,8 @@ short_desc="Python3 wrapper for GnuPG"
maintainer="Lon Willett <xgit@lonw.net>"
license="BSD-3-Clause"
homepage="https://github.com/vsajip/python-gnupg"
-distfiles="${PYPI_SITE}/p/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
-checksum=aaa748795572591aaf127b4ac8985684f3673ff82b39f370c836b006e68fc537
+distfiles="${PYPI_SITE}/p/python-gnupg/python-gnupg-${version}.tar.gz"
+checksum=70758e387fc0e0c4badbcb394f61acbe68b34970a8fed7e0f7c89469fe17912a
make_check_pre="env NO_EXTERNAL_TESTS=1"
post_install() {
diff --git a/srcpkgs/python3-gnupg/update b/srcpkgs/python3-gnupg/update
index 9d5cdc2a6805..1b0e270aa10c 100644
--- a/srcpkgs/python3-gnupg/update
+++ b/srcpkgs/python3-gnupg/update
@@ -1 +1,2 @@
-site="https://pypi.org/project/python-gnupg/"
+pkgname=python-gnupg
+site="https://pypi.org/simple/python-gnupg/"
From 5af1bd0e1c40d1575b10f29e640c9464c5e9be17 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 11:09:38 +0530
Subject: [PATCH 161/356] pre-commit: update to 3.0.4.
---
srcpkgs/pre-commit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index cd5e57b190f6..3a51b303c132 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
# Template file for 'pre-commit'
pkgname=pre-commit
-version=2.21.0
+version=3.0.4
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://pre-commit.com/"
changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658
+checksum=bc4687478d55578c4ac37272fe96df66f73d9b5cf81be6f28627d4e712e752d5
make_check=no # unpackaged: pytest-env re-assert
post_install() {
From e660bea85ac0813eebb91d9a77cad7f0711e0146 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 7 Dec 2022 20:03:26 +0530
Subject: [PATCH 162/356] New package: lswt-1.0.4
---
srcpkgs/lswt/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/lswt/template
diff --git a/srcpkgs/lswt/template b/srcpkgs/lswt/template
new file mode 100644
index 000000000000..8e06d8d6eb20
--- /dev/null
+++ b/srcpkgs/lswt/template
@@ -0,0 +1,13 @@
+# Template file for 'lswt'
+pkgname=lswt
+version=1.0.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="List Wayland toplevels"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~leon_plickat/lswt"
+distfiles="https://git.sr.ht/~leon_plickat/lswt/archive/v${version}.tar.gz"
+checksum=a1a422d996e9dbfa2d07daf5588ede280157ab0d0cc7e918d7c16999f4e14b5f
From 8c64080e826dd3db20b3daa054758fdd9cd437fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 01:47:22 +0530
Subject: [PATCH 163/356] hstr: update to 2.6.
---
srcpkgs/hstr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index 3f2d95c854ec..8babb38010e6 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
# Template file for 'hstr'
pkgname=hstr
-version=2.5
+version=2.6
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
@@ -10,8 +10,8 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="Apache-2.0"
homepage="https://github.com/dvorka/hstr"
changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
-distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
-checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4
+distfiles="https://github.com/dvorka/hstr/archive/refs/tags/${version}.tar.gz"
+checksum=085f8a087481bcdf33e75e2fa5aaa9289931782c0bee2db3e02425b9a7d83cdf
pre_configure() {
vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h
From bf83c8de3125dfb53a9a2112a2b5e0501226e619 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 01:26:17 +0530
Subject: [PATCH 164/356] dust: update to 0.8.4.
---
srcpkgs/dust/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 4dcdc139c197..0e158125ba18 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,19 +1,21 @@
# Template file for 'dust'
pkgname=dust
-version=0.8.3
+version=0.8.4
revision=1
build_style=cargo
short_desc="More intuitive version of du"
maintainer="Neel <neel@chot.ai>"
license="Apache-2.0"
homepage="https://github.com/bootandy/dust"
-distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=1e07203546274276503a4510adcf5dc6eacd5d1e20604fcd55a353b3b63c1213
+distfiles="https://github.com/bootandy/dust/archive/refs/tags/v${version}.tar.gz"
+checksum=611f2da80ef5b1d4423bcda159a65e9436692357b686b91b1dd8245a76eed589
post_install() {
vcompletion completions/dust.bash bash
vcompletion completions/dust.fish fish
vcompletion completions/_dust zsh
+
vsconf config/config.toml
+ vman man-page/dust.1
vdoc README.md
}
From 6f2e6cf900decde43ab72505736191ad2e7639d4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 1 Feb 2023 21:13:52 +0530
Subject: [PATCH 165/356] lazygit: update to 0.37.0.
Adopt.
---
srcpkgs/lazygit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 676982b83a21..1699dab785f4 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,17 +1,17 @@
# Template file for 'lazygit'
pkgname=lazygit
-version=0.36.0
+version=0.37.0
revision=1
build_style=go
go_import_path=github.com/jesseduffield/lazygit
go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
depends="git"
short_desc="Simple terminal UI for git commands"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jesseduffield/lazygit"
-distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=0b8630b09e28dc478fb2545c6fbe52e679b9a2e5dbe569982c9649655ab969c3
+distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
+checksum=8545f3cffe110de80c88859cd11b42eaccb71f4c239c5bc2bff841f623438296
post_install() {
vlicense LICENSE
From dea47b4b934f751e51caec169a78b1bcc96292c8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 29 Jan 2023 11:49:51 +0530
Subject: [PATCH 166/356] gallery-dl: update to 1.24.5.
---
srcpkgs/gallery-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 58858eda0ea8..732c460892b5 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
# Template file for 'gallery-dl'
pkgname=gallery-dl
-version=1.24.4
+version=1.24.5
revision=1
build_style=python3-module
make_check_args="--ignore test/test_results.py"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
homepage="https://github.com/mikf/gallery-dl"
changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
distfiles="https://github.com/mikf/gallery-dl/archive/refs/tags/v${version}.tar.gz"
-checksum=0ee58567b1241a4577cdc2ea177bc46ff8da494a74e6430059e5d0c214ae222a
+checksum=a1feccc0ae74c00a96f068fb079eadaa808e53bc6a028d3774940c473758b462
pre_build() {
make man completion
From 3fb93f72303308b54a09017da46721dc876d7d79 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 00:42:53 +0530
Subject: [PATCH 167/356] python3-zipp: update to 3.12.0.
---
srcpkgs/python3-zipp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template
index 63c2208061c0..f83b9ef5b74c 100644
--- a/srcpkgs/python3-zipp/template
+++ b/srcpkgs/python3-zipp/template
@@ -1,6 +1,6 @@
# Template file for 'python3-zipp'
pkgname=python3-zipp
-version=3.11.0
+version=3.12.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://pypi.org/project/zipp/"
changelog="https://raw.githubusercontent.com/jaraco/zipp/main/CHANGES.rst"
distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766
+checksum=73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb
post_install() {
vlicense LICENSE
From fa78ce37e46fd7cf73bd0b16e4bee4d55c8b2fc0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 25 Oct 2022 01:25:06 +0530
Subject: [PATCH 168/356] python3-mypy: update to 0.991.
---
srcpkgs/python3-mypy/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 55c2e21b5418..78e082164446 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,18 +1,22 @@
# Template file for 'python3-mypy'
pkgname=python3-mypy
-version=0.961
-revision=2
+version=0.991
+revision=1
build_style=python3-module
+# fails in ci
+make_check_args="-k not(testDaemonStatusKillRestartRecheck)"
+make_check_target="mypy/test"
hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-mypy_extensions python3-typed-ast python3-typing_extensions
- python3-tomli"
+depends="python3-mypy_extensions python3-typing_extensions"
+checkdepends="${depends} python3-attrs python3-filelock
+ python3-lxml python3-psutil python3-py python3-pytest-xdist"
short_desc="Optional static typing for Python3"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
-homepage="https://github.com/python/mypy"
+homepage="https://www.mypy-lang.org"
+changelog="https://mypy-lang.blogspot.com"
distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=f730d56cb924d371c26b8eaddeea3cc07d78ff51c521c6d04899ac6904b75492
-make_check=no # needs pytest-xdist and many tests fail
+checksum=3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06
post_install() {
make -C docs man
From 265960fc07b138a745e22aef63def0b7bcc8ffae Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 19 Jan 2023 22:43:31 +0530
Subject: [PATCH 169/356] pex: update to 2.1.121.
Adopt.
---
srcpkgs/pex/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index cde6e6fc2f34..479a8255e5cf 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,17 +1,17 @@
# Template file for 'pex'
pkgname=pex
-version=2.1.103
-revision=2
+version=2.1.121
+revision=1
build_style=python3-pep517
hostmakedepends="python3-flit_core python3-Sphinx"
depends="python3"
short_desc="Library & tool for generating .pex (Python EXecutable) files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="Apache-2.0"
homepage="https://github.com/pantsbuild/pex"
changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.rst"
distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=07bcd633626b7fd6d18eb0d6303acfd0a4fbcb31692e737b15794626da896bf0
+checksum=d66c099d48bf2b00d06be01518c834df888c195c3e17a524cf12f83226fa2489
post_build() {
PYTHONPATH="$PWD" make -C docs man
From d079e5ba860446265a37296093fec312e62cbc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 Feb 2023 00:41:58 +0700
Subject: [PATCH 170/356] fragments: depends on transmission
Fix: #42068
---
srcpkgs/fragments/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index f26e0aa4585e..135e4905b99f 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,13 +1,14 @@
# Template file for 'fragments'
pkgname=fragments
version=2.1
-revision=1
+revision=2
build_style=meson
build_helper="rust"
hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
gtk4-update-icon-cache"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
+depends="transmission"
short_desc="BitTorrent Client"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
From e00e2f64e938c942bc828422d6600d7f4801210d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 3 Feb 2023 23:42:28 +0100
Subject: [PATCH 171/356] neovim: update to 0.8.3
---
srcpkgs/neovim/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 2cd7bafd0dd3..9c7a73bf6fb2 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
-version=0.8.2
-revision=3
+version=0.8.3
+revision=1
build_style=cmake
build_helper="qemu"
# MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3
@@ -16,7 +16,7 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
license="Apache-2.0, Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
-checksum=c516c8db73e1b12917a6b2e991b344d0914c057cef8266bce61a2100a28ffcc9
+checksum=adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1
build_options=luajit
From 442309c0b1a2931d6f016af68d6042d3c2ec8301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 23:49:08 +0700
Subject: [PATCH 172/356] virtualbox-ose: update to 7.0.6.
Fix: #41681
---
srcpkgs/virtualbox-ose/template | 45 ++++++++++++++++++---------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 679dac249a25..4efc26f7da06 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.4
+version=7.0.6
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,20 +8,21 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17
+checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
nopie=yes
lib32disabled=yes
archs="x86_64"
hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
- qt6-base"
+ vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-base-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel qt6-qt5compat-devel libtpms-devel
- qt6-scxml-devel qt6-tools-devel SDL2-devel SDL2_ttf-devel SDL2_gfx-devel
- SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel liblvm2app-devel
+ libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -43,7 +44,8 @@ do_build() {
-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
source ./env.sh
- kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+ kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
+ # kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
}
do_install() {
@@ -54,15 +56,20 @@ do_install() {
# virtualbox-ose.
#
cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
- mkdir -p ${DESTDIR}/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
- install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox
+ vmkdir usr/lib/virtualbox
+ vmkdir usr/share/virtualbox
+ vbin VBox.sh VBox
for f in VirtualBox VBoxManage VBoxHeadless \
VBoxBalloonCtrl vboxwebsrv; do
ln -sf VBox ${DESTDIR}/usr/bin/${f}
done
+
# components
- install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components
+ vcopy components usr/lib/virtualbox
+ vcopy dtrace usr/lib/virtualbox
+ vcopy ExtensionPacks usr/lib/virtualbox
+ vcopy tools usr/lib/virtualbox
# libs
install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox
@@ -73,24 +80,23 @@ do_install() {
VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
+ VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
+ VBoxVolInfo xpidl \
VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
- install -m0755 nls/*.qm -t ${DESTDIR}/usr/share/virtualbox/nls
+ vcopy nls usr/share/virtualbox
# scripts
install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh \
-t ${DESTDIR}/usr/share/virtualbox
# icons and desktop
- install -D -m0644 VBox.png ${DESTDIR}/usr/share/pixmaps/VBox.png
- install -D -m0644 virtualbox.desktop \
- ${DESTDIR}/usr/share/applications/virtualbox.desktop
- sed -i -e "s|Icon=VBox|Icon=VBox.png|" \
- ${DESTDIR}/usr/share/applications/virtualbox.desktop
- install -Dm644 virtualbox.xml \
- ${DESTDIR}/usr/share/mime/packages/virtualbox.xml
+ vinstall VBox.png 644 usr/share/pixmaps/
+ sed -i -e "s|Icon=VBox|Icon=VBox.png|" virtualbox.desktop
+ vinstall virtualbox.desktop 644 usr/share/applications/
+ vinstall virtualbox.xml 644 usr/share/mime/packages/
install -d ${DESTDIR}/usr/share/icons/hicolor
for i in icons/*; do
ldir=$(basename ${i})
@@ -102,7 +108,6 @@ do_install() {
mkdir -p ${DESTDIR}/etc/vbox
echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${DESTDIR}/etc/vbox/vbox.cfg
- cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
install -d ${DESTDIR}/usr/share/licenses/${pkgname}
install -m0644 ${wrksrc}/COPYING* \
${DESTDIR}/usr/share/licenses/${pkgname}
From 3c1fc884455ae2fd344e64cb04c956ffc01452e4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:36:25 +0000
Subject: [PATCH 173/356] libwacom: update to 2.6.0, adopt.
---
common/shlibs | 2 +-
srcpkgs/libwacom/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index af1fd992b5da..135087319da4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1043,7 +1043,7 @@ libgck-2.so.0.0.0 gcr4-4.0.0_1
libgcr-4.so.0.0.0 gcr4-4.0.0_1
libcld2.so cld2-0.0.1.20150821_1
libcld2_full.so cld2-full-0.0.1.20150821_1
-libwacom.so.2 libwacom-0.3_1
+libwacom.so.9 libwacom-2.6.0_1
libfarstream-0.2.so.5 farstream-0.2.7_1
libass.so.9 libass-0.13.6_1
libcryptui.so.0 libcryptui-3.4.0_1
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 248a33d407ac..8216a58a086d 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
# Template file for 'libwacom'
pkgname=libwacom
-version=1.12
+version=2.6.0
revision=1
build_style=meson
build_helper="qemu"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
makedepends="libgudev-devel libxml2-devel"
checkdepends="python3-pytest python3-libevdev python3-pyudev"
short_desc="Library to identify wacom tablets"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
license="MIT"
homepage="https://github.com/linuxwacom/libwacom"
changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
-distfiles="https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=290450d604f78bbd956eddb69f79f8d56f8ed1a5ccbb5e88e22fa84fa2fceb4f
+distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
+checksum=2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f
if [ -z "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -Dtests=disabled"
From b35db2342812e97cd21211b2abf54840795fd30b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 174/356] budgie-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 11c9080925f0..37736255e165 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From 1af95be3521c15202340e030479b4a5f357c6347 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 175/356] cinnamon-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/cinnamon-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index e1428a97c61e..db1e4ea6d7ba 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=5.4.7
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel
From e7d693ca992d32cffb4f20efc24f5362afba927f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 176/356] gnome-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/gnome-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index af6728cd45a1..849763d23c1e 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=43.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
From faebd0eb23f41574d8edc31520ba8d8a861dc6f3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 177/356] gnome-settings-daemon: revbump for libwacom-2.6.0.
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index f22bdbdb61f4..3d3cf393f960 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=43.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From 805632865287d15a82dd21aa18df45991cc92353 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 178/356] libinput: revbump for libwacom-2.6.0.
---
srcpkgs/libinput/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index d429098fa2fc..d5b88caeee0b 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,7 +1,7 @@
# Template file for 'libinput'
pkgname=libinput
version=1.22.0
-revision=1
+revision=2
build_style=meson
configure_args="-Db_ndebug=false -Ddebug-gui=false"
hostmakedepends="pkg-config"
From 6f4b23e2ff2951753f8706efa873d2e1c791dd6c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 179/356] muffin: revbump for libwacom-2.6.0.
---
srcpkgs/muffin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 9383775a47f4..6c30d4452451 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,7 +1,7 @@
# Template file for 'muffin'
pkgname=muffin
version=5.4.5
-revision=1
+revision=2
build_style=meson
build_helper=gir
# -Dtests requires -Dwayland, which is explicitly disabled
From f98ea18135dbbdfe6f91462ae74ee94caef406f0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:49 +0000
Subject: [PATCH 180/356] mutter: revbump for libwacom-2.6.0.
---
srcpkgs/mutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4adf8a458957..c84c35f12b26 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
version=43.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
From 54f97764ed81ef7b071f01216aedd1a4f387b2f7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Feb 2023 20:46:43 +0000
Subject: [PATCH 181/356] kcm-wacomtablet: revbump for libwacom-2.6.0.
---
srcpkgs/kcm-wacomtablet/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..dbb0cd51818c 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,12 +1,13 @@
# Template file for 'kcm-wacomtablet'
pkgname=kcm-wacomtablet
version=3.2.0
-revision=2
+revision=3
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="pkg-config gettext extra-cmake-modules qt5-qmake qt5-host-tools
- kdoctools kcoreaddons"
+ kdoctools kcoreaddons kpackage"
makedepends="qt5-devel qt5-x11extras-devel qt5-declarative-devel
- plasma-workspace-devel libwacom-devel xf86-input-wacom-devel"
+ plasma-workspace-devel libwacom-devel xf86-input-wacom-devel libinput-devel"
depends="xf86-input-wacom"
short_desc="GUI for the Wacom Linux Drivers"
maintainer="Piraty <mail@piraty.dev>"
@@ -14,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://invent.kde.org/system/wacomtablet"
distfiles="${KDE_SITE}/wacomtablet/${version}/wacomtablet-${version}.tar.xz"
checksum=c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
+make_check=no # FIXME
From 4a1a00c02c2e37d83fb92bfb134bc6985886face Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:58 +0700
Subject: [PATCH 182/356] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 4 ++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 135087319da4..59444164928b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,8 @@ libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
-libpinyin.so.13 libpinyin-2.2.1_1
-libzhuyin.so.13 libzhuyin-2.6.0_3
+libpinyin.so.15 libpinyin-2.8.1_1
+libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.0.0 uhd-4.0.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 31811cac10f6..db04ef0264e1 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,7 +1,7 @@
# Template file for 'libpinyin'
pkgname=libpinyin
-version=2.6.0
-revision=3
+version=2.8.1
+revision=1
build_style=gnu-configure
configure_args="--enable-libzhuyin"
hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
@@ -14,7 +14,7 @@ homepage="https://github.com/libpinyin/libpinyin"
changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"
distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz
http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz"
-checksum="2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
+checksum="42c4f899f71fc26bcc57bb1e2a9309c2733212bb241a0008ba3c9b5ebd951443
56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b"
nocross="Requires data generators compiled against target system"
skip_extraction="model19.text.tar.gz"
@@ -53,7 +53,7 @@ libpinyin-utils_package() {
libpinyin-common-devel_package() {
short_desc="Common files for libpinyin and libzhuyin"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/novel*"
+ vmove "usr/include/libpinyin-${version}/novel*"
}
}
@@ -62,7 +62,7 @@ libpinyin-devel_package() {
libpinyin-common-devel-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/pinyin*"
+ vmove "usr/include/libpinyin-${version}/pinyin*"
vmove usr/lib/pkgconfig/libpinyin.pc
vmove "usr/lib/libpinyin.so"
vmove "usr/lib/libpinyin.a"
@@ -74,7 +74,7 @@ libzhuyin-devel_package() {
libpinyin-devel-${version}_${revision}"
short_desc="${short_desc/PinYin/ZhuYin} - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+ vmove "usr/include/libpinyin-${version}/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From bd785e955307f9bc6e3a02a09a43dd0c5961b88c Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:59 +0700
Subject: [PATCH 183/356] ibus-libpinyin: update to 1.15.0.
ibus-libpinyin: update to 1.15.0
---
srcpkgs/ibus-libpinyin/patches/python-3.11.patch | 12 ------------
srcpkgs/ibus-libpinyin/template | 8 ++++----
2 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/ibus-libpinyin/patches/python-3.11.patch
diff --git a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch b/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
deleted file mode 100644
index 73739950b7f0..000000000000
--- a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ibus-libpinyin-1.12.0/setup/main2.py
-===================================================================
---- ibus-libpinyin-1.12.0.orig/setup/main2.py
-+++ ibus-libpinyin-1.12.0/setup/main2.py
-@@ -63,7 +63,6 @@ except AttributeError:
- pass
-
- gettext.bindtextdomain(DOMAINNAME, localedir)
--gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8')
-
- gettext.install(DOMAINNAME, localedir)
-
diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index d2a884fdb6c8..7bd0d73a2b38 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -1,7 +1,7 @@
# Template file for 'ibus-libpinyin'
pkgname=ibus-libpinyin
-version=1.12.0
-revision=2
+version=1.15.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
automake gnome-common which"
@@ -10,8 +10,8 @@ short_desc="Intelligent Pinyin engine using libpinyin for IBus"
maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/libpinyin/ibus-libpinyin"
-distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-checksum=1fe023d3416f1be6284e23fd977cae58e3e5eddbc5582e6e8aa7bb82b3751ddd
+distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/refs/tags/${version}.tar.gz"
+checksum=94ece1a2c0f04a0762228a1a0179d5c6b3d26c150a0d61260123052722c95f17
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 6f45167faf4b9d0b7f493a131664baedaa8a3e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 184/356] fcitx-libpinyin: rebuild for libpinyin-2.8.1
---
srcpkgs/fcitx-libpinyin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template
index 5cb3d78d6ca7..1921145d1298 100644
--- a/srcpkgs/fcitx-libpinyin/template
+++ b/srcpkgs/fcitx-libpinyin/template
@@ -2,7 +2,7 @@
pkgname=fcitx-libpinyin
_mversion=20161206
version=0.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF"
hostmakedepends="pkg-config fcitx libpinyin gettext"
From d4aea83ae5e1e63186e13b80c93692efca3a7183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 185/356] fcitx5-zhuyin: rebuild for libpinyin-2.8.1
---
srcpkgs/fcitx5-zhuyin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
index a5fd46aa614b..eb5695dff280 100644
--- a/srcpkgs/fcitx5-zhuyin/template
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-zhuyin'
pkgname=fcitx5-zhuyin
version=5.0.11
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
From 50cf341b6019426525aca353ef0f188207bb7c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 Feb 2023 08:51:13 +0700
Subject: [PATCH 186/356] python3-phx-class-registry: update to 4.0.5.
---
.../patches/test-entrypoint.patch | 13 -------------
srcpkgs/python3-phx-class-registry/template | 10 +++++-----
2 files changed, 5 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
diff --git a/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch b/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
deleted file mode 100644
index 4bfe21c99c1e..000000000000
--- a/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/phx_class_registry.egg-info/SOURCES.txt
-+++ b/phx_class_registry.egg-info/SOURCES.txt
-@@ -13,9 +13,3 @@ phx_class_registry.egg-info/SOURCES.txt
- phx_class_registry.egg-info/dependency_links.txt
- phx_class_registry.egg-info/requires.txt
- phx_class_registry.egg-info/top_level.txt
--test/__init__.py
--test/auto_register_test.py
--test/cache_test.py
--test/entry_points_test.py
--test/patcher_test.py
--test/registry_test.py
-\ No newline at end of file
diff --git a/srcpkgs/python3-phx-class-registry/template b/srcpkgs/python3-phx-class-registry/template
index e45d5060f6be..de6dffb4f2ac 100644
--- a/srcpkgs/python3-phx-class-registry/template
+++ b/srcpkgs/python3-phx-class-registry/template
@@ -1,17 +1,17 @@
# Template file for 'python3-phx-class-registry'
pkgname=python3-phx-class-registry
-version=3.0.5
-revision=2
+version=4.0.5
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
depends="python3"
checkdepends="python3-pytest"
short_desc="Registry pattern for Python classes"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://class-registry.readthedocs.io/"
-distfiles="${PYPI_SITE}/p/phx-class-registry/phx-class-registry-3.0.5.tar.gz"
-checksum=f11462ac410a8cda38c2b6a83b51a2390c7d9528baef591cb5b551b11aba2a92
+distfiles="${PYPI_SITE}/p/phx-class-registry/phx-class-registry-${version}.tar.gz"
+checksum=1901bdaea34d9cfefa4d149b2f20217e7e024492f7e247797e7c4d36d96cdb5b
post_extract() {
# Requires dummy_package.egg-info
From 453a0519f0eebf5f3e10be68371893b7cecba464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 30 Jan 2023 22:55:37 -0500
Subject: [PATCH 187/356] python3-shapely: update to 2.0.1.
---
srcpkgs/python3-shapely/template | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index d9dabb1e066f..02447337f9ae 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,31 +1,36 @@
# Template file for 'python3-shapely'
pkgname=python3-shapely
-version=1.8.5.post1
+version=2.0.1
revision=1
build_style=python3-module
build_helper=numpy
-make_check_target=tests
hostmakedepends="python3-setuptools python3-Cython geos"
makedepends="python3-devel python3-numpy geos-devel"
depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
short_desc="Library for manipulation and analysis of geometric objects for Python3"
maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/shapely/shapely"
distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
-checksum=51badb76fa13ce1d4d6e5b2cbfef2b6af0ddae56a4449b84c3f3e6f404c6b43c
+checksum=6250e79ca299222a239ce44df613d228f1216c5cc31351217bf377b03d7be4e0
pre_configure() {
if [ "$CROSS_BUILD" ]; then
- sed "
- /^prefix=/s,=.*,=$XBPS_CROSS_BASE/usr,
- s,echo [\$]{prefix}$,echo /usr,
- " $XBPS_CROSS_BASE/usr/bin/geos-config >$XBPS_WRAPPERDIR/geos-config
- chmod +x $XBPS_WRAPPERDIR/geos-config
+ local _wrapper="${XBPS_WRAPPERDIR}/geos-config"
+
+ sed -e 's,echo [$]{prefix}$,echo /usr,' \
+ -e "/^prefix=/s,=.*,=\"${XBPS_CROSS_BASE}/usr\"," \
+ "${XBPS_CROSS_BASE}/usr/bin/geos-config" > "${_wrapper}"
+ chmod +x "${_wrapper}"
fi
}
+do_check() {
+ cd build/lib*
+ PYTHONPATH="${PWD}" python3 -m pytest -n "${XBPS_MAKEJOBS}" shapely/tests
+}
+
post_install() {
vlicense LICENSE.txt LICENSE
}
From 2d6773c84d2a92821b8d92e1ed355e678bcfed33 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH 188/356] squid: update to 5.7
* --sbindir is already defined in
common/environment/configure/gnu-configure-args.sh
* --enable-useragent-log and --enable-referer-log are obsolete since
version 3.2.0.4.
* --enable-arp-acl is gone
(squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).
* --enable-carp is gone, CARP is compiled in
(squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).
* --enable-truncate was removed upstream
(squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).
* squid_cv_gnu_atomics is replaced with c++11 std::atomic
(squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).
* squid_opt_enable_large_files is the duplicate of --with-large-files.
Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
cross build for arm* and glibc. Now that squid builds completely fine
without it, it is safe to assume this option is not needed anymore.
* define BUILDCXX properly (CXX_host cannot be set outside of
functions).
* CVE-2018-1000027 was fixed since version 4.0.23.
---
srcpkgs/squid/template | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
# Template file for 'squid'
pkgname=squid
-version=5.3
+version=5.7
revision=1
build_style=gnu-configure
configure_args="
- --sbindir=/usr/bin
--sysconfdir=/etc/squid
--libexecdir=/usr/libexec/squid
--datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
--enable-icmp
--enable-linux-netfilter
--enable-ident-lookups
- --enable-useragent-log
--enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
--enable-htcp
- --enable-carp
--enable-epoll
--with-large-files
- --enable-arp-acl
--with-default-user=squid
--enable-async-io
- --enable-truncate
--enable-icap-client
--enable-ssl-crtd
--disable-arch-native
--disable-strict-error-checking
--enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
conf_files="/etc/squid/squid.conf
/etc/squid/errorpage.css
/etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
homepage="http://www.squid-cache.org/"
changelog="http://www.squid-cache.org/Versions/v5/changesets/"
distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
system_accounts="squid"
# squid-conf-tests requires a squid user in the system
make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS+=" -latomic"
fi
+pre_configure() {
+ export BUILDCXX="${CXX_host}"
+ export BUILDCXXFLAGS="-O2"
+}
+
post_install() {
chmod u+s \
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
${DESTDIR}/usr/libexec/squid/pinger
vsv squid
vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
- # CVE-2018-1000027
- echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
}
From 0a056c945fa8b377f089662a3735fba2d178ecd2 Mon Sep 17 00:00:00 2001
From: Alan Barros de Oliveira <deoliveira.alan@outlook.com>
Date: Sun, 5 Feb 2023 01:21:23 -0300
Subject: [PATCH 189/356] python3-paramiko: add missing dependency
---
srcpkgs/python3-paramiko/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template
index 49932af0b3dd..debd2acdd6fa 100644
--- a/srcpkgs/python3-paramiko/template
+++ b/srcpkgs/python3-paramiko/template
@@ -1,10 +1,11 @@
# Template file for 'python3-paramiko'
pkgname=python3-paramiko
version=2.11.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl"
+depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl
+ python3-six"
short_desc="Python3 SSH2 protocol library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 7628570e6eccb35c7d2659987591d070321ce0d5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 4 Feb 2023 11:09:09 +0530
Subject: [PATCH 190/356] difftastic: update to 0.43.1.
---
srcpkgs/difftastic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template
index 7ad70a4ffcc8..1a6aba33cf40 100644
--- a/srcpkgs/difftastic/template
+++ b/srcpkgs/difftastic/template
@@ -1,6 +1,6 @@
# Template file for 'difftastic'
pkgname=difftastic
-version=0.42.0
+version=0.43.1
revision=1
build_style=cargo
short_desc="Structural diff tool that understands syntax"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://difftastic.wilfred.me.uk"
changelog="https://raw.githubusercontent.com/Wilfred/difftastic/master/CHANGELOG.md"
distfiles="https://static.crates.io/crates/difftastic/difftastic-${version}.crate"
-checksum=6a8ac20b608fd771b1caa3795280b2b09e0d2edbd0c00b11b9e10e96dffb1f38
+checksum=35c3fad5d6442e9514779dc140d998edf76bd808ca3b5d3b9db2e0c41b834a58
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 7ff2efb257e5423dee3a3d22de04913f7ccca5e5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 3 Feb 2023 15:39:47 +0530
Subject: [PATCH 191/356] cronutils: update to 1.10.
Fix update reporting.
---
srcpkgs/cronutils/template | 9 +++++----
srcpkgs/cronutils/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cronutils/template b/srcpkgs/cronutils/template
index 03728d0f93d7..e5e3c7a93c33 100644
--- a/srcpkgs/cronutils/template
+++ b/srcpkgs/cronutils/template
@@ -1,14 +1,15 @@
# Template file for 'cronutils'
pkgname=cronutils
-version=1.9
-revision=3
+version=1.10
+revision=1
build_style=gnu-makefile
short_desc="Set of tools to assist the reliable running periodic and batch jobs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/google/cronutils"
-distfiles="https://github.com/google/${pkgname}/archive/version/${version}.tar.gz"
-checksum=0109f165b193d3482ebf470e5d19fcef13bb692b173f65c966b0b8b8ebc79238
+changelog="https://github.com/google/cronutils/releases"
+distfiles="https://github.com/google/cronutils/archive/refs/tags/version/${version}.tar.gz"
+checksum=56638170e5a41c71e9992bc0c01b69333dd4af72ea9f8f79d8b863f771b93628
post_install() {
vbin runcron
diff --git a/srcpkgs/cronutils/update b/srcpkgs/cronutils/update
index f1c5f576fb48..ccb0dc04e003 100644
--- a/srcpkgs/cronutils/update
+++ b/srcpkgs/cronutils/update
@@ -1,2 +1 @@
-site=https://github.com/google/cronutils/releases
-pkgname=version/
+pattern="/archive/refs/tags/version/\K[\d.]+(?=\.tar\.gz)"
From 7b359fe886872688d961cbbe92b21541f515c58c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 00:56:22 +0530
Subject: [PATCH 192/356] xmldiff: update to 2.5.
---
srcpkgs/xmldiff/template | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 2185fd18fffb..8fe8aae7a159 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,21 +1,26 @@
# Template file for 'xmldiff'
pkgname=xmldiff
-version=2.4
-revision=5
+version=2.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-lxml python3-six python3-setuptools"
+depends="python3-lxml python3-setuptools"
+checkdepends="${depends} python3-pytest"
short_desc="Python3 classes to diff XML files"
maintainer="prspkt <prspkt@protonmail.com>"
-license="LGPL-3.0-or-later"
+license="MIT"
homepage="https://github.com/Shoobx/xmldiff"
changelog="https://raw.githubusercontent.com/Shoobx/xmldiff/master/CHANGES.rst"
distfiles="${PYPI_SITE}/x/xmldiff/xmldiff-${version}.tar.gz"
-checksum=05bea20ce1f2c9678683bcce0c3ba9981f87d92b709d190e018bcbf047eccf63
+checksum=6c5f30bc65ce6e81d9a70a3cb0269f7ba61852fd6caa7a0fbfc0edf33b3cb717
conflicts="python-xmldiff>=0"
-post_patch() {
- rm -f xmldiff/_diff_match_patch_py2.py
+post_extract() {
+ rm xmldiff/_diff_match_patch_py2.py
+}
+
+post_install() {
+ vlicense LICENSE.txt
}
python3-xmldiff_package() {
From ba484c1c5a38acb6c10d9efdd123c8c79e6dc9e1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Feb 2023 10:46:05 +0100
Subject: [PATCH 193/356] wine: update to 8.1.
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index faacc1188391..fe0ea89be4e2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=8.0
+version=8.1
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e
- 9b0ba0be13ba2e77bc9a9d8c9160f3580e538d9eb788b52d176222349d9869cd"
+checksum="4120ee6b3f294d97aaf2c73034cf1c2cbf13a195c94c5c74a646a81f92412598
+ b2c50878e48cd69d5cd1e4cbf5f19d4af10a56db42932aacb8f6316a25c639af"
build_options="mingw staging xshm"
build_options_default="mingw xshm"
From 5de792273f9e6edac60c35a9b58612cdfe914221 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 12:29:03 +0530
Subject: [PATCH 194/356] exfatprogs: update to 1.2.0.
---
srcpkgs/exfatprogs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template
index 1003630ebfa5..6277c079ba50 100644
--- a/srcpkgs/exfatprogs/template
+++ b/srcpkgs/exfatprogs/template
@@ -1,18 +1,18 @@
# Template file for 'exfatprogs'
pkgname=exfatprogs
-version=1.1.3
-revision=3
+version=1.2.0
+revision=1
build_style=gnu-configure
short_desc="Tools to create, check and label exFAT filesystems"
maintainer="k4leg <python.bogdan@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/exfatprogs/exfatprogs"
-distfiles="https://github.com/exfatprogs/exfatprogs/archive/${version}.tar.gz"
+changelog="https://raw.githubusercontent.com/exfatprogs/exfatprogs/master/NEWS"
distfiles="https://github.com/exfatprogs/exfatprogs/releases/download/${version}/exfatprogs-${version}.tar.xz"
-checksum=3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809
+checksum=56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742
conflicts="exfat-utils"
replaces="exfat-utils>=0"
post_install() {
- vdoc NEWS
+ vdoc README.md
}
From a11f9da1e395e825583c4297a58d506384dbce5a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 30 Jan 2023 09:21:24 +0100
Subject: [PATCH 195/356] miniflux: update to 2.0.42.
---
srcpkgs/miniflux/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index f49cbd1788ac..308e2974e03b 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
# Template file for 'miniflux'
pkgname=miniflux
-version=2.0.41
+version=2.0.42
revision=1
build_style=go
go_import_path="miniflux.app"
@@ -11,7 +11,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/v2/main/ChangeLog"
distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=01e150ebfba12c8b5ca7c1d9d5a5976d018081cafc11228d6f77a48ac3333e1b
+checksum=f050b2bc9839dd485047b9d7820dbb669668fd13135aa8b49dc0ad304e509fd5
system_accounts="_miniflux"
post_install() {
From 035197d1a9e5100708c9628181465f62849be38f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 2 Feb 2023 11:28:33 +0100
Subject: [PATCH 196/356] syncthing-gtk: update debian version
---
srcpkgs/syncthing-gtk/patches/python-3.11.patch | 12 ------------
srcpkgs/syncthing-gtk/template | 6 +++---
2 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/syncthing-gtk/patches/python-3.11.patch
diff --git a/srcpkgs/syncthing-gtk/patches/python-3.11.patch b/srcpkgs/syncthing-gtk/patches/python-3.11.patch
deleted file mode 100644
index 40cfe2bf509b..000000000000
--- a/srcpkgs/syncthing-gtk/patches/python-3.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: syncthing-gtk-0.9.4.4/syncthing_gtk/tools.py
-===================================================================
---- syncthing-gtk-0.9.4.4.orig/syncthing_gtk/tools.py
-+++ syncthing-gtk-0.9.4.4/syncthing_gtk/tools.py
-@@ -259,7 +259,6 @@ def init_locale(localedir=None):
- global _localedir
- _localedir = localedir
- gettext.bindtextdomain(GETTEXT_DOMAIN, localedir)
-- gettext.bind_textdomain_codeset(GETTEXT_DOMAIN, "utf-8")
- gettext.textdomain(GETTEXT_DOMAIN)
-
- def get_locale_dir():
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index a4f98a341321..9d8805f38472 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,8 +2,8 @@
pkgname=syncthing-gtk
reverts="0.14.36_1 0.9.4.4+ds+git20220108+9023143f8b93_1 0.9.4.4+ds+git20220108+9023143f8b93_2"
version=0.9.4.4
-revision=6
-_debianver="ds+git20220108+9023143f8b93"
+revision=7
+_debianver="ds+git20221205+12a9702d29ab"
build_style=python3-module
hostmakedepends="python3-setuptools gettext"
depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="GPL-2.0-or-later"
homepage="https://salsa.debian.org/debian/syncthing-gtk/"
distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
-checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
+checksum=1ed5cb11658e496f400630e802dc62c09e25ddd1987e6e458cb63910d1440905
# for checks
# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
From 0d700aa525f803f0ba2f79d7472b51034e24efa6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 5 Feb 2023 09:53:30 +0100
Subject: [PATCH 197/356] htop: update to 3.2.2.
---
srcpkgs/htop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index be58424c0fcc..54b9a69a6ec7 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,6 +1,6 @@
# Template file for 'htop'
pkgname=htop
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--enable-unicode --enable-sensors"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
homepage="https://htop.dev/"
changelog="https://raw.githubusercontent.com/htop-dev/htop/main/ChangeLog"
distfiles="https://github.com/htop-dev/htop/releases/download/${version}/htop-${version}.tar.xz"
-checksum=5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb
+checksum=bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8
From 62c6fa5aa8e39a9158d439542381e871c7cb4d02 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 2 Feb 2023 11:34:01 +0100
Subject: [PATCH 198/356] yq-go: update to 4.30.8.
---
srcpkgs/yq-go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index dfbc98eef5ff..7334fb9469ae 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
# Template file for 'yq-go'
pkgname=yq-go
-version=4.30.7
+version=4.30.8
revision=1
build_style=go
go_import_path=github.com/mikefarah/yq/v4
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/mikefarah/yq"
changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
distfiles="https://github.com/mikefarah/yq/archive/refs/tags/v${version}.tar.gz"
-checksum=84dff2f03ae34b84032a36e381440b78684a9eb5cf849789878da78e94fcd679
+checksum=aaf6c9f37968970413b8a6daf0b313a86efd1b8e3e5959e527b50636508eb776
do_check() {
go test -v
From 8cb28dd93d35c7d53f8d16e68e1993f346f320fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 13:20:58 +0100
Subject: [PATCH 199/356] ansible-core: update to 2.14.2.
---
srcpkgs/ansible-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 7ef4abca11c1..79bbba396edc 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.14.1
+version=2.14.2
revision=1
hostmakedepends="python3-setuptools python3-wheel python3-packaging
python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=589257f2560fffd5d4465352cd4504e2cbfc418ba49e0c4265cd54e16070c938
+checksum=47f0d4b4125b58edba6435a47f37cbe6a18da54594d18f812958bb0cb58d4e65
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
From b88209cc40815253877c9c44a3d3683602e20565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 13:21:01 +0100
Subject: [PATCH 200/356] ansible: update to 7.2.0.
---
srcpkgs/ansible/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 80012a517c30..b201ce5ed090 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
# Template file for 'ansible'
pkgname=ansible
-version=7.1.0
+version=7.2.0
revision=1
build_style="python3-pep517"
hostmakedepends="python3-setuptools python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=1e47238c4aa9e68c0c5367a3fd707ba6c3949b4aaf912b06440ad78dd2bf018d
+checksum=60e2c1a58f1ceb34a190b7c380f7b3386d1e7369061954b1f8b8ca3df76063cc
# Relevant tests happen in ansible-core
make_check=no
From 8efd71a0c1185e832436d67533c26b2cb06f5bdf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 10:34:06 -0500
Subject: [PATCH 201/356] upx: update to 4.0.2
---
srcpkgs/upx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template
index 5fd94feb9d32..6510dce77bef 100644
--- a/srcpkgs/upx/template
+++ b/srcpkgs/upx/template
@@ -1,6 +1,6 @@
# Template file for 'upx'
pkgname=upx
-version=4.0.1
+version=4.0.2
revision=1
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=Release"
@@ -10,6 +10,6 @@ short_desc="Ultimate Packer for eXecutables"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://upx.github.io/"
-changelog="https://raw.githubusercontent.com/upx/upx/devel/NEWS"
+changelog="https://raw.githubusercontent.com/upx/upx/master/NEWS"
distfiles="https://github.com/upx/upx/releases/download/v${version}/upx-${version}-src.tar.xz"
-checksum=77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190
+checksum=1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f
From b695c01c07deaeeb9926ab705086cfab95b8b799 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 31 Jan 2023 19:18:11 -0500
Subject: [PATCH 202/356] texlab: update to 5.2.0
---
srcpkgs/texlab/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 4f844d6cb0b3..87569a0a2843 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
# Template file for 'texlab'
pkgname=texlab
-version=5.1.0
+version=5.2.0
revision=1
build_style=cargo
short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
homepage="https://texlab.netlify.app/"
changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz"
-checksum=e327c78e079dc94290b34065cde92510f02db3f012aedcba4eb882bfc815cf55
+checksum=e23bff5b39d8605a2e1b789e25015332a5777cfb53b3d24535ceef0034437929
if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="smartstring fails to compile"
From 1f7e68deb2412f5be8d5d15c204096a5a29f69ad Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 4 Feb 2023 22:10:20 -0500
Subject: [PATCH 203/356] jdupes: update to 1.21.1
---
srcpkgs/jdupes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 102b2db97df8..873b07da8a6f 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.21.0
+version=1.21.1
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=13e56c608354f10f9314c99cf37b034dde14e6bf4a9303c77391323e2ef4f549
+checksum=22de88d1963f70c8ed4d0aa40abe05b48aaa4cc08eed6a2c6c9747010f9f4eb7
CFLAGS="-DENABLE_DEDUPE"
From 29c3325cb8da565e06cb3b659425b41abf03b452 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 4 Feb 2023 22:14:56 -0500
Subject: [PATCH 204/356] procs: update to 0.13.4
---
srcpkgs/procs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 90dc2cd982c0..0713f2ac1c9b 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
# Template file for 'procs'
pkgname=procs
-version=0.13.3
+version=0.13.4
revision=1
build_style=cargo
build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/dalance/procs"
changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=aa93a588504dcc74df699d8a3bc2a27d3da94a772106a42d3d862a5fd17725c3
+checksum=9b9b59b79049cf6ae2c39d9cc5b0c5af81411ba898a414fda41f68921c3c9539
post_build() {
PROCS="target/${RUST_TARGET}/release/procs"
From 148de8f06869a44cfce755a0dded3a738cecfc68 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 22 Jan 2023 15:39:25 +0100
Subject: [PATCH 205/356] cocogitto: update to 5.3.1
---
srcpkgs/cocogitto/template | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index bf1d15be5b14..dbed47399d80 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
-version=5.2.0
-revision=2
+version=5.3.1
+revision=1
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,17 +13,25 @@ license="MIT"
homepage="https://github.com/cocogitto/cocogitto"
changelog="https://raw.githubusercontent.com/cocogitto/cocogitto/main/CHANGELOG.md"
distfiles="https://github.com/cocogitto/cocogitto/archive/refs/tags/${version}.tar.gz"
-checksum=99f9dee05597d7721f6d046dbfefba5cb8d1c4ae22ced415f724affb3a6bd0cc
+checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
post_install() {
- COG="${DESTDIR}/usr/bin/cog"
+ local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
- vtargetrun ${COG} generate-completions ${shell} > cog.${shell}
+ vtargetrun ${cog} generate-completions ${shell} > cog.${shell}
vcompletion cog.${shell} ${shell} cog
done
+ vtargetrun ${cog} generate-manpage cog > cog.1
+ vman cog.1
+
+ for subcommand in bump changelog check commit edit init install-hook log verify; do
+ vtargetrun ${cog} generate-manpage ${subcommand} > cog-${subcommand}.1
+ vman cog-${subcommand}.1
+ done
+
vdoc README.md
vlicense LICENSE
}
From 0010d1a135a387a451430ee6a0a1ce242f134d40 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 22:27:20 +0530
Subject: [PATCH 206/356] swayimg: update to 1.10, orphan
---
.../patches/0001-fix-zsh-completion.patch | 23 -----------------
srcpkgs/swayimg/patches/0002-fix-help.patch | 25 -------------------
srcpkgs/swayimg/template | 6 ++---
3 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
delete mode 100644 srcpkgs/swayimg/patches/0002-fix-help.patch
diff --git a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
deleted file mode 100644
index b9360242ee42..000000000000
--- a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e938dc5b04bb54dd3f3a89a71d46c7a53ac087bd Mon Sep 17 00:00:00 2001
-From: Leon <adigitoleo@dissimulo.com>
-Date: Wed, 31 Aug 2022 23:07:23 +1000
-Subject: [PATCH] Fix typo in zsh completion
-
-Signed-off-by: Leon <adigitoleo@dissimulo.com>
----
- extra/zsh.completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extra/zsh.completion b/extra/zsh.completion
-index a690528..32b159b 100644
---- a/extra/zsh.completion
-+++ b/extra/zsh.completion
-@@ -8,7 +8,7 @@ _arguments \
- '(-r --recursive)'{-r,--recursive}'[read directories recursively]' \
- '(-a --all)'{-a,--all}'[open all files from the same directory]' \
- '(-m --mark)'{-m,--mark}'[enable marking mode]' \
-- '(-l --slideshow)'{-l --slideshow}'[activate slideshow mode on startup]' \
-+ '(-l --slideshow)'{-l,--slideshow}'[activate slideshow mode on startup]' \
- '(-f --fullscreen)'{-f,--fullscreen}'[show image in full screen mode]' \
- '(-s --scale=SCALE)'{-s,--scale=}'[set initial image scale]:scale:(optimal fit real)' \
- '(-b --background)'{-b,--background=}'[set image background color]:bkg:(none grid)' \
diff --git a/srcpkgs/swayimg/patches/0002-fix-help.patch b/srcpkgs/swayimg/patches/0002-fix-help.patch
deleted file mode 100644
index b735d938d1ad..000000000000
--- a/srcpkgs/swayimg/patches/0002-fix-help.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1cbbe5e6e0cc3f7fb26055e952153c3a23bfad45 Mon Sep 17 00:00:00 2001
-From: Artem Senichev <artemsen@gmail.com>
-Date: Sat, 17 Sep 2022 11:57:10 +0300
-Subject: [PATCH] Allow long option `--help`
-
-Fix error when `--help` is not accepted by getopt.
-
-Signed-off-by: Artem Senichev <artemsen@gmail.com>
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index 3939ccb..4eecd12 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -93,7 +93,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg)
- }
- // add terminations
- *short_opts_ptr = 0;
-- memset(&options[(sizeof(arguments) / sizeof(arguments[0])) - 1], 0,
-+ memset(&options[(sizeof(arguments) / sizeof(arguments[0]))], 0,
- sizeof(struct option));
-
- // parse arguments
diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index bfdc3a496d21..073ba379db14 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,6 +1,6 @@
# Template file for 'swayimg'
pkgname=swayimg
-version=1.9
+version=1.10
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -8,11 +8,11 @@ makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel
wayland-protocols libheif-devel giflib-devel libjpeg-turbo-devel
libpng-devel librsvg-devel libwebp-devel libexif-devel"
short_desc="Image viewer for Sway/Wayland"
-maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+maintainer="Orphan <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/artemsen/swayimg"
distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz"
-checksum=693a23a7755ebedb144271b2b674980a1c51a2036dabcff9697c3e3c6258f108
+checksum=fa20e9d5e260ca45ca3fb83343a6c7e7c93bcdb1184a99b19b630aec598f4b17
post_install() {
vcompletion extra/bash.completion bash
From 69d4380a098b6418f600a20a95a86cb967e56f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 12:59:41 +0100
Subject: [PATCH 207/356] openpgp-ca: update to 0.12.0.
---
srcpkgs/openpgp-ca/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
index ca62b5987975..8ed3249de058 100644
--- a/srcpkgs/openpgp-ca/template
+++ b/srcpkgs/openpgp-ca/template
@@ -1,16 +1,16 @@
# Template file for 'openpgp-ca'
pkgname=openpgp-ca
-version=0.11.2
+version=0.12.0
revision=1
build_style=cargo
make_install_args="--path openpgp-ca-bin"
hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"
-makedepends="openssl-devel nettle-devel clang sqlite-devel"
+makedepends="openssl-devel nettle-devel clang sqlite-devel pcsclite-devel"
depends="gnupg"
short_desc="Tool for handling OpenPGP keys in organizaations"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://openpgp-ca.org/"
distfiles="https://gitlab.com/openpgp-ca/openpgp-ca/-/archive/openpgp-ca/v${version}/openpgp-ca-openpgp-ca-v${version}.tar.gz"
-checksum=162f60cdb937a9db897f699a35266da00adeb14c42a21f806d13bfbed03f921e
+checksum=9f62ccb10627950645b8183a0ff92a1781ac47c3e2130aac403fccd4a703d2a0
make_check=no # Tests require gpg-agent being set up
From 30b5512109e9354d92c32394ab9e12369157bf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 1 Feb 2023 16:25:33 +0100
Subject: [PATCH 208/356] fotoxx: update to 23.1.
---
srcpkgs/fotoxx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index a1a92a46a2c0..c8fcc65a7498 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=23.0
+version=23.1
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
changelog="https://www.kornelix.net/downloads/recent_changes.txt"
distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=7629edde4053ea6ebb815e84f5717e32982ad2c2ef0d00412c9719294f5122d7
+checksum=2043daedac89d5826699ff2833e6e697caad707ae174bebb9470e21b692312c1
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
From 5152427de839580dd2bbda3bef68437e4219ca20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Feb 2023 13:49:36 +0100
Subject: [PATCH 209/356] arti: update to 1.1.1.
---
srcpkgs/arti/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index bfb6e1a496d1..098e7e01ce3e 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,10 +1,9 @@
# Template file for 'arti'
pkgname=arti
-version=1.1.0
+version=1.1.1
revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
-make_check_args="-- --skip internal::test::internal_macro_test" # fails with --release builds
make_install_args="--path crates/arti"
hostmakedepends="pkg-config"
makedepends="openssl-devel sqlite-devel"
@@ -14,7 +13,7 @@ license="Apache-2.0, MIT"
homepage="https://gitlab.torproject.org/tpo/core/arti"
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=68b8b391478b745d4bba50034d5122e2c7b90e0e221f52ba83c078901c83e55a
+checksum=f937858b0eae9220a44895306e859df4ad0098eac515cca299352c62311ac90f
if [ "$XBPS_CHECK_PKGS" ]; then
case "$XBPS_TARGET_MACHINE" in
From 5b8df533e17e0fae21d48913ebb53ccb7b4b4d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Feb 2023 09:40:45 +0100
Subject: [PATCH 210/356] bfs: update to 2.6.3.
---
srcpkgs/bfs/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index caeb3fd17197..855f116d5930 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.6.2
+version=2.6.3
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -11,11 +11,7 @@ license="0BSD"
homepage="https://github.com/tavianator/bfs"
changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=1d50f7fdeda2bafd3ce6e4eacbe88de43f3ec14fb904aa8f81641aefba465afe
-
-# temporary workaround for failing CI tests
-# https://github.com/void-linux/void-packages/pull/40090#issuecomment-1287842827
-export BFS_TRIED_DROP=""
+checksum=b88b7d8f8c5f701209fd2967546ad154c405281749ad458bc116b40da14b98f6
post_install() {
vlicense LICENSE
From 98cdad9d880c2fb34e871c461d0fdcfbeb2134c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 28 Jan 2023 19:30:13 +0100
Subject: [PATCH 211/356] mpv: update to 0.35.1.
---
srcpkgs/mpv/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 5dcef38aa241..0a56d037e194 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
-version=0.35.0
-revision=2
+version=0.35.1
+revision=1
build_style=meson
configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
-Dlibmpv=true -Dcplugins=enabled
@@ -40,8 +40,8 @@ maintainer="travankor <travankor@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://mpv.io"
changelog="https://github.com/mpv-player/mpv/releases"
-distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00
+distfiles="https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"
+checksum=41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -62,6 +62,6 @@ mpv-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
From 4f5549677226b3f4b4d5fec835d9c3b1767cf614 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Mon, 30 Jan 2023 23:04:28 -0600
Subject: [PATCH 212/356] nano: update to 7.2.
---
srcpkgs/nano/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 217238565dd8..f87a38ca56fa 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
# Template file for 'nano'
pkgname=nano
-version=7.1
+version=7.2
revision=1
build_style=gnu-configure
configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="https://www.nano-editor.org/"
changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836
+checksum=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526
post_install() {
vsconf doc/sample.nanorc
From 8e163fa73865c49b92ded564a181d95f0f6acf45 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 13:41:27 -0500
Subject: [PATCH 213/356] vanitygen: remove package
no distfiles available
---
srcpkgs/removed-packages/template | 3 +-
...4a646873c8439d3b5ee3a2278e727575521f.patch | 1171 -----------------
...3e6fff7da52c4aecbd898d9df2e60a56f134.patch | 98 --
srcpkgs/vanitygen/template | 21 -
4 files changed, 2 insertions(+), 1291 deletions(-)
delete mode 100644 srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
delete mode 100644 srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
delete mode 100644 srcpkgs/vanitygen/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8528ac460a0b..ef781a412eb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20230129
+version=0.1.20230130
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -511,6 +511,7 @@ replaces="
urlmatch-git<=20141116_2
uwsgi-python<=2.0.18_3
v8<=3.24.35.33_4
+ vanitygen<=1.53_2
vapoursynth-mvtools<=23_2
vkd3d<=1.3_1
volnoti<=0.1_1
diff --git a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch b/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
deleted file mode 100644
index 74bd54dbf0fb..000000000000
--- a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
+++ /dev/null
@@ -1,1171 +0,0 @@
-From 4b814a646873c8439d3b5ee3a2278e727575521f Mon Sep 17 00:00:00 2001
-From: Antonio Spadaro <ilovelinux@users.noreply.github.com>
-Date: Sat, 2 Jun 2018 22:27:51 +0000
-Subject: [PATCH] Fix OpenSSL 1.1.0 incompatibilities (#56)
-
-* Fix openssl 1.1.0 incompatibilities
-
-* Replace BN_MASK2 with 0xffffffffL
-
-* Fix other openssl 1.1.0 incompatibilities
-
-* Fix retrocompatibility issue
-
-* Remove BN_bn2lebinpad due to incompatibility
-
-* Fix other incompatibility errors
-
-* Fixed retrocompatibility (maybe). Thanks to @DesWurstes
-
-* Fix OpenSSL 1.1 and backwards compatibility
----
- keyconv.c | 18 ++--
- oclengine.c | 130 ++++++++++++++++++---------
- pattern.c | 252 ++++++++++++++++++++++++++--------------------------
- pattern.h | 8 +-
- util.c | 90 +++++++++----------
- vanitygen.c | 14 +--
- 6 files changed, 277 insertions(+), 235 deletions(-)
-
-diff --git a/keyconv.c b/keyconv.c
-index f7475e5..394c3a0 100644
---- a/keyconv.c
-+++ b/keyconv.c
-@@ -1160,7 +1160,7 @@ main(int argc, char **argv)
-
- if (key2_in) {
- BN_CTX *bnctx;
-- BIGNUM bntmp, bntmp2;
-+ BIGNUM *bntmp, *bntmp2;
- EC_KEY *pkey2;
-
- pkey2 = EC_KEY_new_by_curve_name(NID_secp256k1);
-@@ -1182,19 +1182,19 @@ main(int argc, char **argv)
- compressed = 1;
- }
-
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
- bnctx = BN_CTX_new();
-- EC_GROUP_get_order(EC_KEY_get0_group(pkey), &bntmp2, NULL);
-- BN_mod_add(&bntmp,
-+ EC_GROUP_get_order(EC_KEY_get0_group(pkey), bntmp2, NULL);
-+ BN_mod_add(bntmp,
- EC_KEY_get0_private_key(pkey),
- EC_KEY_get0_private_key(pkey2),
-- &bntmp2,
-+ bntmp2,
- bnctx);
-- vg_set_privkey(&bntmp, pkey);
-+ vg_set_privkey(bntmp, pkey);
- EC_KEY_free(pkey2);
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
- BN_CTX_free(bnctx);
- }
-
-diff --git a/oclengine.c b/oclengine.c
-index 4085edd..6f65846 100644
---- a/oclengine.c
-+++ b/oclengine.c
-@@ -43,6 +43,34 @@
- #include "pattern.h"
- #include "util.h"
-
-+// Unfortunately we need this!
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+#define PPNT_ARROW_X ppnt->X
-+#define PPNT_ARROW_Y ppnt->Y
-+#define PPNT_ARROW_Z ppnt->Z
-+#define PPS_ARROW_X pps->X
-+#define PPS_ARROW_Y pps->Y
-+#define PPS_ARROW_Z pps->Z
-+#define PPT_ARROW_X ppt->X
-+#define PPT_ARROW_Y ppt->Y
-+#define PPR_ARROW_X ppr->X
-+#define PPR_ARROW_Y ppr->Y
-+#define PPC_ARROW_X ppc->X
-+#define PPC_ARROW_Y ppc->Y
-+#else
-+#define PPNT_ARROW_X &ppnt->X
-+#define PPNT_ARROW_Y &ppnt->Y
-+#define PPNT_ARROW_Z &ppnt->Z
-+#define PPS_ARROW_X &pps->X
-+#define PPS_ARROW_Y &pps->Y
-+#define PPS_ARROW_Z &pps->Z
-+#define PPT_ARROW_X &ppt->X
-+#define PPT_ARROW_Y &ppt->Y
-+#define PPR_ARROW_X &ppr->X
-+#define PPR_ARROW_Y &ppr->Y
-+#define PPC_ARROW_X &ppc->X
-+#define PPC_ARROW_Y &ppc->Y
-+#endif
-
- #define MAX_SLOT 2
- #define MAX_ARG 6
-@@ -1307,14 +1335,21 @@ vg_ocl_kernel_wait(vg_ocl_context_t *vocp, int slot)
- static INLINE void
- vg_ocl_get_bignum_raw(BIGNUM *bn, const unsigned char *buf)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BN_lebin2bn(buf, 32, bn);
-+#else
- bn_expand(bn, 256);
- memcpy(bn->d, buf, 32);
- bn->top = (32 / sizeof(BN_ULONG));
-+#endif
- }
-
- static INLINE void
- vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BN_bn2lebinpad(bn, buf, 32);
-+#else
- int bnlen = (bn->top * sizeof(BN_ULONG));
- if (bnlen >= 32) {
- memcpy(buf, bn->d, 32);
-@@ -1322,6 +1357,7 @@ vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
- memcpy(buf, bn->d, bnlen);
- memset(buf + bnlen, 0, 32 - bnlen);
- }
-+#endif
- }
-
- #define ACCESS_BUNDLE 1024
-@@ -1351,9 +1387,15 @@ vg_ocl_get_bignum_tpa(BIGNUM *bn, const unsigned char *buf, int cell)
-
- struct ec_point_st {
- const EC_METHOD *meth;
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BIGNUM *X;
-+ BIGNUM *Y;
-+ BIGNUM *Z;
-+#else
- BIGNUM X;
- BIGNUM Y;
- BIGNUM Z;
-+#endif
- int Z_is_one;
- };
-
-@@ -1361,11 +1403,11 @@ static INLINE void
- vg_ocl_get_point(EC_POINT *ppnt, const unsigned char *buf)
- {
- static const unsigned char mont_one[] = { 0x01,0x00,0x00,0x03,0xd1 };
-- vg_ocl_get_bignum_raw(&ppnt->X, buf);
-- vg_ocl_get_bignum_raw(&ppnt->Y, buf + 32);
-+ vg_ocl_get_bignum_raw(PPNT_ARROW_X, buf);
-+ vg_ocl_get_bignum_raw(PPNT_ARROW_Y, buf + 32);
- if (!ppnt->Z_is_one) {
- ppnt->Z_is_one = 1;
-- BN_bin2bn(mont_one, sizeof(mont_one), &ppnt->Z);
-+ BN_bin2bn(mont_one, sizeof(mont_one), PPNT_ARROW_Z);
- }
- }
-
-@@ -1373,8 +1415,8 @@ static INLINE void
- vg_ocl_put_point(unsigned char *buf, const EC_POINT *ppnt)
- {
- assert(ppnt->Z_is_one);
-- vg_ocl_put_bignum_raw(buf, &ppnt->X);
-- vg_ocl_put_bignum_raw(buf + 32, &ppnt->Y);
-+ vg_ocl_put_bignum_raw(buf, PPNT_ARROW_X);
-+ vg_ocl_put_bignum_raw(buf + 32, PPNT_ARROW_Y);
- }
-
- static void
-@@ -1662,7 +1704,7 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- unsigned char *ocl_points_in = NULL, *ocl_strides_in = NULL;
- const EC_GROUP *pgroup;
- EC_POINT *ppr = NULL, *ppc = NULL, *pps = NULL, *ppt = NULL;
-- BIGNUM bnz, bnez, bnm, *bnzc;
-+ BIGNUM *bnz, *bnez, *bnm, *bnzc;
- BN_CTX *bnctx = NULL;
- BN_MONT_CTX *bnmont;
- int ret = 0;
-@@ -1675,9 +1717,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- 0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFC,0x2F
- };
-
-- BN_init(&bnz);
-- BN_init(&bnez);
-- BN_init(&bnm);
-+ bnz = BN_new();
-+ bnez = BN_new();
-+ bnm = BN_new();
-
- bnctx = BN_CTX_new();
- bnmont = BN_MONT_CTX_new();
-@@ -1692,13 +1734,13 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- goto out;
- }
-
-- BN_bin2bn(raw_modulus, sizeof(raw_modulus), &bnm);
-- BN_MONT_CTX_set(bnmont, &bnm, bnctx);
-+ BN_bin2bn(raw_modulus, sizeof(raw_modulus), bnm);
-+ BN_MONT_CTX_set(bnmont, bnm, bnctx);
-
- if (z_inverted) {
-- bnzc = &bnez;
-+ bnzc = bnez;
- } else {
-- bnzc = &pps->Z;
-+ bnzc = PPS_ARROW_Z;
- }
-
- z_heap = (unsigned char *)
-@@ -1726,15 +1768,15 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- EC_POINT_add(pgroup, pps, ppc, ppr, bnctx);
- assert(!pps->Z_is_one);
- vg_ocl_get_point_tpa(ppt, point_tmp, bx + x);
-- vg_ocl_get_bignum_tpa(&bnz, z_heap, bx + x);
-+ vg_ocl_get_bignum_tpa(bnz, z_heap, bx + x);
- if (z_inverted) {
-- BN_mod_inverse(&bnez, &pps->Z, &bnm, bnctx);
-- BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
-- BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
-+ BN_mod_inverse(bnez, PPS_ARROW_Z, bnm, bnctx);
-+ BN_to_montgomery(bnez, bnez, bnmont, bnctx);
-+ BN_to_montgomery(bnez, bnez, bnmont, bnctx);
- }
-- if (BN_cmp(&ppt->X, &pps->X) ||
-- BN_cmp(&ppt->Y, &pps->Y) ||
-- BN_cmp(&bnz, bnzc)) {
-+ if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X) ||
-+ BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y) ||
-+ BN_cmp(bnz, bnzc)) {
- if (!mismatches) {
- fprintf(stderr, "Base privkey: ");
- fdumpbn(stderr, EC_KEY_get0_private_key(
-@@ -1747,33 +1789,33 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- if (!mm_r) {
- mm_r = 1;
- fprintf(stderr, "Row X : ");
-- fdumpbn(stderr, &ppr->X);
-+ fdumpbn(stderr, PPR_ARROW_X);
- fprintf(stderr, "Row Y : ");
-- fdumpbn(stderr, &ppr->Y);
-+ fdumpbn(stderr, PPS_ARROW_Y);
- }
-
- fprintf(stderr, "Column X: ");
-- fdumpbn(stderr, &ppc->X);
-+ fdumpbn(stderr, PPC_ARROW_X);
- fprintf(stderr, "Column Y: ");
-- fdumpbn(stderr, &ppc->Y);
-+ fdumpbn(stderr, PPC_ARROW_Y);
-
-- if (BN_cmp(&ppt->X, &pps->X)) {
-+ if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X)) {
- fprintf(stderr, "Expect X: ");
-- fdumpbn(stderr, &pps->X);
-+ fdumpbn(stderr, PPS_ARROW_X);
- fprintf(stderr, "Device X: ");
-- fdumpbn(stderr, &ppt->X);
-+ fdumpbn(stderr, PPT_ARROW_X);
- }
-- if (BN_cmp(&ppt->Y, &pps->Y)) {
-+ if (BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y)) {
- fprintf(stderr, "Expect Y: ");
-- fdumpbn(stderr, &pps->Y);
-+ fdumpbn(stderr, PPS_ARROW_Y);
- fprintf(stderr, "Device Y: ");
-- fdumpbn(stderr, &ppt->Y);
-+ fdumpbn(stderr, PPT_ARROW_Y);
- }
-- if (BN_cmp(&bnz, bnzc)) {
-+ if (BN_cmp(bnz, bnzc)) {
- fprintf(stderr, "Expect Z: ");
- fdumpbn(stderr, bnzc);
- fprintf(stderr, "Device Z: ");
-- fdumpbn(stderr, &bnz);
-+ fdumpbn(stderr, bnz);
- }
- }
- }
-@@ -1798,9 +1840,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- EC_POINT_free(pps);
- if (ppt)
- EC_POINT_free(ppt);
-- BN_clear_free(&bnz);
-- BN_clear_free(&bnez);
-- BN_clear_free(&bnm);
-+ BN_clear_free(bnz);
-+ BN_clear_free(bnez);
-+ BN_clear_free(bnm);
- if (bnmont)
- BN_MONT_CTX_free(bnmont);
- if (bnctx)
-@@ -1971,13 +2013,13 @@ vg_opencl_loop(vg_exec_context_t *arg)
- if (!pbatchinc || !poffset || !pseek)
- goto enomem;
-
-- BN_set_word(&vxcp->vxc_bntmp, ncols);
-- EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, ncols);
-+ EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
-
-- BN_set_word(&vxcp->vxc_bntmp, round);
-- EC_POINT_mul(pgroup, poffset, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, round);
-+ EC_POINT_mul(pgroup, poffset, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, poffset, vxcp->vxc_bnctx);
-
-@@ -2046,12 +2088,12 @@ vg_opencl_loop(vg_exec_context_t *arg)
- }
-
- /* Determine rekey interval */
-- EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp, vxcp->vxc_bnctx);
-- BN_sub(&vxcp->vxc_bntmp2,
-- &vxcp->vxc_bntmp,
-+ EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp, vxcp->vxc_bnctx);
-+ BN_sub(vxcp->vxc_bntmp2,
-+ vxcp->vxc_bntmp,
- EC_KEY_get0_private_key(pkey));
-- rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
-- if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
-+ rekey_at = BN_get_word(vxcp->vxc_bntmp2);
-+ if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
- rekey_at = rekey_max;
- assert(rekey_at > 0);
-
-diff --git a/pattern.c b/pattern.c
-index b84334e..5673a7e 100644
---- a/pattern.c
-+++ b/pattern.c
-@@ -151,12 +151,12 @@ vg_exec_context_init(vg_context_t *vcp, vg_exec_context_t *vxcp)
-
- vxcp->vxc_vc = vcp;
-
-- BN_init(&vxcp->vxc_bntarg);
-- BN_init(&vxcp->vxc_bnbase);
-- BN_init(&vxcp->vxc_bntmp);
-- BN_init(&vxcp->vxc_bntmp2);
-+ vxcp->vxc_bntarg = BN_new();
-+ vxcp->vxc_bnbase = BN_new();
-+ vxcp->vxc_bntmp = BN_new();
-+ vxcp->vxc_bntmp2 = BN_new();
-
-- BN_set_word(&vxcp->vxc_bnbase, 58);
-+ BN_set_word(vxcp->vxc_bnbase, 58);
-
- vxcp->vxc_bnctx = BN_CTX_new();
- assert(vxcp->vxc_bnctx);
-@@ -196,10 +196,10 @@ vg_exec_context_del(vg_exec_context_t *vxcp)
- if (tp->vxc_stop)
- pthread_cond_signal(&vg_thread_upcond);
-
-- BN_clear_free(&vxcp->vxc_bntarg);
-- BN_clear_free(&vxcp->vxc_bnbase);
-- BN_clear_free(&vxcp->vxc_bntmp);
-- BN_clear_free(&vxcp->vxc_bntmp2);
-+ BN_clear_free(vxcp->vxc_bntarg);
-+ BN_clear_free(vxcp->vxc_bnbase);
-+ BN_clear_free(vxcp->vxc_bntmp);
-+ BN_clear_free(vxcp->vxc_bntmp2);
- BN_CTX_free(vxcp->vxc_bnctx);
- vxcp->vxc_bnctx = NULL;
- pthread_mutex_unlock(&vg_thread_lock);
-@@ -225,12 +225,12 @@ void
- vg_exec_context_consolidate_key(vg_exec_context_t *vxcp)
- {
- if (vxcp->vxc_delta) {
-- BN_clear(&vxcp->vxc_bntmp);
-- BN_set_word(&vxcp->vxc_bntmp, vxcp->vxc_delta);
-- BN_add(&vxcp->vxc_bntmp2,
-+ BN_clear(vxcp->vxc_bntmp);
-+ BN_set_word(vxcp->vxc_bntmp, vxcp->vxc_delta);
-+ BN_add(vxcp->vxc_bntmp2,
- EC_KEY_get0_private_key(vxcp->vxc_key),
-- &vxcp->vxc_bntmp);
-- vg_set_privkey(&vxcp->vxc_bntmp2, vxcp->vxc_key);
-+ vxcp->vxc_bntmp);
-+ vg_set_privkey(vxcp->vxc_bntmp2, vxcp->vxc_key);
- vxcp->vxc_delta = 0;
- }
- }
-@@ -751,20 +751,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- int b58pow, b58ceil, b58top = 0;
- int ret = -1;
-
-- BIGNUM bntarg, bnceil, bnfloor;
-- BIGNUM bnbase;
-+ BIGNUM *bntarg, *bnceil, *bnfloor;
-+ BIGNUM *bnbase;
- BIGNUM *bnap, *bnbp, *bntp;
- BIGNUM *bnhigh = NULL, *bnlow = NULL, *bnhigh2 = NULL, *bnlow2 = NULL;
-- BIGNUM bntmp, bntmp2;
-+ BIGNUM *bntmp, *bntmp2;
-
-- BN_init(&bntarg);
-- BN_init(&bnceil);
-- BN_init(&bnfloor);
-- BN_init(&bnbase);
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-+ bntarg = BN_new();
-+ bnceil = BN_new();
-+ bnfloor = BN_new();
-+ bnbase = BN_new();
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
-
-- BN_set_word(&bnbase, 58);
-+ BN_set_word(bnbase, 58);
-
- p = strlen(pfx);
-
-@@ -791,20 +791,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
-
- /* First non-zero character */
- b58top = c;
-- BN_set_word(&bntarg, c);
-+ BN_set_word(bntarg, c);
-
- } else {
-- BN_set_word(&bntmp2, c);
-- BN_mul(&bntmp, &bntarg, &bnbase, bnctx);
-- BN_add(&bntarg, &bntmp, &bntmp2);
-+ BN_set_word(bntmp2, c);
-+ BN_mul(bntmp, bntarg, bnbase, bnctx);
-+ BN_add(bntarg, bntmp, bntmp2);
- }
- }
-
- /* Power-of-two ceiling and floor values based on leading 1s */
-- BN_clear(&bntmp);
-- BN_set_bit(&bntmp, 200 - (zero_prefix * 8));
-- BN_sub(&bnceil, &bntmp, BN_value_one());
-- BN_set_bit(&bnfloor, 192 - (zero_prefix * 8));
-+ BN_clear(bntmp);
-+ BN_set_bit(bntmp, 200 - (zero_prefix * 8));
-+ BN_sub(bnceil, bntmp, BN_value_one());
-+ BN_set_bit(bnfloor, 192 - (zero_prefix * 8));
-
- bnlow = BN_new();
- bnhigh = BN_new();
-@@ -815,13 +815,13 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- * numeric boundaries of the prefix.
- */
-
-- BN_copy(&bntmp, &bnceil);
-- bnap = &bntmp;
-- bnbp = &bntmp2;
-+ BN_copy(bntmp, bnceil);
-+ bnap = bntmp;
-+ bnbp = bntmp2;
- b58pow = 0;
-- while (BN_cmp(bnap, &bnbase) > 0) {
-+ while (BN_cmp(bnap, bnbase) > 0) {
- b58pow++;
-- BN_div(bnbp, NULL, bnap, &bnbase, bnctx);
-+ BN_div(bnbp, NULL, bnap, bnbase, bnctx);
- bntp = bnap;
- bnap = bnbp;
- bnbp = bntp;
-@@ -837,11 +837,11 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- /* goto out; */
- }
-
-- BN_set_word(&bntmp2, b58pow - (p - zero_prefix));
-- BN_exp(&bntmp, &bnbase, &bntmp2, bnctx);
-- BN_mul(bnlow, &bntmp, &bntarg, bnctx);
-- BN_sub(&bntmp2, &bntmp, BN_value_one());
-- BN_add(bnhigh, bnlow, &bntmp2);
-+ BN_set_word(bntmp2, b58pow - (p - zero_prefix));
-+ BN_exp(bntmp, bnbase, bntmp2, bnctx);
-+ BN_mul(bnlow, bntmp, bntarg, bnctx);
-+ BN_sub(bntmp2, bntmp, BN_value_one());
-+ BN_add(bnhigh, bnlow, bntmp2);
-
- if (b58top <= b58ceil) {
- /* Fill out the upper range too */
-@@ -849,16 +849,16 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow2 = BN_new();
- bnhigh2 = BN_new();
-
-- BN_mul(bnlow2, bnlow, &bnbase, bnctx);
-- BN_mul(&bntmp2, bnhigh, &bnbase, bnctx);
-- BN_set_word(&bntmp, 57);
-- BN_add(bnhigh2, &bntmp2, &bntmp);
-+ BN_mul(bnlow2, bnlow, bnbase, bnctx);
-+ BN_mul(bntmp2, bnhigh, bnbase, bnctx);
-+ BN_set_word(bntmp, 57);
-+ BN_add(bnhigh2, bntmp2, bntmp);
-
- /*
- * Addresses above the ceiling will have one
- * fewer "1" prefix in front than we require.
- */
-- if (BN_cmp(&bnceil, bnlow2) < 0) {
-+ if (BN_cmp(bnceil, bnlow2) < 0) {
- /* High prefix is above the ceiling */
- check_upper = 0;
- BN_free(bnhigh2);
-@@ -866,15 +866,15 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bnceil, bnhigh2) < 0)
-+ else if (BN_cmp(bnceil, bnhigh2) < 0)
- /* High prefix is partly above the ceiling */
-- BN_copy(bnhigh2, &bnceil);
-+ BN_copy(bnhigh2, bnceil);
-
- /*
- * Addresses below the floor will have another
- * "1" prefix in front instead of our target.
- */
-- if (BN_cmp(&bnfloor, bnhigh) >= 0) {
-+ if (BN_cmp(bnfloor, bnhigh) >= 0) {
- /* Low prefix is completely below the floor */
- assert(check_upper);
- check_upper = 0;
-@@ -885,35 +885,35 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bnfloor, bnlow) > 0) {
-+ else if (BN_cmp(bnfloor, bnlow) > 0) {
- /* Low prefix is partly below the floor */
-- BN_copy(bnlow, &bnfloor);
-+ BN_copy(bnlow, bnfloor);
- }
- }
-
- } else {
-- BN_copy(bnhigh, &bnceil);
-+ BN_copy(bnhigh, bnceil);
- BN_clear(bnlow);
- }
-
- /* Limit the prefix to the address type */
-- BN_clear(&bntmp);
-- BN_set_word(&bntmp, addrtype);
-- BN_lshift(&bntmp2, &bntmp, 192);
-+ BN_clear(bntmp);
-+ BN_set_word(bntmp, addrtype);
-+ BN_lshift(bntmp2, bntmp, 192);
-
- if (check_upper) {
-- if (BN_cmp(&bntmp2, bnhigh2) > 0) {
-+ if (BN_cmp(bntmp2, bnhigh2) > 0) {
- check_upper = 0;
- BN_free(bnhigh2);
- bnhigh2 = NULL;
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnlow2) > 0)
-- BN_copy(bnlow2, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnlow2) > 0)
-+ BN_copy(bnlow2, bntmp2);
- }
-
-- if (BN_cmp(&bntmp2, bnhigh) > 0) {
-+ if (BN_cmp(bntmp2, bnhigh) > 0) {
- if (!check_upper)
- goto not_possible;
- check_upper = 0;
-@@ -924,26 +924,26 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnlow) > 0) {
-- BN_copy(bnlow, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnlow) > 0) {
-+ BN_copy(bnlow, bntmp2);
- }
-
-- BN_set_word(&bntmp, addrtype + 1);
-- BN_lshift(&bntmp2, &bntmp, 192);
-+ BN_set_word(bntmp, addrtype + 1);
-+ BN_lshift(bntmp2, bntmp, 192);
-
- if (check_upper) {
-- if (BN_cmp(&bntmp2, bnlow2) < 0) {
-+ if (BN_cmp(bntmp2, bnlow2) < 0) {
- check_upper = 0;
- BN_free(bnhigh2);
- bnhigh2 = NULL;
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnhigh2) < 0)
-- BN_copy(bnlow2, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnhigh2) < 0)
-+ BN_copy(bnlow2, bntmp2);
- }
-
-- if (BN_cmp(&bntmp2, bnlow) < 0) {
-+ if (BN_cmp(bntmp2, bnlow) < 0) {
- if (!check_upper)
- goto not_possible;
- check_upper = 0;
-@@ -954,8 +954,8 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnhigh) < 0) {
-- BN_copy(bnhigh, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnhigh) < 0) {
-+ BN_copy(bnhigh, bntmp2);
- }
-
- /* Address ranges are complete */
-@@ -976,12 +976,12 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- }
-
- out:
-- BN_clear_free(&bntarg);
-- BN_clear_free(&bnceil);
-- BN_clear_free(&bnfloor);
-- BN_clear_free(&bnbase);
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-+ BN_clear_free(bntarg);
-+ BN_clear_free(bnceil);
-+ BN_clear_free(bnfloor);
-+ BN_clear_free(bnbase);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
- if (bnhigh)
- BN_free(bnhigh);
- if (bnlow)
-@@ -1266,7 +1266,7 @@ prefix_case_iter_next(prefix_case_iter_t *cip)
- typedef struct _vg_prefix_context_s {
- vg_context_t base;
- avl_root_t vcp_avlroot;
-- BIGNUM vcp_difficulty;
-+ BIGNUM *vcp_difficulty;
- int vcp_caseinsensitive;
- } vg_prefix_context_t;
-
-@@ -1294,7 +1294,7 @@ vg_prefix_context_clear_all_patterns(vg_context_t *vcp)
- vcpp->base.vc_npatterns = 0;
- vcpp->base.vc_npatterns_start = 0;
- vcpp->base.vc_found = 0;
-- BN_clear(&vcpp->vcp_difficulty);
-+ BN_clear(vcpp->vcp_difficulty);
- }
-
- static void
-@@ -1302,7 +1302,7 @@ vg_prefix_context_free(vg_context_t *vcp)
- {
- vg_prefix_context_t *vcpp = (vg_prefix_context_t *) vcp;
- vg_prefix_context_clear_all_patterns(vcp);
-- BN_clear_free(&vcpp->vcp_difficulty);
-+ BN_clear_free(vcpp->vcp_difficulty);
- free(vcpp);
- }
-
-@@ -1314,7 +1314,7 @@ vg_prefix_context_next_difficulty(vg_prefix_context_t *vcpp,
-
- BN_clear(bntmp);
- BN_set_bit(bntmp, 192);
-- BN_div(bntmp2, NULL, bntmp, &vcpp->vcp_difficulty, bnctx);
-+ BN_div(bntmp2, NULL, bntmp, vcpp->vcp_difficulty, bnctx);
-
- dbuf = BN_bn2dec(bntmp2);
- if (vcpp->base.vc_verbose > 0) {
-@@ -1337,7 +1337,7 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- prefix_case_iter_t caseiter;
- vg_prefix_t *vp, *vp2;
- BN_CTX *bnctx;
-- BIGNUM bntmp, bntmp2, bntmp3;
-+ BIGNUM *bntmp, *bntmp2, *bntmp3;
- BIGNUM *ranges[4];
- int ret = 0;
- int i, impossible = 0;
-@@ -1346,9 +1346,9 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- char *dbuf;
-
- bnctx = BN_CTX_new();
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-- BN_init(&bntmp3);
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
-+ bntmp3 = BN_new();
-
- npfx = 0;
- for (i = 0; i < npatterns; i++) {
-@@ -1426,16 +1426,16 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- npfx++;
-
- /* Determine the probability of finding a match */
-- vg_prefix_range_sum(vp, &bntmp, &bntmp2);
-- BN_add(&bntmp2, &vcpp->vcp_difficulty, &bntmp);
-- BN_copy(&vcpp->vcp_difficulty, &bntmp2);
-+ vg_prefix_range_sum(vp, bntmp, bntmp2);
-+ BN_add(bntmp2, vcpp->vcp_difficulty, bntmp);
-+ BN_copy(vcpp->vcp_difficulty, bntmp2);
-
- if (vcp->vc_verbose > 1) {
-- BN_clear(&bntmp2);
-- BN_set_bit(&bntmp2, 192);
-- BN_div(&bntmp3, NULL, &bntmp2, &bntmp, bnctx);
-+ BN_clear(bntmp2);
-+ BN_set_bit(bntmp2, 192);
-+ BN_div(bntmp3, NULL, bntmp2, bntmp, bnctx);
-
-- dbuf = BN_bn2dec(&bntmp3);
-+ dbuf = BN_bn2dec(bntmp3);
- fprintf(stderr,
- "Prefix difficulty: %20s %s\n",
- dbuf, patterns[i]);
-@@ -1469,13 +1469,13 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- }
-
- if (npfx)
-- vg_prefix_context_next_difficulty(vcpp, &bntmp, &bntmp2, bnctx);
-+ vg_prefix_context_next_difficulty(vcpp, bntmp, bntmp2, bnctx);
-
- ret = (npfx != 0);
-
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-- BN_clear_free(&bntmp3);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
-+ BN_clear_free(bntmp3);
- BN_CTX_free(bnctx);
- return ret;
- }
-@@ -1484,39 +1484,39 @@ double
- vg_prefix_get_difficulty(int addrtype, const char *pattern)
- {
- BN_CTX *bnctx;
-- BIGNUM result, bntmp;
-+ BIGNUM *result, *bntmp;
- BIGNUM *ranges[4];
- char *dbuf;
- int ret;
- double diffret = 0.0;
-
- bnctx = BN_CTX_new();
-- BN_init(&result);
-- BN_init(&bntmp);
-+ result = BN_new();
-+ bntmp = BN_new();
-
- ret = get_prefix_ranges(addrtype,
- pattern, ranges, bnctx);
-
- if (ret == 0) {
-- BN_sub(&bntmp, ranges[1], ranges[0]);
-- BN_add(&result, &result, &bntmp);
-+ BN_sub(bntmp, ranges[1], ranges[0]);
-+ BN_add(result, result, bntmp);
- if (ranges[2]) {
-- BN_sub(&bntmp, ranges[3], ranges[2]);
-- BN_add(&result, &result, &bntmp);
-+ BN_sub(bntmp, ranges[3], ranges[2]);
-+ BN_add(result, result, bntmp);
- }
- free_ranges(ranges);
-
-- BN_clear(&bntmp);
-- BN_set_bit(&bntmp, 192);
-- BN_div(&result, NULL, &bntmp, &result, bnctx);
-+ BN_clear(bntmp);
-+ BN_set_bit(bntmp, 192);
-+ BN_div(result, NULL, bntmp, result, bnctx);
-
-- dbuf = BN_bn2dec(&result);
-+ dbuf = BN_bn2dec(result);
- diffret = strtod(dbuf, NULL);
- OPENSSL_free(dbuf);
- }
-
-- BN_clear_free(&result);
-- BN_clear_free(&bntmp);
-+ BN_clear_free(result);
-+ BN_clear_free(bntmp);
- BN_CTX_free(bnctx);
- return diffret;
- }
-@@ -1535,10 +1535,10 @@ vg_prefix_test(vg_exec_context_t *vxcp)
- * check code.
- */
-
-- BN_bin2bn(vxcp->vxc_binres, 25, &vxcp->vxc_bntarg);
-+ BN_bin2bn(vxcp->vxc_binres, 25, vxcp->vxc_bntarg);
-
- research:
-- vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, &vxcp->vxc_bntarg);
-+ vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, vxcp->vxc_bntarg);
- if (vp) {
- if (vg_exec_context_upgrade_lock(vxcp))
- goto research;
-@@ -1558,20 +1558,20 @@ vg_prefix_test(vg_exec_context_t *vxcp)
- if (vcpp->base.vc_remove_on_match) {
- /* Subtract the range from the difficulty */
- vg_prefix_range_sum(vp,
-- &vxcp->vxc_bntarg,
-- &vxcp->vxc_bntmp);
-- BN_sub(&vxcp->vxc_bntmp,
-- &vcpp->vcp_difficulty,
-- &vxcp->vxc_bntarg);
-- BN_copy(&vcpp->vcp_difficulty, &vxcp->vxc_bntmp);
-+ vxcp->vxc_bntarg,
-+ vxcp->vxc_bntmp);
-+ BN_sub(vxcp->vxc_bntmp,
-+ vcpp->vcp_difficulty,
-+ vxcp->vxc_bntarg);
-+ BN_copy(vcpp->vcp_difficulty, vxcp->vxc_bntmp);
-
- vg_prefix_delete(&vcpp->vcp_avlroot,vp);
- vcpp->base.vc_npatterns--;
-
- if (!avl_root_empty(&vcpp->vcp_avlroot))
- vg_prefix_context_next_difficulty(
-- vcpp, &vxcp->vxc_bntmp,
-- &vxcp->vxc_bntmp2,
-+ vcpp, vxcp->vxc_bntmp,
-+ vxcp->vxc_bntmp2,
- vxcp->vxc_bnctx);
- vcpp->base.vc_pattern_generation++;
- }
-@@ -1652,7 +1652,7 @@ vg_prefix_context_new(int addrtype, int privtype, int caseinsensitive)
- vcpp->base.vc_test = vg_prefix_test;
- vcpp->base.vc_hash160_sort = vg_prefix_hash160_sort;
- avl_root_init(&vcpp->vcp_avlroot);
-- BN_init(&vcpp->vcp_difficulty);
-+ vcpp->vcp_difficulty = BN_new();
- vcpp->vcp_caseinsensitive = caseinsensitive;
- }
- return &vcpp->base;
-@@ -1778,21 +1778,21 @@ vg_regex_test(vg_exec_context_t *vxcp)
- unsigned char hash1[32], hash2[32];
- int i, zpfx, p, d, nres, re_vec[9];
- char b58[40];
-- BIGNUM bnrem;
-+ BIGNUM *bnrem;
- BIGNUM *bn, *bndiv, *bnptmp;
- int res = 0;
-
- pcre *re;
-
-- BN_init(&bnrem);
-+ bnrem = BN_new();
-
- /* Hash the hash and write the four byte check code */
- SHA256(vxcp->vxc_binres, 21, hash1);
- SHA256(hash1, sizeof(hash1), hash2);
- memcpy(&vxcp->vxc_binres[21], hash2, 4);
-
-- bn = &vxcp->vxc_bntmp;
-- bndiv = &vxcp->vxc_bntmp2;
-+ bn = vxcp->vxc_bntmp;
-+ bndiv = vxcp->vxc_bntmp2;
-
- BN_bin2bn(vxcp->vxc_binres, 25, bn);
-
-@@ -1801,11 +1801,11 @@ vg_regex_test(vg_exec_context_t *vxcp)
- p = sizeof(b58) - 1;
- b58[p] = '\0';
- while (!BN_is_zero(bn)) {
-- BN_div(bndiv, &bnrem, bn, &vxcp->vxc_bnbase, vxcp->vxc_bnctx);
-+ BN_div(bndiv, bnrem, bn, vxcp->vxc_bnbase, vxcp->vxc_bnctx);
- bnptmp = bn;
- bn = bndiv;
- bndiv = bnptmp;
-- d = BN_get_word(&bnrem);
-+ d = BN_get_word(bnrem);
- b58[--p] = vg_b58_alphabet[d];
- }
- while (zpfx--) {
-@@ -1878,7 +1878,7 @@ vg_regex_test(vg_exec_context_t *vxcp)
- res = 1;
- }
- out:
-- BN_clear_free(&bnrem);
-+ BN_clear_free(bnrem);
- return res;
- }
-
-diff --git a/pattern.h b/pattern.h
-index 3ce2d1f..0b604ea 100644
---- a/pattern.h
-+++ b/pattern.h
-@@ -51,10 +51,10 @@ struct _vg_exec_context_s {
- EC_KEY *vxc_key;
- int vxc_delta;
- unsigned char vxc_binres[28];
-- BIGNUM vxc_bntarg;
-- BIGNUM vxc_bnbase;
-- BIGNUM vxc_bntmp;
-- BIGNUM vxc_bntmp2;
-+ BIGNUM *vxc_bntarg;
-+ BIGNUM *vxc_bnbase;
-+ BIGNUM *vxc_bntmp;
-+ BIGNUM *vxc_bntmp2;
-
- vg_exec_context_threadfunc_t vxc_threadfunc;
- pthread_t vxc_pthread;
-diff --git a/util.c b/util.c
-index 4f3cbb8..35cd592 100644
---- a/util.c
-+++ b/util.c
-@@ -110,19 +110,19 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
-
- BN_CTX *bnctx;
- BIGNUM *bn, *bndiv, *bntmp;
-- BIGNUM bna, bnb, bnbase, bnrem;
-+ BIGNUM *bna, *bnb, *bnbase, *bnrem;
- unsigned char *binres;
- int brlen, zpfx;
-
- bnctx = BN_CTX_new();
-- BN_init(&bna);
-- BN_init(&bnb);
-- BN_init(&bnbase);
-- BN_init(&bnrem);
-- BN_set_word(&bnbase, 58);
-+ bna = BN_new();
-+ bnb = BN_new();
-+ bnbase = BN_new();
-+ bnrem = BN_new();
-+ BN_set_word(bnbase, 58);
-
-- bn = &bna;
-- bndiv = &bnb;
-+ bn = bna;
-+ bndiv = bnb;
-
- brlen = (2 * len) + 4;
- binres = (unsigned char*) malloc(brlen);
-@@ -154,11 +154,11 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
-
- p = brlen;
- while (!BN_is_zero(bn)) {
-- BN_div(bndiv, &bnrem, bn, &bnbase, bnctx);
-+ BN_div(bndiv, bnrem, bn, bnbase, bnctx);
- bntmp = bn;
- bn = bndiv;
- bndiv = bntmp;
-- d = BN_get_word(&bnrem);
-+ d = BN_get_word(bnrem);
- binres[--p] = vg_b58_alphabet[d];
- }
-
-@@ -170,10 +170,10 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
- result[brlen - p] = '\0';
-
- free(binres);
-- BN_clear_free(&bna);
-- BN_clear_free(&bnb);
-- BN_clear_free(&bnbase);
-- BN_clear_free(&bnrem);
-+ BN_clear_free(bna);
-+ BN_clear_free(bnb);
-+ BN_clear_free(bnbase);
-+ BN_clear_free(bnrem);
- BN_CTX_free(bnctx);
- }
-
-@@ -185,7 +185,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- {
- int i, l, c;
- unsigned char *xbuf = NULL;
-- BIGNUM bn, bnw, bnbase;
-+ BIGNUM *bn, *bnw, *bnbase;
- BN_CTX *bnctx;
- unsigned char hash1[32], hash2[32];
- unsigned char groestlhash1[64];
-@@ -193,10 +193,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- int zpfx;
- int res = 0;
-
-- BN_init(&bn);
-- BN_init(&bnw);
-- BN_init(&bnbase);
-- BN_set_word(&bnbase, 58);
-+ bn = BN_new();
-+ bnw = BN_new();
-+ bnbase = BN_new();
-+ BN_set_word(bnbase, 58);
- bnctx = BN_CTX_new();
-
- /* Build a bignum from the encoded value */
-@@ -207,10 +207,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- c = vg_b58_reverse_map[(int)input[i]];
- if (c < 0)
- goto out;
-- BN_clear(&bnw);
-- BN_set_word(&bnw, c);
-- BN_mul(&bn, &bn, &bnbase, bnctx);
-- BN_add(&bn, &bn, &bnw);
-+ BN_clear(bnw);
-+ BN_set_word(bnw, c);
-+ BN_mul(bn, bn, bnbase, bnctx);
-+ BN_add(bn, bn, bnw);
- }
-
- /* Copy the bignum to a byte buffer */
-@@ -221,7 +221,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- break;
- zpfx++;
- }
-- c = BN_num_bytes(&bn);
-+ c = BN_num_bytes(bn);
- l = zpfx + c;
- if (l < 5)
- goto out;
-@@ -231,7 +231,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- if (zpfx)
- memset(xbuf, 0, zpfx);
- if (c)
-- BN_bn2bin(&bn, xbuf + zpfx);
-+ BN_bn2bin(bn, xbuf + zpfx);
-
- /* Check the hash code */
- l -= 4;
-@@ -270,9 +270,9 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- out:
- if (xbuf)
- free(xbuf);
-- BN_clear_free(&bn);
-- BN_clear_free(&bnw);
-- BN_clear_free(&bnbase);
-+ BN_clear_free(bn);
-+ BN_clear_free(bnw);
-+ BN_clear_free(bnbase);
- BN_CTX_free(bnctx);
- return res;
- }
-@@ -420,7 +420,7 @@ vg_set_privkey(const BIGNUM *bnpriv, EC_KEY *pkey)
- int
- vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
- {
-- BIGNUM bnpriv;
-+ BIGNUM *bnpriv;
- unsigned char ecpriv[48];
- int res, ret;
-
-@@ -430,10 +430,10 @@ vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
-
- ret = res - 32;
-
-- BN_init(&bnpriv);
-- BN_bin2bn(ecpriv + 1, 32, &bnpriv);
-- res = vg_set_privkey(&bnpriv, pkey);
-- BN_clear_free(&bnpriv);
-+ bnpriv = BN_new();
-+ BN_bin2bn(ecpriv + 1, 32, bnpriv);
-+ res = vg_set_privkey(bnpriv, pkey);
-+ BN_clear_free(bnpriv);
- *addrtype = ecpriv[0];
- return ret;
- }
-@@ -632,15 +632,15 @@ vg_protect_crypt(int parameter_group,
- salt_len = 4;
- hmac_len = 8;
- hmac_keylen = 16;
-- ciphertext_len = ((plaintext_len + cipher->block_size - 1) /
-- cipher->block_size) * cipher->block_size;
-+ ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher) - 1) /
-+ EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
- pkcs7_padding = 0;
- hmac_digest = EVP_sha256();
- } else {
- /* PKCS-compliant encoding */
- salt_len = 8;
-- ciphertext_len = ((plaintext_len + cipher->block_size) /
-- cipher->block_size) * cipher->block_size;
-+ ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher)) /
-+ EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
- hmac_digest = NULL;
- }
-
-@@ -666,12 +666,12 @@ vg_protect_crypt(int parameter_group,
- salt, salt_len,
- params->iterations,
- pbkdf_digest,
-- cipher->key_len + cipher->iv_len + hmac_keylen,
-+ EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher) + hmac_keylen,
- keymaterial);
-
- if (!EVP_CipherInit(ctx, cipher,
- keymaterial,
-- keymaterial + cipher->key_len,
-+ keymaterial + EVP_CIPHER_key_length(cipher),
- enc)) {
- fprintf(stderr, "ERROR: could not configure cipher\n");
- goto out;
-@@ -707,7 +707,7 @@ vg_protect_crypt(int parameter_group,
- if (hmac_len) {
- hlen = sizeof(hmac);
- HMAC(hmac_digest,
-- keymaterial + cipher->key_len + cipher->iv_len,
-+ keymaterial + EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher),
- hmac_keylen,
- enc ? data_in : data_out, plaintext_len,
- hmac, &hlen);
-@@ -786,7 +786,7 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
- {
- unsigned char ecpriv[64];
- unsigned char ecenc[128];
-- BIGNUM bn;
-+ BIGNUM *bn;
- int restype;
- int res;
-
-@@ -810,10 +810,10 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
-
- res = 1;
- if (pkey) {
-- BN_init(&bn);
-- BN_bin2bn(ecpriv, 32, &bn);
-- res = vg_set_privkey(&bn, pkey);
-- BN_clear_free(&bn);
-+ bn = BN_new();
-+ BN_bin2bn(ecpriv, 32, bn);
-+ res = vg_set_privkey(bn, pkey);
-+ BN_clear_free(bn);
- OPENSSL_cleanse(ecpriv, sizeof(ecpriv));
- }
-
-diff --git a/vanitygen.c b/vanitygen.c
-index fb7925a..992e5d7 100644
---- a/vanitygen.c
-+++ b/vanitygen.c
-@@ -94,8 +94,8 @@ vg_thread_loop(void *arg)
- exit(1);
- }
-
-- BN_set_word(&vxcp->vxc_bntmp, ptarraysize);
-- EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, ptarraysize);
-+ EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
-
-@@ -139,13 +139,13 @@ vg_thread_loop(void *arg)
- npoints = 0;
-
- /* Determine rekey interval */
-- EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp,
-+ EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp,
- vxcp->vxc_bnctx);
-- BN_sub(&vxcp->vxc_bntmp2,
-- &vxcp->vxc_bntmp,
-+ BN_sub(vxcp->vxc_bntmp2,
-+ vxcp->vxc_bntmp,
- EC_KEY_get0_private_key(pkey));
-- rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
-- if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
-+ rekey_at = BN_get_word(vxcp->vxc_bntmp2);
-+ if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
- rekey_at = rekey_max;
- assert(rekey_at > 0);
-
diff --git a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch b/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
deleted file mode 100644
index 5ee30ae08cdf..000000000000
--- a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 5f163e6fff7da52c4aecbd898d9df2e60a56f134 Mon Sep 17 00:00:00 2001
-From: DesWurstes <DesWurstes@users.noreply.github.com>
-Date: Sun, 3 Jun 2018 17:46:16 +0300
-Subject: [PATCH] Privkey prefix OpenSSL 1.1 compatibility (#116)
-
-Fixes #114
----
- oclengine.c | 18 +++++++++++++-----
- vanitygen.c | 12 ++++++++++--
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/oclengine.c b/oclengine.c
-index 6585fc6..c69bd4b 100644
---- a/oclengine.c
-+++ b/oclengine.c
-@@ -5,7 +5,7 @@
- * Vanitygen is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
-- * any later version.
-+ * any later version.
- *
- * Vanitygen is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-@@ -1058,7 +1058,7 @@ vg_ocl_kernel_arg_alloc(vg_ocl_context_t *vocp, int slot,
- karg,
- sizeof(clbuf),
- &clbuf);
--
-+
- if (ret) {
- fprintf(stderr,
- "clSetKernelArg(%d,%d): ", knum, karg);
-@@ -1090,7 +1090,7 @@ vg_ocl_copyout_arg(vg_ocl_context_t *vocp, int wslot, int arg,
- buffer,
- 0, NULL,
- NULL);
--
-+
- if (ret) {
- fprintf(stderr, "clEnqueueWriteBuffer(%d): ", arg);
- vg_ocl_error(vocp, ret, NULL);
-@@ -2079,7 +2079,15 @@ vg_opencl_loop(vg_exec_context_t *arg)
- npoints = 0;
- if (vcp->vc_privkey_prefix_length > 0) {
- BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
-- memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ unsigned char pkey_arr[32];
-+ assert(BN_bn2bin(pkbn, pkey_arr) < 33);
-+ memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
-+ int k = pkey_arr[i];
-+ pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
-+ pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
-+ }
-+ BN_bin2bn(pkey_arr, 32, pkbn);
- EC_KEY_set_private_key(pkey, pkbn);
-
- EC_POINT *origin = EC_POINT_new(pgroup);
-@@ -2240,7 +2248,7 @@ vg_opencl_loop(vg_exec_context_t *arg)
- slot_busy = 1;
- slot = (slot + 1) % nslots;
-
-- } else {
-+ } else {
- if (slot_busy) {
- pthread_mutex_lock(&vocp->voc_lock);
- while (vocp->voc_ocl_slot != -1) {
-diff --git a/vanitygen.c b/vanitygen.c
-index 992e5d7..5e49df7 100644
---- a/vanitygen.c
-+++ b/vanitygen.c
-@@ -129,7 +129,15 @@ vg_thread_loop(void *arg)
- EC_KEY_generate_key(pkey);
- if (vcp->vc_privkey_prefix_length > 0) {
- BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
-- memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ unsigned char pkey_arr[32];
-+ assert(BN_bn2bin(pkbn, pkey_arr) < 33);
-+ memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
-+ int k = pkey_arr[i];
-+ pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
-+ pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
-+ }
-+ BN_bin2bn(pkey_arr, 32, pkbn);
- EC_KEY_set_private_key(pkey, pkbn);
-
- EC_POINT *origin = EC_POINT_new(pgroup);
-@@ -1395,7 +1403,7 @@ main(int argc, char **argv)
- addrtype = 60;
- privtype = 128;
- break;
-- }
-+ }
- break;
-
- /*END ALTCOIN GENERATOR*/
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
deleted file mode 100644
index 624ac859d5d2..000000000000
--- a/srcpkgs/vanitygen/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'vanitygen'
-pkgname=vanitygen
-version=1.53
-revision=2
-makedepends="pcre-devel openssl-devel"
-short_desc="Bitcoin vanity address generator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="AGPL-3.0-or-later"
-homepage="https://github.com/exploitagency/vanitygen-plus"
-changelog="https://raw.githubusercontent.com/exploitagency/vanitygen-plus/master/CHANGELOG"
-distfiles="https://github.com/exploitagency/vanitygen-plus/archive/PLUS${version}.tar.gz"
-checksum=976a9afe2a4470551a8b6b0da97101a3a2e6c54c5a26dc870ae755bb2d8c7041
-
-do_build() {
- make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
-}
-do_install() {
- vbin vanitygen
- vbin keyconv
- vlicense LICENSE
-}
From 1ac86079fe807b735f13b450b58f6e5cc80144fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 13:31:17 -0500
Subject: [PATCH 214/356] FreeRADIUS: update to 3.0.26
---
srcpkgs/FreeRADIUS/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index b43aaa1f2e6e..ee2059a373b4 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,6 +1,6 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
-version=3.0.23
+version=3.0.26
revision=1
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://freeradius.org"
distfiles="https://github.com/FreeRADIUS/freeradius-server/archive/release_${version//./_}.tar.gz"
-checksum=6192b6a8d141545dc54c00c1a7af7f502f990418d780dcae76074163070dbb86
+checksum=6aea98d6126035e7ccca483d8b3faea447030169639807017ec98985b78fb2ca
nocross=yes # Not supported by upstream
system_accounts="_freeradius"
make_dirs="/etc/raddb 0750 _freeradius _freeradius"
From bd609e7996dfebd648442b8207772585997a28de Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 1 Jan 2023 23:09:52 +0100
Subject: [PATCH 215/356] New package: vlna-1.5
---
srcpkgs/vlna/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/vlna/template
diff --git a/srcpkgs/vlna/template b/srcpkgs/vlna/template
new file mode 100644
index 000000000000..68a4f29888c3
--- /dev/null
+++ b/srcpkgs/vlna/template
@@ -0,0 +1,11 @@
+# Template file for 'vlna'
+pkgname=vlna
+version=1.5
+revision=1
+build_style=gnu-configure
+short_desc="Adding Czech & Slovak non-breaking spaces to TeX and other files"
+maintainer="Emil Miler <em@0x45.cz>"
+license="LPPL-1.0"
+homepage="https://petr.olsak.net/ftp/olsak/vlna/"
+distfiles="https://petr.olsak.net/ftp/olsak/vlna/vlna-${version}.tar.gz"
+checksum=0d79955ec138760fa48dcddd73ed0bac4a81d31e99cb8929a05550373b4f4bfb
From 54c9417c39bfa07b931439e2bdacbd506fe1deb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 1 Feb 2023 16:19:17 +0100
Subject: [PATCH 216/356] doctl: update to 1.92.1.
---
srcpkgs/doctl/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a326998da8ed..43444534cf5c 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.92.0
+version=1.92.1
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -13,5 +13,6 @@ short_desc="Command line tool for DigitalOcean services"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
+changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=0ecab3a37731722f1af5085429ce5c94402a8c665233e80f148570231bb16d5b
+checksum=4d1b53ee473f4320fbbd834d364497acc31ba5dd5a4504d71c8b9eecfe9d76d6
From c88c1b364845ef763a6430e50a9c7b139291e890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 18 Jan 2023 08:11:01 +0100
Subject: [PATCH 217/356] gifski: update to 1.10.0.
---
srcpkgs/gifski/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index e585635a4f0e..e2466f4e57ef 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
# Template file for 'gifski'
pkgname=gifski
-version=1.8.1
+version=1.10.0
revision=1
build_style=cargo
configure_args="--features=openmp"
@@ -9,8 +9,9 @@ short_desc="Highest-quality GIF encoder based on pngquant"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="AGPL-3.0-only"
homepage="https://gif.ski"
+changelog="https://github.com/ImageOptim/gifski/releases"
distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=9c06e0124a5bde4d70fe44cc8be52ffc9b9099548fc34cac1db43c4a6ff8783c
+checksum=cc536bd3e73c302264cd2add460d9a270c66c545759dcd60cbfc7d365768c656
post_install() {
vlicense LICENSE
From 4be7f7261aa35934a277598bc09d5525f6c6ba53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 21:02:56 +0100
Subject: [PATCH 218/356] python3-ansible-compat: update to 3.0.1.
---
srcpkgs/python3-ansible-compat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 6119c3bc6817..4f24371ccc7e 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ansible-compat'
pkgname=python3-ansible-compat
-version=2.2.7
+version=3.0.1
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -9,8 +9,8 @@ short_desc="Python package for working with various version of ansible"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/ansible/ansible-compat"
-distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=08deddcd0a1dc6baabe674b07c6ff882118492c123d281f56f01905271a7ffc4
+distfiles="${PYPI_SITE}/a/ansible-compat/ansible-compat-${version}.tar.gz"
+checksum=d7dc5e4b7fade9b7375c568a24475b7be81024cac2a20caef3260ef0b51287b4
post_patch() {
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
From 277cb04e17da6f55f93d00a3860c2e8471ac9361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 21:03:05 +0100
Subject: [PATCH 219/356] python3-ansible-lint: update to 6.12.0.
---
srcpkgs/python3-ansible-lint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index bd14f14474cb..caf694a16080 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ansible-lint'
pkgname=python3-ansible-lint
-version=6.11.0
+version=6.12.0
revision=1
build_style=python3-pep517
make_install_target="dist/ansible_lint-*-*-*-*.whl"
@@ -18,7 +18,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/ansible/ansible-lint"
distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=348ac356c3817a6db98fb6993ec17b5b236c16312238759f0a3f14f3543a9e50
+checksum=887e88262dbd9e2cbb5b7a70a94d945a8a2791d1467cf30af49c22b60899b40b
# cba anymore, the list of failing tests changes with every update
make_check="no"
From d248a92d9ebae08bbacfc2a07c485982064cc62a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 28 Jan 2023 01:19:46 +0530
Subject: [PATCH 220/356] gscreenshot: update to 3.3.0.
---
srcpkgs/gscreenshot/template | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 008172670ed4..a9af8ac0d8ee 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,15 +1,20 @@
# Template file for 'gscreenshot'
pkgname=gscreenshot
-version=2.17.1
-revision=2
+version=3.3.0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools gettext"
-depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"
-short_desc="GUI front-end for the scrot program"
+hostmakedepends="python3-setuptools gettext go-md2man"
+# refer to https://github.com/thenaterhood/gscreenshot#installation
+# for optional dependencies across system configurations
+depends="gtk+3 python3-setuptools python3-Pillow python3-gobject"
+checkdepends="${depends} python3-mock python3-pytest"
+short_desc="GUI for multiple screenshot backends including scrot, PIL, and grim"
maintainer="Rui Flora <rui.flora@gmail.com>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
homepage="https://github.com/thenaterhood/gscreenshot"
-distfiles="https://github.com/thenaterhood/gscreenshot/archive/v${version}.tar.gz"
-checksum=f0cdf81e9ab483e11c04ed27141ac37dd6f24415968bc5f4c874e7b17ca5958d
-# doesn't ship any tests
-make_check=no
+distfiles="https://github.com/thenaterhood/gscreenshot/archive/refs/tags/v${version}.tar.gz"
+checksum=f05e695676cda97483c6cdbebaba9a708b5791e544e977016a772325a1d37231
+
+do_check() {
+ (cd src && PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest ../test)
+}
From 4c84ed49aeb577d038b6a445fe9193902407e553 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 00:10:31 +0000
Subject: [PATCH 221/356] python3-pythondialog: update to 3.5.3.
---
srcpkgs/python3-pythondialog/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pythondialog/template b/srcpkgs/python3-pythondialog/template
index 76cc1bd41b2b..097380fd92d1 100644
--- a/srcpkgs/python3-pythondialog/template
+++ b/srcpkgs/python3-pythondialog/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pythondialog'
pkgname=python3-pythondialog
-version=3.5.1
-revision=4
+version=3.5.3
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
@@ -9,6 +9,7 @@ depends="python3 dialog"
short_desc="Python wrapper for the dialog utility"
maintainer="svenper <svenper@tuta.io>"
license="LGPL-2.1-or-later"
-homepage="http://pythondialog.sourceforge.net"
+homepage="https://pythondialog.sourceforge.io"
+changelog="https://pythondialog.sourceforge.io/news.html"
distfiles="${PYPI_SITE}/p/pythondialog/pythondialog-${version}.tar.gz"
-checksum=34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8
+checksum=b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323
From c415fa3d7f230bda5b24ab617371106a2fd8c60e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 23 Jan 2023 21:41:40 +0000
Subject: [PATCH 222/356] libheif: update to 1.14.2.
---
srcpkgs/libheif/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 48b4279b9f3a..59d6fe2778c2 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,18 +1,18 @@
# Template file for 'libheif'
pkgname=libheif
-version=1.12.0
-revision=3
+version=1.14.2
+revision=1
build_style=gnu-configure
-configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="LGPL-3.0-or-later"
-homepage="http://www.libheif.org"
+homepage="https://github.com/strukturag/libheif"
+changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=086145b0d990182a033b0011caadb1b642da84f39ab83aa66d005610650b3c65
+checksum=e9c88e75e3b7fad9df32e42d28646752de2679df57efddfb3f63cd25110ce9d9
pre_configure() {
./autogen.sh
From d640a72dd28787994b6750e1aaf00e23584db932 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:15:09 +0000
Subject: [PATCH 223/356] fontconfig: update to 2.14.2.
---
srcpkgs/fontconfig/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 636df1d5da7b..bb76f8f95d24 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,6 +1,6 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.14.1
+version=2.14.2
revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
@@ -12,12 +12,12 @@ short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
-checksum=298e883f6e11d2c5e6d53c8a8394de58d563902cfab934e6be12fb5a5f361ef0
+distfiles="${FREEDESKTOP_SITE}/fontconfig/release/fontconfig-${version}.tar.xz"
+checksum=dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
post_install() {
if [ "$CROSS_BUILD" ]; then
- sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
+ vsed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
fi
vlicense COPYING
}
From d26a8702c6c88433cd406e8d32a7952d810c16f9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 31 Jan 2023 20:54:11 +0000
Subject: [PATCH 224/356] popt: update to 1.19.
---
srcpkgs/popt/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index e7eabf2b1f07..3973f667d917 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -1,15 +1,16 @@
# Template file for 'popt'
pkgname=popt
-version=1.18
+version=1.19
revision=1
build_style=gnu-configure
hostmakedepends="autoconf tar automake libtool gettext-devel"
short_desc="Command line option parsing library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://rpm.org/"
-distfiles="http://ftp.rpm.org/popt/releases/popt-1.x/popt-${version}.tar.gz"
-checksum=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1
+homepage="https://github.com/rpm-software-management/popt"
+changelog="https://github.com/rpm-software-management/popt/releases"
+distfiles="https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"
+checksum=c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9
pre_configure() {
./autogen.sh
@@ -20,7 +21,7 @@ post_install() {
}
popt-devel_package() {
- depends="popt>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From ad5eb4c39868559181a0e67f8a3d6973c27a8670 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:45:43 +0000
Subject: [PATCH 225/356] libcap: update to 2.67.
---
srcpkgs/libcap/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 13c13bcd2822..b1586d3dd7ac 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
# Template file for 'libcap'
pkgname=libcap
-version=2.54
+version=2.67
revision=1
bootstrap=yes
build_style=gnu-makefile
@@ -10,20 +10,15 @@ make_use_env=yes
short_desc="POSIX.1e capabilities suite"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-only"
-homepage="http://sites.google.com/site/fullycapable/"
+homepage="https://sites.google.com/site/fullycapable/"
changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
-distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f
+distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz"
+checksum=ce9b22fdc271beb6dae7543da5f74cf24cb82e6848cfd088a5a069dec5ea5198
if [ "$CROSS_BUILD" ]; then
make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-fi
-
-if [ "$CHROOT_READY" ]; then
- hostmakedepends="perl"
- if [ -z "$CROSS_BUILD" ]; then
- hostmakedepends+=" gperf"
- fi
+elif [ "$CHROOT_READY" ]; then
+ hostmakedepends="gperf"
fi
libcap-devel_package() {
From 4b15b137dba7707b19fa8c16770aebf49e0c23d8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:36:30 +0000
Subject: [PATCH 226/356] ghostscript: update to 10.0.0.
---
common/shlibs | 2 +-
srcpkgs/ghostscript/patches/fix-cross.patch | 37 +++++++++++++++++++
.../fix_gscms_transform_color_typo.patch | 11 ------
srcpkgs/ghostscript/template | 8 ++--
4 files changed, 43 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/ghostscript/patches/fix-cross.patch
delete mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..3042ced11d4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1059,7 +1059,7 @@ libcupscgi.so.1 libcups-1.5.3_1
libcups.so.2 libcups-1.5.3_1
libcupsimage.so.2 libcups-1.5.3_1
libijs-0.35.so libijs-0.8_1
-libgs.so.9 libgs-0.8_1
+libgs.so.10 libgs-10.0.0_1
libssh2.so.1 libssh2-1.9.0_3
libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
libsnmp.so.40 libnet-snmp-5.9_2
diff --git a/srcpkgs/ghostscript/patches/fix-cross.patch b/srcpkgs/ghostscript/patches/fix-cross.patch
new file mode 100644
index 000000000000..d3f70b435bb3
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/fix-cross.patch
@@ -0,0 +1,37 @@
+From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 24 Nov 2022 16:33:47 +0000
+Subject: [PATCH] Fix a little bitrot in the cross-compiling logic
+
+Removing the option to disable FAPI meant configuring for cross compiling would
+fail because the option being passed to the sub-call to configure would include
+an unknown command line option.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d5c68c4b3..738eb10a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then
+ echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
+
+ AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)])
+- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
++ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
+ status=$?
+ cp config.log "$olddir/configaux.log"
+ if test $status -eq 0 ; then
+@@ -2530,7 +2530,7 @@ PDF=
+ PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+ PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+
+-if test x"$with_pdf" != x"no" ; then
++if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then
+
+ if test x"$JBIG2_DECODER" = x""; then
+ AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support])
+--
+2.25.1
+
diff --git a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
deleted file mode 100644
index 9ffa2e09ba66..000000000000
--- a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./base/gsicc_lcms2.c.jlg 2021-09-27 03:44:02.000000000 -0400
-+++ ./base/gsicc_lcms2.c 2021-10-05 10:50:03.428000000 -0400
-@@ -462,7 +462,7 @@
- gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
- void *outputcolor, int num_bytes)
- {
-- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
-+ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
- }
-
- int
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 8bce83846ad8..dce91a71ae0e 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,6 +1,6 @@
# Template file for 'ghostscript'
pkgname=ghostscript
-version=9.55.0
+version=10.0.0
revision=1
hostmakedepends="automake libtool pkg-config"
makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
@@ -10,9 +10,9 @@ short_desc="Interpreter for the PostScript language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later, CPL-1.0"
homepage="https://www.ghostscript.com/"
-changelog="https://www.ghostscript.com/doc/${version}/News.htm"
+changelog="https://ghostscript.readthedocs.io/en/latest/News.html"
distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
+checksum=f1fa585f7c7d32adfa81ab389388100ac9df83444eb64db1fb92737141ef9f61
build_options="cups"
build_options_default="cups"
@@ -28,6 +28,8 @@ pre_configure() {
# add missing LDFLAGS
sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
+ autoreconf -fi
+
cd ijs
autoreconf -fi
}
From 88d9cc6826523e631f38efcbed47492ec7495d6c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:25 +0000
Subject: [PATCH 227/356] gimp: revbump for libgs-10.0.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index fb6cb95ff96c..98fe2d367bd3 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.32
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 4292080cdad4148645a58e67a5e6d42173c7d2a9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:25 +0000
Subject: [PATCH 228/356] ImageMagick: revbump for libgs-10.0.0.
---
srcpkgs/ImageMagick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index e98161479198..373154f1e856 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
version=7.1.0.60
-revision=1
+revision=2
_upstream_version="${version/.${version##*.}/-${version##*.}}"
build_style=gnu-configure
configure_args="--disable-static --enable-opencl --with-modules --with-gslib
From d8cc6223e6be543c0dd55e2932f3d57b0660b332 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:26 +0000
Subject: [PATCH 229/356] libspectre: revbump for libgs-10.0.0.
---
srcpkgs/libspectre/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template
index b8afe7840c9b..64fdd6e8ec3a 100644
--- a/srcpkgs/libspectre/template
+++ b/srcpkgs/libspectre/template
@@ -1,7 +1,7 @@
# Template file for 'libspectre'
pkgname=libspectre
version=0.2.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
makedepends="ghostscript-devel"
From 0c06db8c9ac63000cc0a13af4a83b9472ddba1a7 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 6 Feb 2023 07:56:01 +1000
Subject: [PATCH 230/356] k9s: update to 0.27.2
---
srcpkgs/k9s/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5fc1cbe54f73..0246edccc7ab 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
# Template file for 'k9s'
pkgname=k9s
-version=0.26.7
+version=0.27.2
revision=1
build_style=go
go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://k9scli.io/"
distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=33365e0773210f50013ae3b8e749269b27ff4c7624e8ab17e1a81bfe0c8879dd
+checksum=893b8f3059868944dc74f8c0a175fd4305a8286910c5cdab1f0d7e70719b59c1
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From 321818211e0c2ce873a89aa49f0013de03e9caad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 5 Feb 2023 18:33:53 -0600
Subject: [PATCH 231/356] ffuf: update to 2.0.0.
---
srcpkgs/ffuf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 0b697718c45a..9b1fb612e6f9 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
# Template file for 'ffuf'
pkgname=ffuf
-version=1.5.0
+version=2.0.0
revision=1
build_style=go
go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/ffuf/ffuf"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=70dc411c014c826f9c8a7b021e01d5bc50e2cba17e0dcc4df3e2e2574ad12073
+checksum=bc27b19ed78b31862b1922a3adb66839cdf58c9b799a715c206709a73e2583d0
post_install() {
vlicense LICENSE
From 09eb9036e5514bf35a2088502bb0a0a1c2066c1e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 31 Jan 2023 09:17:44 -0500
Subject: [PATCH 232/356] umurmur: patch for openssl3
---
.../umurmur/patches/remove-crypto-mem-ctrl.patch | 16 ++++++++++++++++
srcpkgs/umurmur/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
diff --git a/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch b/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
new file mode 100644
index 000000000000..17a9e5b3b0d2
--- /dev/null
+++ b/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
@@ -0,0 +1,16 @@
+From: https://git.alpinelinux.org/aports/plain/main/umurmur/remove-crypto-mem-ctrl.patch
+
+fix build with OpenSSL 3
+
+--- umurmur-0.2.20.orig/src/ssli_openssl.c
++++ umurmur-0.2.20/src/ssli_openssl.c
+@@ -142,8 +142,6 @@
+
+ Log_info("Generating new server certificate.");
+
+- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+-
+ x509 = X509_new();
+ if (!x509)
+ goto err_out;
+
diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 11eb69f05b07..a5690d44de4b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,7 +1,7 @@
# Template file for 'umurmur'
pkgname=umurmur
version=0.2.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-shmapi --with-ssl=openssl"
conf_files="/etc/umurmur/umurmur.conf"
From ae5c04bd1c7da04f2362b22f0b4c4c676abaf78b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 3 Feb 2023 12:37:41 +0530
Subject: [PATCH 233/356] iwd: update to 2.3.
---
srcpkgs/iwd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 17c0799ce7be..e4f73dc1c4ad 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
# Template file for 'iwd'
pkgname=iwd
-version=2.2
+version=2.3
revision=1
build_style=gnu-configure
configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="https://iwd.wiki.kernel.org/"
changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570
+checksum=b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64
make_dirs="/var/lib/iwd 0600 root root
/var/lib/ead 0600 root root
/etc/iwd 755 root root"
From f9f7be5f38167cca189d16e7e881039fc548ab69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 6 Feb 2023 16:07:08 +0100
Subject: [PATCH 234/356] homebank: update to 5.6.2.
---
srcpkgs/homebank/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index f2264827e245..c54158bfdb7a 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
# Template file for 'homebank'
pkgname=homebank
-version=5.6.1
+version=5.6.2
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://homebank.free.fr/"
distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=3a489c31c553269ab8aa014fdd0eea90fc21d5715e8c1dc5d0feaf730ef38f0f
+checksum=12ebde58e04d3c18496f95496067c4e8841b0d111668d1f47c239292b15316f1
post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From ac7a37ac2619fdd249f65483b566b60322e89d8e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 13:01:31 -0500
Subject: [PATCH 235/356] dnscrypt-proxy: update to 2.1.3, adopt
---
srcpkgs/dnscrypt-proxy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index fa49259e6355..4172fd0a9d5a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,17 +1,17 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
-version=2.1.2
+version=2.1.3
revision=1
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
go_package="${go_import_path}/dnscrypt-proxy"
short_desc="DNS proxy that encrypts queries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=aa55fd52b9c1b983405bf98b42ec754f5d6f59b429ba9c98115df617eef5dea4
+checksum=6163ab3169edd2158f585dff2ddba416b2d29fd4b44b4cc794365fca666a726a
conf_files="/etc/dnscrypt-proxy.toml"
system_accounts="dnscrypt_proxy"
make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
From b53f224ed4bb8d8ed8e19697d5bc7209eaf0b7c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:09:28 -0500
Subject: [PATCH 236/356] aravis: update to 0.8.24.
---
srcpkgs/aravis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 1d9c727f9ba7..d0f1c1be1615 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -1,6 +1,6 @@
# Template file for 'aravis'
pkgname=aravis
-version=0.8.22
+version=0.8.24
revision=1
build_style=meson
configure_args="-Ddocumentation=enabled"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/AravisProject/aravis"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b95187e7cea9533ac5f2f79cd84f9f8ce7247f03c110199998849e934989fcc9
+checksum=1504503b057b97e8cdb95decf84a2f348012eda4a4f45b9fe7b7eadb4b809990
# Network test causes timeout in CI
make_check=ci-skip
From 969e8dbcd6024656379cc4517a51f44ed7157835 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:32:11 -0500
Subject: [PATCH 237/356] maturin: update to 0.14.12.
---
srcpkgs/maturin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 236bf50a72d8..a24314a84c50 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
# Template file for 'maturin'
pkgname=maturin
-version=0.14.10
+version=0.14.12
revision=1
create_wrksrc=yes
build_style=python3-module
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
_tlver="0.12.5"
distfiles="${homepage}/archive/v${version}.tar.gz
https://github.com/bytecodealliance/target-lexicon/archive/v${_tlver}.tar.gz>target-lexicon-${_tlver}.tar.gz"
-checksum="8fc9bcdcb7f1535d5e3e8bb500c348ca1bff5a6dce87b0ab7dbc5a49723da28a
+checksum="b1b665ffdfe6fa7f6f7e3ee2b7c3927567dbebea704141ab30dae3a88aba82be
efc488676998ea73d107b0c2632cc71baff91b5ea95abb6064b48a09edc233f9"
# Tests use unstable features and fail to build
make_check=no
From 12b1dd0929153622ba916a969f3c1d2c6beade8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:33:34 -0500
Subject: [PATCH 238/356] python3-hypothesis: update to 6.67.0.
---
srcpkgs/python3-hypothesis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 10be6501a5fa..a8789a5f5be5 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hypothesis'
pkgname=python3-hypothesis
-version=6.65.0
+version=6.67.0
revision=1
build_wrksrc=hypothesis-python
build_style=python3-module
@@ -14,7 +14,7 @@ license="MPL-2.0"
homepage="https://hypothesis.works/"
changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=f1cea50419e4bfacd417aed13b5021c8ce745ced70da16669abb77cffb76284b
+checksum=77f8f9ea5a3da74429e6286515b6d99ebac9c54e470e2c9d8cdbe53916304e1b
do_check() {
# Manually run the tests that tox considers part of the "full" suite,
From 6ded72c7b9c03b314472b4e76ef4641e68fa967d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:34:57 -0500
Subject: [PATCH 239/356] python3-numpy: update to 1.24.2.
---
srcpkgs/python3-numpy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e8e76d2e8e6b..e6eebf824fd4 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
# Template file for 'python3-numpy'
pkgname=python3-numpy
-version=1.24.1
+version=1.24.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://www.numpy.org/"
distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=2b65ddcf1de667ce870f36a0752e6459c5db2019f9eac56d259277a36b964ce2
+checksum=eefc0ac5c0d6346675b9e77cbf72fbb3b78b6003fc0b4fededc6b55c35dbff2d
alternatives="numpy:f2py:/usr/bin/f2py3"
# Tests do not function propery in a build directory
make_check="no"
From 31906d023c2b9a3902758cbac252bc924a2fca98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:07 -0500
Subject: [PATCH 240/356] python3-pip: update to 23.0.
---
srcpkgs/python3-pip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 066553a9645b..4695098ee4c2 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pip'
pkgname=python3-pip
-version=22.3.1
+version=23.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38
+checksum=aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b
# Tests have unpackaged dependencies
make_check=no
From e8c7d14f954bf17940389660e46a22d98285e20b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:14 -0500
Subject: [PATCH 241/356] python3-tifffile: update to 2023.2.3.
---
srcpkgs/python3-tifffile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index d385f70bf249..0b8a3bbcdfaf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tifffile'
pkgname=python3-tifffile
-version=2023.1.23.1
+version=2023.2.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
homepage="https://github.com/cgohlke/tifffile"
changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=523ef674d75ee34d713578f28a20b18d8a5cbc89165a90f3fd7339be5de2921e
+checksum=6c245e8087b5ee6106f3f056abfc60abae05323c1a1d5e5f41a51a9ec05eb820
# Tests require unpackaged fsspec
make_check=no
From 9b333c5cf2cd9f1849e42d224e8f38493b7698c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:23 -0500
Subject: [PATCH 242/356] python3-setuptools: update to 67.1.0.
---
srcpkgs/python3-setuptools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 97a3e587818a..28bd7143f18e 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=66.1.1
+version=67.1.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel"
@@ -11,7 +11,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=ac4008d396bc9cd983ea483cb7139c0240a07bbc74ffb6232fceffedc6cf03a8
+checksum=e261cdf010c11a41cb5cb5f1bf3338a7433832029f559a6a7614bd42a967c300
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From cf18ae59951678362bf008dcf4e9e8724f635618 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:31 -0500
Subject: [PATCH 243/356] mtools: update to 4.0.42.
---
srcpkgs/mtools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index 764493a5f5e6..c063430d56fc 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
# Template file for 'mtools'
pkgname=mtools
-version=4.0.41
+version=4.0.42
revision=1
build_style=gnu-configure
makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/mtools"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2542152264fb3eff7ed70662abf4f4eef8133bc37d0b7a686c240df2b5f80a13
+checksum=64bfdfde4d82af6b22f3c1c72c3e231cbb618f4c2309cc46f54d16d5502ccf15
conf_files="/etc/mtools.conf"
post_extract() {
From 146bdf841943eb80efcc5ea0c2e9629eff61e6b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:38 -0500
Subject: [PATCH 244/356] dnsmasq: update to 2.89.
---
srcpkgs/dnsmasq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index ce8536b96140..b1c984f7dc4f 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
# Template file for 'dnsmasq'
pkgname=dnsmasq
-version=2.88
+version=2.89
revision=1
conf_files="/etc/dnsmasq.conf"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.thekelleys.org.uk/dnsmasq/doc.html"
changelog="https://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
distfiles="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028
+checksum=8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4
system_accounts="dnsmasq"
dnsmasq_homedir="/var/chroot"
From 160797181824675aa060df48025325c780afaa48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:37:30 -0500
Subject: [PATCH 245/356] fuse3: update to 3.13.1.
---
srcpkgs/fuse3/patches/use_off_t.patch | 51 ---------------------------
srcpkgs/fuse3/template | 4 +--
2 files changed, 2 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/fuse3/patches/use_off_t.patch
diff --git a/srcpkgs/fuse3/patches/use_off_t.patch b/srcpkgs/fuse3/patches/use_off_t.patch
deleted file mode 100644
index c8c986358a03..000000000000
--- a/srcpkgs/fuse3/patches/use_off_t.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 19d95c0e701076407dc1f3cfd39e12e28b332927 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Sat, 14 Jan 2023 21:31:56 +0000
-Subject: [PATCH] use off_t over __off64_t
-
-when -D_FILE_OFFSET_BITS=64 is defined, the off_t type is 64 bits wide
-already. the fuse_common.h header already checks for this, and errors
-when it is not, so be consistent with all the other uses of off_t.
-
-some libcs like musl do not have a 32-bit off_t type, and don't define
-__off64_t.
----
- example/hello_ll_uds.c | 4 ++--
- include/fuse_lowlevel.h | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c
-index c1f64d7b..f291fed9 100644
---- a/example/hello_ll_uds.c
-+++ b/example/hello_ll_uds.c
-@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) {
- return (res == -1) ? res : (res + prev_res);
- }
-
--static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata) {
- (void)userdata;
-
-diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
-index ff0d966e..96088d7a 100644
---- a/include/fuse_lowlevel.h
-+++ b/include/fuse_lowlevel.h
-@@ -130,11 +130,11 @@ struct fuse_forget_data {
- struct fuse_custom_io {
- ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata);
- ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata);
-- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata);
-- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata);
- };
-
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index f0f36a13a40a..5fcf41be2e86 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,6 +1,6 @@
# Template file for 'fuse3'
pkgname=fuse3
-version=3.13.0
+version=3.13.1
revision=1
build_style=meson
configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/libfuse/libfuse"
changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst"
distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=1e54d3ee1d7d04f41e77617c4f7514f611b94332215dd88394bd82803032752a
+checksum=6cd0759944c9aeb3d078b24a97b8a5cd5d49a0b8b7f15f85f32ac0c8a662fb6e
conf_files="/etc/fuse.conf"
# Tests require root
make_check=no
From 57ef34288b4aa9395652acaaaa8d14a11990a8a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 5 Feb 2023 22:49:50 +0100
Subject: [PATCH 246/356] python3-pyinfra: update to 2.6.2.
---
srcpkgs/python3-pyinfra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 8607aac22bb4..c0c87bbeb688 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyinfra'
pkgname=python3-pyinfra
-version=2.6.1
+version=2.6.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pyinfra.com/"
changelog="https://github.com/Fizzadar/pyinfra/blob/HEAD/CHANGELOG.md"
distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=20a89a8be8d0bcd310439b8558595fe8e4750457ddf82c01ca9cbad7c79bec68
+checksum=778cbc318037c5884b090930c773ef88c2776fc710ff23bb921aac8b786bee5b
post_extract() {
vsed -i -e '/configparser/d' setup.py # is in Python 3.8
From 5fb6eeb7856fa2be947a7dfd97f23c0a7e6f2482 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Feb 2023 21:51:22 +0100
Subject: [PATCH 247/356] xvidtune: update to 1.0.4.
---
srcpkgs/xvidtune/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xvidtune/template b/srcpkgs/xvidtune/template
index 04f99a360680..5b960f97c75c 100644
--- a/srcpkgs/xvidtune/template
+++ b/srcpkgs/xvidtune/template
@@ -1,7 +1,7 @@
# Template build file for 'xvidtune'.
pkgname=xvidtune
-version=1.0.3
-revision=4
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXaw-devel libXxf86vm-devel"
@@ -9,8 +9,8 @@ short_desc="Video mode tuner for Xorg"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5
post_install() {
vlicense COPYING
From c60df403c277281d9b63efab0f4d00746e5f8679 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Feb 2023 18:52:15 +0100
Subject: [PATCH 248/356] erlang: update to 25.2.2.
---
srcpkgs/erlang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 4fb51a6651bf..058bb35255f6 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=25.2.1
+version=25.2.2
revision=1
build_style=gnu-configure
make_install_target="install install-docs"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="http://www.erlang.org/"
changelog="https://github.com/erlang/otp/releases"
distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=d044e3699cb5261127da4bf37a495534bde85c37709f07735efc91f290f51da7
+checksum=535e535b2e90e71deca96c53f19710e6ebf3d4289b0a3116e7cf83b7e2c4bb7e
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
From b19fc6b3024151015935760949689bba0d652d29 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Feb 2023 21:36:35 +0100
Subject: [PATCH 249/356] vttest: update to 20230201.
---
srcpkgs/vttest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template
index 49246ad3755b..082f42cc7421 100644
--- a/srcpkgs/vttest/template
+++ b/srcpkgs/vttest/template
@@ -1,6 +1,6 @@
# Template file for 'vttest'
pkgname=vttest
-version=20221229
+version=20230201
revision=1
build_style=gnu-configure
short_desc="Tests the compatibility so-called 'VT100-compatible' terminals"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://invisible-island.net/vttest/vttest.html"
distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz"
-checksum=6b6a109acaf0569cf7660d20dcd153b83e328e9b93dae4e73b985bbcc6b18bf8
+checksum=27f4300791e7cbcf9d15f88421f98e35d3aee66311368430624e2c1a5a8be683
post_install() {
vlicense COPYING
From 095e1a4ec2964bb28f948ba6ad8889f03bcaebda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Feb 2023 22:08:45 +0100
Subject: [PATCH 250/356] rex: update to 1.14.0.
---
srcpkgs/rex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index a493cf9aecc2..3ea32dfd7548 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -1,6 +1,6 @@
# Template file for 'rex'
pkgname=rex
-version=1.13.4
+version=1.14.0
revision=1
build_style=perl-module
hostmakedepends="perl perl-AWS-Signature4 perl-Clone-Choose
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="http://www.rexify.org/"
distfiles="https://cpan.metacpan.org/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"
-checksum=a86e9270159b41c9a8fce96f9ddc97c5caa68167ca4ed33e97908bfce17098cf
+checksum=447c496e46848ca17d96497a258169da9bdc290bab446514ec57ccfe6e654b3f
post_install() {
vinstall share/rex-tab-completion.bash 644 usr/share/bash-completion/completions rex
From f915d2ef44eece47c7ae275340da6ed777aec9f1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 6 Feb 2023 14:39:48 -0500
Subject: [PATCH 251/356] vpn-ws: add cflag to build with openssl3
---
srcpkgs/vpn-ws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index 498ca5775a82..73d6697ea34b 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,7 +1,7 @@
# Template file for 'vpn-ws'
pkgname=vpn-ws
version=0.2
-revision=7
+revision=8
build_style=gnu-makefile
make_use_env=yes
makedepends="openssl-devel"
@@ -12,7 +12,7 @@ homepage="https://github.com/unbit/vpn-ws"
distfiles="https://github.com/unbit/vpn-ws/archive/v${version}.tar.gz"
checksum=f35d16d192ef333390ccc7d342df4392676a86502fa087f310eab9758afd565a
-CFLAGS+=" -Wno-stringop-truncation -fcommon"
+CFLAGS+=" -Wno-stringop-truncation -fcommon -Wno-deprecated-declarations"
# no install target in the Makefile
do_install() {
From 61414bb878e56bc25bffb85c6b1b7dcd7e4efb7e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 7 Feb 2023 00:33:42 +0100
Subject: [PATCH 252/356] hopper: update to 5.8.6.
---
srcpkgs/hopper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 6a465659f582..eadb6fe5b34c 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
# Template file for 'hopper'
pkgname=hopper
-version=5.8.5
+version=5.8.6
revision=1
_build=1
create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:EULA"
homepage="https://www.hopperapp.com"
distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=5af72c42f59538f1c786d18042dc5e43d46a3b5afa6f92500251af7176a54655
+checksum=1c9376a8aebad2b0b6aeee8e8583784f008809a6a37f111e6a0ce2a194e55f2a
archs="x86_64"
restricted=yes
From d49ae3b99020f774681d00c29c5afe6017db37b0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 7 Feb 2023 00:34:03 +0100
Subject: [PATCH 253/356] docker-gen: update to 0.9.4.
---
srcpkgs/docker-gen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 98d0dee456a1..bdda8a926285 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,6 +1,6 @@
# Template file for 'docker-gen'
pkgname=docker-gen
-version=0.9.3
+version=0.9.4
revision=1
build_style=go
go_import_path="github.com/nginx-proxy/docker-gen"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/nginx-proxy/docker-gen"
distfiles="https://github.com/nginx-proxy/docker-gen/archive/refs/tags/${version}.tar.gz"
-checksum=7ba1fbd10648f91f175d082a9994ce10a352c87c4a65b676c55d98eeec1d816d
+checksum=4c25f9a876d90710586fce38ec18336fc9b679e5a6237df458f5674ca82b3d8b
post_install() {
vlicense LICENSE
From 4af6bf4a39f2d4f30624427a6a3ba62d3c47b5f1 Mon Sep 17 00:00:00 2001
From: Goran Vukoman <g@numerys.net>
Date: Sun, 5 Feb 2023 22:48:39 +0100
Subject: [PATCH 254/356] New package: hunspell-nl_NL-2.20.19.
---
srcpkgs/hunspell-nl_NL/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/hunspell-nl_NL/template
diff --git a/srcpkgs/hunspell-nl_NL/template b/srcpkgs/hunspell-nl_NL/template
new file mode 100644
index 000000000000..e3d6a0dd93f1
--- /dev/null
+++ b/srcpkgs/hunspell-nl_NL/template
@@ -0,0 +1,16 @@
+# Template file for 'hunspell-nl_NL'
+pkgname=hunspell-nl_NL
+version=2.20.19
+revision=1
+short_desc="Dutch nl_NL dictionary for hunspell"
+maintainer="Goran Vukoman <g@numerys.net>"
+license="BSD-3-Clause, CC-BY-3.0"
+homepage="https://www.opentaal.org/"
+distfiles="https://github.com/OpenTaal/opentaal-hunspell/archive/refs/tags/${version}.tar.gz"
+checksum=0a86ec393450d7070bd69ee83f69c37ff27dbbc5fe684803375f113d7128bd87
+
+do_install() {
+ vinstall nl.aff 644 /usr/share/hunspell nl_NL.aff
+ vinstall nl.dic 644 /usr/share/hunspell nl_NL.dic
+ vlicense LICENSE.txt
+}
From 69b015b610c16dd641207741fba189a4cc5639f2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 6 Feb 2023 22:58:42 -0500
Subject: [PATCH 255/356] chezmoi: update to 2.30.0.
---
srcpkgs/chezmoi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 14b704281434..49c0178f3566 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
-version=2.29.4
+version=2.30.0
revision=1
build_style=go
go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="https://chezmoi.io/"
distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=3205d4519251b3e9a016fc6579bc0363361ad7d037ed17c8bf1ee8bdb9ffa9cd
+checksum=4cb96b898ef178a2e832eab7954ec675ded116fc44944d5026ec6f95be1144c7
pre_build() {
local _date
From 7b2fb21c3a8ab5b98159da579e74e9d6226401c1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 11:26:56 +0530
Subject: [PATCH 256/356] lua-language-server: update to 3.6.10.
---
srcpkgs/lua-language-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
index 82da0ffeb8bf..7ca059600c2f 100644
--- a/srcpkgs/lua-language-server/template
+++ b/srcpkgs/lua-language-server/template
@@ -1,6 +1,6 @@
# Template file for 'lua-language-server'
pkgname=lua-language-server
-version=3.6.4
+version=3.6.10
revision=1
create_wrksrc=yes
hostmakedepends="ninja"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/sumneko/lua-language-server"
changelog="https://raw.githubusercontent.com/sumneko/lua-language-server/master/changelog.md"
distfiles="https://github.com/sumneko/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
-checksum=e506731636b3683359dea000a927fe7696a3ea6f0cc6fb1526a77dabe2013ae7
+checksum=3dbbe70901540e1e217d5e4744e528399a92201eb63c35545c0cf1936ffb1efc
do_build() {
ninja -C 3rd/luamake -f compile/ninja/linux.ninja
From efa6a2a6b463519471fe0ecb8c8465072284586d Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Fri, 20 Jan 2023 02:34:40 -0300
Subject: [PATCH 257/356] New package: chrono-date-3.0.1
---
common/shlibs | 1 +
srcpkgs/chrono-date-devel | 1 +
.../538_output_date_pc_for_pkg_config.patch | 60 +++++++++++++++++++
.../disable_buggy_libstdc++_tests.patch | 30 ++++++++++
srcpkgs/chrono-date/patches/get_info.patch | 24 ++++++++
srcpkgs/chrono-date/patches/sys_info.patch | 29 +++++++++
srcpkgs/chrono-date/template | 29 +++++++++
7 files changed, 174 insertions(+)
create mode 120000 srcpkgs/chrono-date-devel
create mode 100644 srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
create mode 100644 srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
create mode 100644 srcpkgs/chrono-date/patches/get_info.patch
create mode 100644 srcpkgs/chrono-date/patches/sys_info.patch
create mode 100644 srcpkgs/chrono-date/template
diff --git a/common/shlibs b/common/shlibs
index 3042ced11d4b..504d29f4cb98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libIlmThread-3_1.so.30 libopenexr-3.1.5_1
libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libdate-tz.so.3 chrono-date-3.0.1_1
diff --git a/srcpkgs/chrono-date-devel b/srcpkgs/chrono-date-devel
new file mode 120000
index 000000000000..7ba11f09e6bd
--- /dev/null
+++ b/srcpkgs/chrono-date-devel
@@ -0,0 +1 @@
+chrono-date
\ No newline at end of file
diff --git a/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch b/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
new file mode 100644
index 000000000000..d20af66b16dc
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
@@ -0,0 +1,60 @@
+From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001
+From: Cole Mickens <cole.mickens@gmail.com>
+Date: Sun, 26 Jan 2020 01:27:08 -0800
+Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
+
+---
+ CMakeLists.txt | 15 +++++++++++++++
+ date.pc.in | 10 ++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 date.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f30c473..fe778e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB )
+ endif( )
+ endif( )
+
++if ( BUILD_TZ_LIB )
++ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
++ set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:date-tz>,-D$<JOIN:$<TARGET_PROPERTY:date-tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
++ configure_file(date.pc.in date.pc.cf @ONLY)
++ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc"
++ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" )
++
++endif( )
++
+ #[===================================================================[
+ installation
+ #]===================================================================]
+@@ -171,6 +180,12 @@ install (
+ FILES cmake/dateConfig.cmake "${version_config}"
+ DESTINATION ${CONFIG_LOC})
+
++if ( BUILD_TZ_LIB )
++ install(
++ FILES ${CMAKE_BINARY_DIR}/date.pc
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++endif( )
++
+ #[===================================================================[
+ testing
+ #]===================================================================]
+diff --git a/date.pc.in b/date.pc.in
+new file mode 100644
+index 0000000..b9c4623
+--- /dev/null
++++ b/date.pc.in
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_BINDIR@
++libdir=@CMAKE_INSTALL_LIB@
++includedir=@CMAKE_INSTALL_INCLUDE@
++
++Name: date
++Description: A date and time library based on the C++11/14/17 <chrono> header
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -ldate-tz
++Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
diff --git a/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch b/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
new file mode 100644
index 000000000000..d6257c4c3016
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
@@ -0,0 +1,30 @@
+--- a/test/date_test/parse.pass.cpp 2020-06-02 18:08:57.000000000 -0700
++++ b/test/date_test/parse.pass.cpp 2020-07-11 19:35:35.349377734 -0700
+@@ -874,27 +874,20 @@
+ int
+ main()
+ {
+- test_a();
+- test_b();
+- test_c();
+ test_C();
+ test_d();
+ test_D();
+ test_F();
+ test_H();
+- test_Ip();
+ test_j();
+ test_m();
+ test_M();
+- test_p();
+- test_r();
+ test_R();
+ test_S();
+ test_T();
+ test_U();
+ test_W();
+ test_GV();
+- test_x();
+ test_X();
+ test_z();
+ test_Z();
diff --git a/srcpkgs/chrono-date/patches/get_info.patch b/srcpkgs/chrono-date/patches/get_info.patch
new file mode 100644
index 000000000000..5ce6f15f6d26
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/get_info.patch
@@ -0,0 +1,24 @@
+From b49a7575ebbe127e8bd344900a52c14b5d69dd7b Mon Sep 17 00:00:00 2001
+From: Howard Hinnant <howard.hinnant@gmail.com>
+Date: Tue, 18 May 2021 16:15:31 -0400
+Subject: [PATCH] Zero initialize local_info in get_info
+
+* Even when the result is unique, the second sys_info
+ should be zero initialized.
+---
+ src/tz.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tz.cpp b/src/tz.cpp
+index 26babbd9..1592bc8f 100644
+--- a/src/tz.cpp
++++ b/src/tz.cpp
+@@ -2164,7 +2164,7 @@ time_zone::get_info_impl(local_seconds tp) const
+ {
+ using namespace std::chrono;
+ init();
+- local_info i;
++ local_info i{};
+ i.result = local_info::unique;
+ auto tr = upper_bound(transitions_.begin(), transitions_.end(), tp,
+ [](const local_seconds& x, const transition& t)
diff --git a/srcpkgs/chrono-date/patches/sys_info.patch b/srcpkgs/chrono-date/patches/sys_info.patch
new file mode 100644
index 000000000000..d7edfa0a4b5f
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/sys_info.patch
@@ -0,0 +1,29 @@
+From 052eebaf0086e6bbc5ead01c3f1a8f02496aa701 Mon Sep 17 00:00:00 2001
+From: Howard Hinnant <howard.hinnant@gmail.com>
+Date: Tue, 18 May 2021 16:17:37 -0400
+Subject: [PATCH] When comparing sys_info in test... only compare whether the
+ saves are equal to 0 and not their actual values.
+
+This allows one to compare against the binary database
+which does not contain actual values of save.
+---
+ test/posix/ptz.pass.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/posix/ptz.pass.cpp b/test/posix/ptz.pass.cpp
+index 5601c21d..9e15e3a9 100644
+--- a/test/posix/ptz.pass.cpp
++++ b/test/posix/ptz.pass.cpp
+@@ -29,10 +29,11 @@
+ bool
+ is_equal(date::sys_info const& x, date::sys_info const& y)
+ {
++ using namespace std::chrono;
+ return x.begin == y.begin &&
+ x.end == y.end &&
+ x.offset == y.offset &&
+- x.save == y.save &&
++ (x.save == minutes{0}) == (y.save == minutes{0}) &&
+ x.abbrev == y.abbrev;
+ }
+
diff --git a/srcpkgs/chrono-date/template b/srcpkgs/chrono-date/template
new file mode 100644
index 000000000000..ff3f21b63f17
--- /dev/null
+++ b/srcpkgs/chrono-date/template
@@ -0,0 +1,29 @@
+# Template file for 'chrono-date'
+pkgname=chrono-date
+version=3.0.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=true -DBUILD_TZ_LIB=true
+ -DUSE_SYSTEM_TZ_DB=true -DENABLE_DATE_TESTING=false"
+short_desc="Date and time library based on the C++11/14/17 <chrono> header"
+maintainer="lz-coder <lzcoder@proton.me>"
+license="MIT"
+homepage="https://howardhinnant.github.io/date/date.html"
+changelog="https://github.com/HowardHinnant/date/releases"
+distfiles="https://github.com/HowardHinnant/date/archive/v${version}.tar.gz"
+checksum=7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+chrono-date-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 5570ecdda2af9480a548d9a331fb8d71cbd76515 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:33:53 +0100
Subject: [PATCH 258/356] rust-boostrap: hardcode platform triplets
---
srcpkgs/rust-bootstrap/template | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 23f147c9fcb9..539a4097ef3c 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -24,42 +24,61 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
-distfiles="
- ${_bootstrap_url}/rustc-${version}-${RUST_TARGET}.tar.xz
- ${_bootstrap_url}/rust-std-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
;;
x86_64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
;;
x86_64-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
;;
ppc64le)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="
11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
;;
ppc64le-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="
9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
;;
ppc64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="
aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
;;
ppc)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="
5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
From 2244c445eced5a60cc16c5ff688924b9ad76f976 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:34:26 +0100
Subject: [PATCH 259/356] cargo-bootstrap: hardcode platform triplets
---
srcpkgs/cargo-bootstrap/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 4e39b797a035..9da646a63ade 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -23,28 +23,35 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
-distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
;;
x86_64)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
;;
x86_64-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
;;
ppc64le)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
;;
ppc64le-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
;;
ppc64)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
;;
ppc)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
From 4faf26951ae1f0eeeb28c50f9bed676b3045b8a4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 5 Feb 2023 14:52:45 +0530
Subject: [PATCH 260/356] twemoji: update to 14.0.2.
Adopt.
---
srcpkgs/twemoji/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/twemoji/template b/srcpkgs/twemoji/template
index 3dae26abaa65..499e8006b2d6 100644
--- a/srcpkgs/twemoji/template
+++ b/srcpkgs/twemoji/template
@@ -1,14 +1,14 @@
# Template file for 'twemoji'
pkgname=twemoji
-version=13.1.0
+version=14.0.2
revision=1
depends="font-util"
short_desc="Twitter emoji font set in color and b&w"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="CC-BY-SA-4.0, MIT"
-homepage="https://github.com/eosrei/twemoji-color-font"
-distfiles="https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"
-checksum=57c0d651400af872c33dcab78b33ecd7be0f7d49da49e2c1c83a59c215085f94
+homepage="https://github.com/13rac1/twemoji-color-font"
+distfiles="https://github.com/13rac1/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"
+checksum=6826e21ea08dc5df26c887ae4e56046987e0f4909df8c02c73de05714a0353c1
font_dirs="/usr/share/fonts/twemoji"
From d3eba7b118c39888015607112aa2644fb7c26a54 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 6 Feb 2023 15:55:49 +0200
Subject: [PATCH 261/356] opera: update to 95.0.4635.25.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index d18c926ee1c5..dbfbea49cba7 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=94.0.4606.76
+version=95.0.4635.25
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=0542e391b934b5646478a71d7c9a46c8119cfd2663f83f78ad80c2ea92574ea5
+checksum=0db4fb3247d24249ad19f65f1e63ce339d8f9a1e9fcb789835a84bc0f916fdfe
repository="nonfree"
nostrip=yes
From eb36abb425e5a9cf0cbef1922207ca93bba01e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 6 Feb 2023 16:10:23 +0100
Subject: [PATCH 262/356] papirus-folders: update to 1.12.1.
---
srcpkgs/papirus-folders/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/papirus-folders/template b/srcpkgs/papirus-folders/template
index 69d04f3e158b..d4b797e0f42d 100644
--- a/srcpkgs/papirus-folders/template
+++ b/srcpkgs/papirus-folders/template
@@ -1,6 +1,6 @@
# Template file for 'papirus-folders'
pkgname=papirus-folders
-version=1.12.0
+version=1.12.1
revision=1
build_style=gnu-makefile
depends="papirus-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
homepage="https://github.com/PapirusDevelopmentTeam/papirus-folders"
distfiles="https://github.com/PapirusDevelopmentTeam/papirus-folders/archive/v${version}.tar.gz"
-checksum=e20df336d909ef320606caed49797418fba54867fc24d6596576cfa55995c337
+checksum=e0079af92ffc1b16eebd0f182d740e85aa2e34450cf0f191c229a568fcc5bee0
post_install() {
vlicense LICENSE
From bab4e96e936a79c0e3bb27d9fbd4f1788841472f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 6 Feb 2023 10:35:35 +0100
Subject: [PATCH 263/356] PrismLauncher: update to 6.3.
---
srcpkgs/PrismLauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..2c9e9cc3d8d4 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=6.1
+version=6.3
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d89171a982af0f93208b25c33f5f890ca9674bd0573e685da969d6436103da9c
+checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
From c99fdb38bb6848bd2e4e0bc138175e97eb057ef6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 08:44:40 -0500
Subject: [PATCH 264/356] lolcat-c: update to 1.3
---
srcpkgs/lolcat-c/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lolcat-c/template b/srcpkgs/lolcat-c/template
index 54a94910502b..3db29baec216 100644
--- a/srcpkgs/lolcat-c/template
+++ b/srcpkgs/lolcat-c/template
@@ -1,6 +1,6 @@
# Template file for 'lolcat-c'
pkgname=lolcat-c
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
make_build_target="lolcat"
@@ -8,8 +8,8 @@ short_desc="High-performance implementation of lolcat"
maintainer="John <me@johnnynator.dev>"
license="WTFPL"
homepage="https://github.com/jaseg/lolcat"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b6e1a0e24479fbdd4eb907531339e2cafc0c00b78d19caf70e8377b8b7546331
+distfiles="https://github.com/jaseg/lolcat/archive/refs/tags/v${version}.tar.gz"
+checksum=5596c9ad40f78cc40483ada3fed25f9fa743b4d281b00c2b78de02f49a415d10
do_install() {
vbin lolcat
From 1fca123acde4e603a90c862f9e4167b9417128b3 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 7 Feb 2023 01:26:47 +0530
Subject: [PATCH 265/356] elfinfo: update to 1.2.2.
---
srcpkgs/elfinfo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index b354ced06d81..50f03b480101 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,15 +1,15 @@
# Template file for 'elfinfo'
pkgname=elfinfo
-version=1.1.0
+version=1.2.2
revision=1
build_style=go
go_import_path=github.com/xyproto/elfinfo
short_desc="Emit basic information about an ELF file"
maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
-license="MIT"
+license="BSD-3-Clause"
homepage="https://elfinfo.roboticoverlords.org/"
-distfiles="https://github.com/xyproto/elfinfo/archive/${version}.tar.gz"
-checksum=d50ae9facbfa2c9ecc24feaa817a2f1c92949b06649ae7a097729c99bd8474dd
+distfiles="https://github.com/xyproto/elfinfo/archive/refs/tags/${version}.tar.gz"
+checksum=33c9bf9942dfa770fa6530f5a268f15d96abcd4c57aaddf93636cdfcd2dfc540
post_install() {
vlicense LICENSE
From 7a792ed2ef34cb748bba7986879863eb7eb9cb55 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 12:33:58 +0100
Subject: [PATCH 266/356] rustup: update to 1.25.2
---
srcpkgs/rustup/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index da9d2751ba4f..06319a580eef 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,6 +1,6 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.25.1
+version=1.25.2
revision=1
# rustup doesn't recognize this target
archs="~armv*-musl"
@@ -14,8 +14,9 @@ short_desc="Rust toolchain installer"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
-distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=4d062c77b08309bd212f22dd7da1957c1882509c478e57762f34ec4fb2884c9a
+changelog="https://github.com/rust-lang/rustup/raw/master/CHANGELOG.md"
+distfiles="https://github.com/rust-lang/rustup/archive/refs/tags/${version}.tar.gz"
+checksum=dc9bb5d3dbac5cea9afa9b9c3c96fcf644a1e7ed6188a6b419dfe3605223b5f3
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*)
From 05243f582816ae2f629304cfbc9ee848c9162926 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 31 Jan 2023 13:20:09 -0500
Subject: [PATCH 267/356] wsjtx: update to 2.6.1.
---
srcpkgs/wsjtx/template | 21 +++++++++------------
srcpkgs/wsjtx/update | 4 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index fc6094743511..20bc4737410d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,11 +1,13 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.5.4
-revision=3
+version=2.6.1
+revision=1
build_wrksrc=wsjtx
build_style=cmake
-configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
-hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE=
+ -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
+hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar qt5-qmake
+ qt5-host-tools"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
@@ -15,18 +17,13 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
changelog="https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt"
-distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-qmake qt5-host-tools"
- configure_args+=" -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
-fi
+distfiles="${SOURCEFORGE_SITE}/wsjt/wsjtx-${version}/wsjtx-${version}.tgz"
+checksum=60d0e2cb45a49a6ad585b0908821a9ff2c3ac2564d61042620ff36c2ddcc765f
post_extract() {
tar xf src/wsjtx.tgz
}
post_install() {
- rm -f ${DESTDIR}/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz
+ rm ${DESTDIR}/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz
}
diff --git a/srcpkgs/wsjtx/update b/srcpkgs/wsjtx/update
index b5cc9bd4f17d..02ba6d585b5d 100644
--- a/srcpkgs/wsjtx/update
+++ b/srcpkgs/wsjtx/update
@@ -1,3 +1,3 @@
-site='https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt'
-pattern='Release: WSJT-X \K[\d\w.-]+(?=)'
+site='https://wsjt.sourceforge.io/Release_Notes.txt'
+pattern='Release: WSJT-X \K[\d.-]+\d(?=)'
ignore='*-rc*'
From 37914df36146abe26a293f3f01b774e979c4c42e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 31 Jan 2023 19:37:16 +0200
Subject: [PATCH 268/356] skype: update to 8.93.0.404.
---
srcpkgs/skype/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 1bcc2532d271..96a6ffd03262 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
# Template file for 'skype'
# This just repackages the rpm package.
pkgname=skype
-version=8.93.0.403
+version=8.93.0.404
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:skype-servicesagreement" # no vlicense
homepage="https://www.skype.com"
distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=4e8a29c4dc7f1c8e7c5e934598e207771d40bb523a0bef93d309e4242739655e
+checksum=02d9bc02eec3be408b1a53c93fab8b795f399911615d4987ad6dcddbb4188b1a
repository="nonfree"
nostrip="yes"
From d4825beb9479f1a057de99afd915450a480085dd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 30 Jan 2023 09:34:51 -0500
Subject: [PATCH 269/356] common: cleanup trailing whitespaces
---
common/build-helper/gir.sh | 6 +++---
common/build-helper/rust.sh | 4 ++--
common/build-style/configure.sh | 2 +-
common/build-style/gem.sh | 2 +-
common/build-style/gemspec.sh | 2 +-
common/build-style/gnu-configure.sh | 2 +-
common/build-style/gnu-makefile.sh | 2 +-
common/build-style/slashpackage.sh | 2 +-
common/chroot-style/ethereal.sh | 4 ++--
common/environment/configure/autoconf_cache/aarch64-linux | 4 ++--
common/environment/configure/autoconf_cache/arm-common | 2 +-
common/environment/configure/autoconf_cache/ix86-common | 2 +-
common/travis/xlint.sh | 2 +-
common/xbps-src/shutils/consistency_check.sh | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index 0091fb31ad93..70699adb1797 100644
--- a/common/build-helper/gir.sh
+++ b/common/build-helper/gir.sh
@@ -3,7 +3,7 @@
#
# This build-helper is used for packages that make use of
# the GObject introspection middleware layer.
-#
+#
# Check if the 'gir' build_option is set or if there is no
# 'gir' build_option.
@@ -13,12 +13,12 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then
# and its wrappers.
hostmakedepends+=" gobject-introspection"
fi
-
+
if [ "$CROSS_BUILD" ]; then
# Required for running binaries produced from g-ir-compiler
# via g-ir-scanner-qemuwrapper
hostmakedepends+=" qemu-user-static"
-
+
# Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross"
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 272d03f52607..9e604929ed23 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -12,7 +12,7 @@ if [ "$CROSS_BUILD" ]; then
_XBPS_CROSS_RUST_TARGET_ENV="${_XBPS_CROSS_RUST_TARGET_ENV//-/_}"
export CARGO_TARGET_${_XBPS_CROSS_RUST_TARGET_ENV}_LINKER="$CC"
unset _XBPS_CROSS_RUST_TARGET_ENV
-
+
# Define equivalent of TOML config in environment
# [build]
# target = ${RUST_TARGET}
@@ -39,7 +39,7 @@ export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext"
export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
# libssh2-sys
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+export LIBSSH2_SYS_USE_PKG_CONFIG=1
# sodium-sys
export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh
index 7a6d136f4cc6..8fe327507d9e 100644
--- a/common/build-style/configure.sh
+++ b/common/build-style/configure.sh
@@ -15,7 +15,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/gem.sh b/common/build-style/gem.sh
index 150c5b30d338..779e94eec353 100644
--- a/common/build-style/gem.sh
+++ b/common/build-style/gem.sh
@@ -5,7 +5,7 @@ do_install() {
: ${gem_cmd:=gem}
local _GEMDIR _INSTDIR
-
+
_GEMDIR=$($gem_cmd env gemdir)
_INSTDIR=${DESTDIR}/${_GEMDIR}/gems/${pkgname#ruby-}-${version}
diff --git a/common/build-style/gemspec.sh b/common/build-style/gemspec.sh
index b47ef7b1bc6b..9568e819ed45 100644
--- a/common/build-style/gemspec.sh
+++ b/common/build-style/gemspec.sh
@@ -173,7 +173,7 @@ do_install() {
if [ "$CROSS_BUILD" ]; then
local _TARGET_PLATFORM _TARGET_EXT_DIR
-
+
# Get arch of the target and host platform by reading the rbconfig.rb
# of the cross ruby
_TARGET_PLATFORM="$(ruby -r \
diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 4326d07d75cc..82d36f6ee0f7 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -16,7 +16,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index f81ef4e21db4..c4f4f780f9f6 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -18,7 +18,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/slashpackage.sh b/common/build-style/slashpackage.sh
index 5f4fe4fb93fd..59e82732f7a8 100644
--- a/common/build-style/slashpackage.sh
+++ b/common/build-style/slashpackage.sh
@@ -7,7 +7,7 @@
# build_style=slashpackage
# build_wrksrc=${pkgname}-${version}
# distfiles=<download link>
-#
+#
# example (daemontools)
#
# Template file for 'daemontools'
diff --git a/common/chroot-style/ethereal.sh b/common/chroot-style/ethereal.sh
index cf6e4dc244f9..a226465cc82f 100755
--- a/common/chroot-style/ethereal.sh
+++ b/common/chroot-style/ethereal.sh
@@ -12,7 +12,7 @@
# into /.xbps_chroot_init
#
# The supported way to make use of thie chroot-style is to create
-# a root filesystem that has base-chroot and git installed and
+# a root filesystem that has base-chroot and git installed and
# have it inside a container engine like Docker.
#
# Docker example:
@@ -21,7 +21,7 @@
# -R http://mirrors.servercentral.com/voidlinux/current \
# -S base-chroot
# $ tar -pC /tmp/image -c . | sudo docker import - voidlinux/masterdir
-# $ rm -rf /tmp/image
+# $ rm -rf /tmp/image
# # docker run --rm -it \
# -e XBPS_CHROOT_CMD=ethereal \
# -e XBPS_ALLOW_CHROOT_BREAKOUT=yes \
diff --git a/common/environment/configure/autoconf_cache/aarch64-linux b/common/environment/configure/autoconf_cache/aarch64-linux
index ad17545c098e..4367f917bf56 100644
--- a/common/environment/configure/autoconf_cache/aarch64-linux
+++ b/common/environment/configure/autoconf_cache/aarch64-linux
@@ -81,10 +81,10 @@ libIDL_cv_long_long_format=ll
## ac_cv_alignof_CORBA_short=2
## ac_cv_alignof_CORBA_struct=1
## ac_cv_alignof_CORBA_wchar=2
-##
+##
## lf_cv_sane_realloc=yes
as_cv_unaligned_access=${as_cv_unaligned_access=no}
-##
+##
## #unfs3
## nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0}
## nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize}
diff --git a/common/environment/configure/autoconf_cache/arm-common b/common/environment/configure/autoconf_cache/arm-common
index 0f09e06671e1..3526b775039d 100644
--- a/common/environment/configure/autoconf_cache/arm-common
+++ b/common/environment/configure/autoconf_cache/arm-common
@@ -99,7 +99,7 @@ acx_working_snprintf=${acx_working_snprintf=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
-# libnet
+# libnet
ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
# libpcap
diff --git a/common/environment/configure/autoconf_cache/ix86-common b/common/environment/configure/autoconf_cache/ix86-common
index beed9a24a1e4..8eb82deae467 100644
--- a/common/environment/configure/autoconf_cache/ix86-common
+++ b/common/environment/configure/autoconf_cache/ix86-common
@@ -120,7 +120,7 @@ lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
-# libnet
+# libnet
ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 327417c1c327..790791ef1733 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -2,7 +2,7 @@
#
# xlint.sh
-[ "$XLINT" ] || exit 0
+[ "$XLINT" ] || exit 0
EXITCODE=0
read base tip < /tmp/revisions
diff --git a/common/xbps-src/shutils/consistency_check.sh b/common/xbps-src/shutils/consistency_check.sh
index cd70f4a9cbab..6a5b2ec19975 100644
--- a/common/xbps-src/shutils/consistency_check.sh
+++ b/common/xbps-src/shutils/consistency_check.sh
@@ -22,7 +22,7 @@ consistency_convert_pkgname () {
;;
esac
case "$dep" in
- *\<*|*\>*|*=*)
+ *\<*|*\>*|*=*)
printf "%s %s %s\n" "$dep" "$origname" "$deplabel"
continue
;;
From 58fe16afea1f6b7f2a6218ace32d060228af1d92 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Sat, 4 Feb 2023 12:59:41 +0530
Subject: [PATCH 270/356] telegram-desktop: update to 4.6.1.
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 03bc7806f54f..ba0947762311 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=4.5.3
+version=4.6.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later, OpenSSL"
homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=3e338607708751813df36b677904e2e652f8adfac669da418c8dab4588a4f70f
+checksum=96fc517036bea908fb31b456aeb2950296e98965241bab318faa7641fb506f2f
build_options="spellcheck"
build_options_default="spellcheck"
From 6b52d82bea0ddee68b7e0c1c3995e766af87239b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 7 Feb 2023 13:19:36 +0100
Subject: [PATCH 271/356] syncthing: update to 1.23.1.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 06fcc107917d..d0e8b48205c1 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.23.0
+version=1.23.1
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=3ac5002419d261b7d9352a621dbe20fada165372444824213b9d46910df7502e
+checksum=2e1f1b146f18630a3dfa1480a333f39366d855dc6749fe23dc029a61f5fe4cd1
pre_build() {
GOARCH= go generate \
From 83d62b8bdcfd3c9d7fc8e6f64b01e79df7a68887 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 7 Feb 2023 13:30:27 +0100
Subject: [PATCH 272/356] xtools: update to 0.65.
---
srcpkgs/xtools/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 676928bff814..74effe6beaa5 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,15 +1,15 @@
# Template file for 'xtools'
pkgname=xtools
-version=0.64
-revision=2
+version=0.65
+revision=1
build_style=gnu-makefile
depends="curl git make spdx-licenses-list xtools-minimal-${version}_${revision}"
short_desc="Opinionated helpers for working with XBPS"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
-homepage="http://git.vuxu.org/xtools"
-distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be
+homepage="https://git.vuxu.org/xtools"
+distfiles="https://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
+checksum=2128fb5066fa2aab7bcfb149519463d513ade820f1d8e25aecbeaf259294615e
# all xtools that can function without git installed
# (git is by far the largest dependency)
From 3302de0ff65867f49a9f81ddb6ba410990eeae85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 273/356] openssh: update to 9.2p1.
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
srcpkgs/openssh/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/openssh/patches/time_t-32-bit.patch
diff --git a/srcpkgs/openssh/patches/time_t-32-bit.patch b/srcpkgs/openssh/patches/time_t-32-bit.patch
new file mode 100644
index 000000000000..8c11f3714ec6
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,7 @@ channel_handler(struct ssh *ssh, int tab
+ if (table == CHAN_PRE &&
+ c->type == SSH_CHANNEL_OPEN &&
+ c->inactive_deadline != 0 && c->lastused != 0 &&
+- now >= c->lastused + c->inactive_deadline) {
++ now >= c->lastused + (time_t)c->inactive_deadline) {
+ /* channel closed for inactivity */
+ verbose("channel %d: closing after %u seconds "
+ "of inactivity", c->self,
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause, ISC"
homepage="https://www.openssh.com"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root"
From 158c7da238d7e679dd46b066010473a947d423fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 274/356] gnome-ssh-askpass: update to 9.2p1.
---
srcpkgs/gnome-ssh-askpass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 8b47bd4ca8cb..389516822702 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-ssh-askpass'
pkgname=gnome-ssh-askpass
-version=9.1p1
+version=9.2p1
revision=1
build_wrksrc="contrib"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause, BSD-2-Clause"
homepage="http://www.openssh.org"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
From c9327b8a6709dc0b308651ddfdb04404cf65159b Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 6 Feb 2023 16:36:55 +0200
Subject: [PATCH 275/356] man-pages: update to 6.02.
---
srcpkgs/man-pages/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 0422ff053de2..1606b58decf6 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,16 +1,16 @@
# Template file for 'man-pages'
pkgname=man-pages
-version=5.13
-revision=2
+version=6.02
+revision=1
short_desc="Linux Documentation Project (LDP) manual pages"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://man7.org/linux/man-pages/index.html"
-distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=614dae3efe7dfd480986763a2a2a8179215032a5a4526c0be5e899a25f096b8b
+homepage="https://www.kernel.org/doc/man-pages/index.html"
+distfiles="${KERNEL_SITE}/docs/man-pages/man-pages-${version}.tar.xz"
+checksum=66d809b62ba8681ebcbd1a8d0a0670776924ab93bfbbb54e1c31170e14303795
do_install() {
- make all prefix=${DESTDIR}/usr
+ make install prefix=/usr DESTDIR=${DESTDIR}
# Remove dup manpages.
cd ${DESTDIR}/usr/share/man
From 2217108c9976a824582d84c02fbd80f0e47e0d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 7 Feb 2023 21:29:53 +0700
Subject: [PATCH 276/356] linux6.1: update to 6.1.10.
---
srcpkgs/linux6.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 4fd43fad4089..d7a58660dcc0 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.1'
pkgname=linux6.1
-version=6.1.9
+version=6.1.10
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 64e27f1de56225372d29ff92dc2d8fca6ae961e7470f2364e98c5af0aef261dc"
+ ab73cf44175fcaacc7a467bedc3731cc14367a377088c157cdfcf8853f73b1e9"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 366963b7d9ee244183b3e954d8f641ee452f3d81 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 31 Jan 2023 19:57:21 +0200
Subject: [PATCH 277/356] terminology: update to 1.13.0.
---
srcpkgs/terminology/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template
index 71dc0dd24e44..af9c3587f076 100644
--- a/srcpkgs/terminology/template
+++ b/srcpkgs/terminology/template
@@ -1,6 +1,6 @@
# Template file for 'terminology'
pkgname=terminology
-version=1.12.1
+version=1.13.0
revision=1
build_style=meson
hostmakedepends="pkg-config efl gettext"
@@ -10,8 +10,8 @@ short_desc="Enlightenment's terminal emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.enlightenment.org"
-distfiles="https://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9
+distfiles="https://download.enlightenment.org/rel/apps/terminology/terminology-${version}.tar.xz"
+checksum=16a37fecd7bbd63ec9de3ec6c0af331cee77d6dfda838a1b1573d6f298474da5
post_install() {
vlicense COPYING
From d60c55c6891c9a4b280f1fe8810777887bb1410c Mon Sep 17 00:00:00 2001
From: Dave Eddy <dave@daveeddy.com>
Date: Sun, 5 Feb 2023 14:20:19 -0500
Subject: [PATCH 278/356] vsv: update to 2.0.0
`vsv` was rewritten from Bash to Rust so this template reflects that
change - the user-facing CLI interface has not changed.
---
srcpkgs/vsv/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/vsv/template b/srcpkgs/vsv/template
index 2e1780a68fe8..d77a49d874ed 100644
--- a/srcpkgs/vsv/template
+++ b/srcpkgs/vsv/template
@@ -1,18 +1,18 @@
# Template file for 'vsv'
pkgname=vsv
-version=1.3.5
+version=2.0.0
revision=1
-depends="bash psmisc"
+build_style=cargo
+depends="psmisc"
short_desc="Manage and view runit services"
maintainer="Dave Eddy <dave@daveeddy.com>"
license="MIT"
homepage="https://github.com/bahamas10/vsv"
changelog="https://raw.githubusercontent.com/bahamas10/vsv/master/CHANGES.md"
distfiles="https://github.com/bahamas10/vsv/archive/v${version}.tar.gz"
-checksum=d4b88a7d11189d6a9dd160a25025cbec8d27a88ea02a6826e0c010824b6bc943
+checksum=05c20d8e04ca37fdc47dde80a04a4709b54650748529456ebdddb4104fc805ec
-do_install() {
- vbin vsv
+post_install() {
vman man/vsv.8
vlicense LICENSE
}
From 87ef00e4a396c4a74d4606a0d4da9573368b6401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 7 Feb 2023 18:09:29 +0100
Subject: [PATCH 279/356] openssl: update to 1.1.1t.
---
srcpkgs/openssl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 1461ffd2f7a2..79da0b051aad 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
# Template file for 'openssl'
pkgname=openssl
-version=1.1.1s
+version=1.1.1t
revision=1
bootstrap=yes
build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
license="OpenSSL"
homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
+checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0"
From 379daaf935f5936910dbd88ffb25e293db0b3566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:33:08 +0200
Subject: [PATCH 280/356] haveged: update to 1.9.18.
---
srcpkgs/haveged/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index be82467cf210..a7c59d276aa4 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,14 +1,15 @@
# Template file for 'haveged'
pkgname=haveged
-version=1.9.17
+version=1.9.18
revision=1
build_style=gnu-configure
short_desc="Entropy harvesting daemon using CPU timings"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.issihosts.com/haveged"
+homepage="https://www.issihosts.com/haveged"
+changelog="https://raw.githubusercontent.com/jirka-h/haveged/master/ChangeLog"
distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
-checksum=02d9b7c801fbcf16bed43c27bf6ece570b79f4d94561f3eb30883fb5f89c526d
+checksum=b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7
post_install() {
vsv $pkgname
From db6b4afe2d05bd82abed6838f964b5b23bc13675 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 7 Feb 2023 22:36:36 +0100
Subject: [PATCH 281/356] google-chrome: update to 110.0.5481.77
---
srcpkgs/google-chrome/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index a4e4412568ad..6ce94d2e43b9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
# Template file for 'google-chrome'
pkgname=google-chrome
-version=109.0.5414.119
+version=110.0.5481.77
revision=1
_channel=stable
archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="custom:chrome"
homepage="https://www.google.com/chrome/"
distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=7dfe9285ff6ee8bff7621a68bf66d33dbe016ee3769a20b52397bafa49345745
+checksum=f7f1ac37e8fb258dbfd8fa9ca60e4a765609e0dea3942c264c3e6aa3af7b4d4a
_license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
skiprdeps="/opt/google/chrome/libqt5_shim.so"
From ea6d5d31db7578395fbb27a66bb5ff32c364870c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 13:11:53 -0500
Subject: [PATCH 282/356] dnscrypt-proxy: update to 2.1.4
---
srcpkgs/dnscrypt-proxy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 4172fd0a9d5a..e06702e89b92 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,6 +1,6 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
-version=2.1.3
+version=2.1.4
revision=1
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
@@ -10,8 +10,8 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
-distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=6163ab3169edd2158f585dff2ddba416b2d29fd4b44b4cc794365fca666a726a
+distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/refs/tags/${version}.tar.gz"
+checksum=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d
conf_files="/etc/dnscrypt-proxy.toml"
system_accounts="dnscrypt_proxy"
make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
From 7aff76da1866fd96cdab76ea2072443171246ca2 Mon Sep 17 00:00:00 2001
From: Ashlen <eurydice@riseup.net>
Date: Tue, 7 Feb 2023 23:14:51 -0700
Subject: [PATCH 283/356] xorg-server: update to 21.1.7.
Fix CVE-2023-0494
Closes: #42141 [via git-merge-pr]
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index b0f87841ae16..b4d24434a24f 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server'
pkgname=xorg-server
-version=21.1.6
+version=21.1.7
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -24,7 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484
+checksum=d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb
lib32disabled=yes
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-25_1 xf86-video-modesetting-1_1"
From 2cb91317690023ba87f124a72dbb73cefa7a7678 Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 8 Feb 2023 14:18:00 +0100
Subject: [PATCH 284/356] xorg-server-xwayland: update to 22.1.8.
---
srcpkgs/xorg-server-xwayland/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index c286192da72b..8aa7eda6f014 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server-xwayland'
pkgname=xorg-server-xwayland
-version=22.1.7
+version=22.1.8
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -16,7 +16,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=7df1e8d0a7e510706dc103230c342e58cffe240867ecdce47fd381d33db08a4b
+checksum=7f51aa41f5ae588a5a8afebf29c19e76830a9f75bc4f0443974f012a42028c83
make_check=no # needs xtest repository
post_install() {
From fef668c8f4a95de51dd683078da1e448ec090a50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 14:28:35 +0100
Subject: [PATCH 285/356] dino: update to 0.4.0.
---
srcpkgs/dino/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 97aa601dbc70..1b1542906d7c 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,20 +1,20 @@
# Template file for 'dino'
pkgname=dino
-version=0.3.1
+version=0.4.0
revision=1
build_style=cmake
configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON -DUSE_SOUP3=ON"
hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
-makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee-devel
+makedepends="glib-devel qrencode-devel gtk4-devel gpgme-devel libgee-devel
libgcrypt-devel libsoup3-devel libsignal-protocol-c-devel sqlite-devel
libcanberra-devel gspell-devel libsrtp-devel libnice-devel gnutls-devel
- gst-plugins-base1-devel"
+ gst-plugins-base1-devel libadwaita-devel"
short_desc='Modern XMPP ("Jabber") Chat Client using GTK+/Vala'
maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later"
homepage="https://github.com/dino/dino"
distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz"
-checksum=7178fc6b5efcea4e4ab49a7cae58224b5236660816e247a23124466984a9fbf9
+checksum=ee201f4f58b4da269c18594b0960f66fa07519e0ead4a5951189ff3396f3976c
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From ef0a0672fd28a71929d0a46f0bc06612e6e41ec0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 23:05:24 -0500
Subject: [PATCH 286/356] jdupes: update to 1.21.2
---
srcpkgs/jdupes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 873b07da8a6f..f4baa0830987 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.21.1
+version=1.21.2
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -9,8 +9,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
-distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=22de88d1963f70c8ed4d0aa40abe05b48aaa4cc08eed6a2c6c9747010f9f4eb7
+distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
+checksum=5c92333b06cefb1092bf398349218499c6aba94ae735316623a0114f9eda0f75
CFLAGS="-DENABLE_DEDUPE"
From f61c1a0a216f3514d6eab274797cced46a673e57 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 15:13:15 +0100
Subject: [PATCH 287/356] wiggle: update to 1.3
---
srcpkgs/wiggle/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wiggle/template b/srcpkgs/wiggle/template
index 5606c0491cb5..c09f8c7fda85 100644
--- a/srcpkgs/wiggle/template
+++ b/srcpkgs/wiggle/template
@@ -1,16 +1,17 @@
# Template file for 'wiggle'
pkgname=wiggle
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
-make_build_args="CPPFLAGS=-I."
+make_build_args="CFLAGS=-I."
make_build_target="wiggle"
+make_check_target="test"
make_install_args="STRIP="
hostmakedepends="groff"
makedepends="ncurses-devel"
short_desc="Apply patches that patch rejects"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://git.neil.brown.name/?p=wiggle.git;a=summary"
-distfiles="http://neil.brown.name/wiggle/wiggle-${version}.tar.gz"
-checksum=31375badb76a4a586f2113e49d13486dbc64844962ae80976a81c6542e901622
+homepage="https://github.com/neilbrown/wiggle"
+distfiles="https://github.com/neilbrown/wiggle/archive/refs/tags/v${version}.tar.gz"
+checksum=ff92cf0133c1f4dce33563e263cb30e7ddb6f4abdf86d427b1ec1490bec25afa
From 369670c56b06f5a177d12b43905cf047e714a519 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:25:53 -0500
Subject: [PATCH 288/356] python3: update to 3.11.2.
---
srcpkgs/python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 3b37f46a8a91..a07ddb08e0c4 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
# THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
#
pkgname=python3
-version=3.11.1
+version=3.11.2
revision=1
build_style="gnu-configure"
configure_args="--enable-shared --enable-ipv6
@@ -25,7 +25,7 @@ distfiles="
https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz
${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz
"
-checksum="85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f
+checksum="29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
skip_extraction="${_bluez}.tar.xz"
From 4696f6ace014b75d02631947e59659a69630ee34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:27:15 -0500
Subject: [PATCH 289/356] python3-tkinter: update to 3.11.2.
---
srcpkgs/python3-tkinter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 527642c8d805..3c653153eba3 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
_desc="Python programming language"
pkgname=python3-tkinter
-version=3.11.1
+version=3.11.2
revision=1
build_style="gnu-configure"
configure_args="--enable-shared --enable-ipv6
@@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
homepage="https://www.python.org"
license="Python-2.0"
distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f
+checksum=29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3"
From f1ce4ac139db32ba8c9b1f9b51dc50bc780e3341 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:27:50 -0500
Subject: [PATCH 290/356] python3-setuptools: update to 67.2.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 28bd7143f18e..0d70f2b7255a 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=67.1.0
+version=67.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel"
@@ -11,7 +11,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=e261cdf010c11a41cb5cb5f1bf3338a7433832029f559a6a7614bd42a967c300
+checksum=b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From 0556c6031d21f74ec7e065ffd0e4f0f09886547d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:28:10 -0500
Subject: [PATCH 291/356] python3-cryptography_vectors: update to 39.0.1.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index d87c82d86ed0..bf7d13b48dc7 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=39.0.0
+version=39.0.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=52e59670a0820b5bbfa85f724b8aebd61385787eb8b6607f64d533969124b2a0
+checksum=0cbaeb50bdb7f3c9d7a93b26a0462ef6e97c768ca78d902854fe045c30b680c6
post_install() {
vlicense LICENSE
From c5a5ead4f806309a42ccfedac986cb4c3fae4ff0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:24 -0500
Subject: [PATCH 292/356] python3-cryptography: update to 39.0.1.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 68349a14fa70..08aa24d5d126 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=39.0.0
+version=39.0.1
revision=1
build_style=python3-module
build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=f964c7dcf7802d133e8dbd1565914fa0194f9d683d82411989889ecd701e8adf
+checksum=d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From e9137a810d000e20bf00e10baa40962502b2451c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:32 -0500
Subject: [PATCH 293/356] python3-redis: update to 4.5.1.
---
srcpkgs/python3-redis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 91e1e68f6b37..ea50c6a0cfe3 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-redis'
pkgname=python3-redis
-version=4.4.2
+version=4.5.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/redis/redis-py"
changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7
+checksum=1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864
replaces="python3-aioredis<=2.0.1_1"
make_check=no # tests require a running redis server
From 049ec664c25454abddedbe61835e0985c5ea7a20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:35 -0500
Subject: [PATCH 294/356] opencl2-headers: update to 2023.02.06.
---
srcpkgs/opencl2-headers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
index 75104e986795..637273a142e1 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl2-headers/template
@@ -1,13 +1,13 @@
# Template file for 'opencl2-headers'
pkgname=opencl2-headers
-version=2022.09.30
+version=2023.02.06
revision=1
short_desc="OpenCL 2.2 (Open Computing Language) header files"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://github.com/KhronosGroup/OpenCL-Headers"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ae857ecb28af95a420c800b21ed2d0f437503e104f841ab8db249df5f4fbe5c
+checksum=464d1b04a5e185739065b2d86e4cebf02c154c416d63e6067a5060d7c053c79a
provides="opencl-headers-${version}_${revision}"
replaces="opencl-headers>=0"
From de22beadbb50ca1c2d1b15266aac2b3797799621 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Sun, 22 Jan 2023 06:56:38 +0100
Subject: [PATCH 295/356] python3-sh: update to 1.14.3.
---
...n-some-systems.-Use-a-random-dir-ins.patch | 46 -------------------
srcpkgs/python3-sh/template | 8 ++--
2 files changed, 4 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
diff --git a/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch b/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
deleted file mode 100644
index 1c0063a411e0..000000000000
--- a/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6b9fc9ace0219fd7199cb0d0261b01e364e96fe2 Mon Sep 17 00:00:00 2001
-From: Erik Cederstrand <erik@cederstrand.dk>
-Date: Mon, 16 Aug 2021 08:18:31 +0200
-Subject: [PATCH] CWD may be /tmp on some systems. Use a random dir instead.
- Fixes #582
-
----
- test.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/test.py b/test.py
-index 4e9e8e0..d438e30 100644
---- a/test.py
-+++ b/test.py
-@@ -2261,13 +2261,15 @@ p.wait()
-
- def test_pushd(self):
- """ test basic pushd functionality """
-+ child = realpath(tempfile.mkdtemp())
-+
- old_wd1 = sh.pwd().strip()
- old_wd2 = os.getcwd()
-
- self.assertEqual(old_wd1, old_wd2)
-- self.assertNotEqual(old_wd1, tempdir)
-+ self.assertNotEqual(old_wd1, child)
-
-- with sh.pushd(tempdir):
-+ with sh.pushd(child):
- new_wd1 = sh.pwd().strip()
- new_wd2 = os.getcwd()
-
-@@ -2276,8 +2278,8 @@ p.wait()
- self.assertEqual(old_wd3, old_wd4)
- self.assertEqual(old_wd1, old_wd3)
-
-- self.assertEqual(new_wd1, tempdir)
-- self.assertEqual(new_wd2, tempdir)
-+ self.assertEqual(new_wd1, child)
-+ self.assertEqual(new_wd2, child)
-
- def test_pushd_cd(self):
- """ test that pushd works like pushd/popd with built-in cd correctly """
---
-2.32.0
-
diff --git a/srcpkgs/python3-sh/template b/srcpkgs/python3-sh/template
index 47e97a175991..a36c8805052b 100644
--- a/srcpkgs/python3-sh/template
+++ b/srcpkgs/python3-sh/template
@@ -1,17 +1,17 @@
# Template file for 'python3-sh'
pkgname=python3-sh
-version=1.14.2
-revision=4
+version=1.14.3
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-Pygments python3-coverage python3-coveralls python3-docopt python3-docutils flake8"
short_desc="Python subprocess replacement (Python3)"
-maintainer="pulux <pulux@pf4sh.de>"
+maintainer="pulux <pulux@pf4sh.eu>"
license="MIT"
homepage="https://github.com/amoffat/sh"
distfiles="${PYPI_SITE}/s/sh/sh-${version}.tar.gz"
-checksum=9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d
+checksum=e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7
post_install() {
vlicense LICENSE.txt
From b7421a2dc4e785b688aca8909e2ef5d03050fb5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 20:16:23 +0100
Subject: [PATCH 296/356] racket: update to 8.8.
---
srcpkgs/racket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 0f22d6c04649..2d96716c8afe 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
# Template file for 'racket'
pkgname=racket
-version=8.7
+version=8.8
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
build_wrksrc=src
@@ -15,7 +15,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=76a7e66d47e73eb0dc3fca27fc818e36e1d4bffe74da263c5efe3b8801a30a01
+checksum=398422e2b42373e14e4e0f96da3d95cb5744247ba3f73ea99815fb693c2714ab
nostrip=yes
patch_args="-Np2"
From 2901eea3e39e18b7bdf7ccdd7a5b48e661401a8d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 21:08:31 +0100
Subject: [PATCH 297/356] New package: rdrview-0.1
---
srcpkgs/rdrview/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/rdrview/template
diff --git a/srcpkgs/rdrview/template b/srcpkgs/rdrview/template
new file mode 100644
index 000000000000..7be70b9b09d5
--- /dev/null
+++ b/srcpkgs/rdrview/template
@@ -0,0 +1,12 @@
+# Template file for 'rdrview'
+pkgname=rdrview
+version=0.1
+revision=1
+build_style=gnu-makefile
+makedepends="libcurl-devel libseccomp-devel libxml2-devel"
+short_desc="Firefox Reader View as a command line tool"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://github.com/eafer/rdrview"
+distfiles="https://github.com/eafer/rdrview/archive/refs/tags/v${version}.tar.gz"
+checksum=6cb6688b3465f71ced13b889708cbd728193d7137f4108511a3fd2d4331d7f0c
From c989e82b1ac34d2240e2657cac018985589b0da8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 3 Feb 2023 15:33:19 +0100
Subject: [PATCH 298/356] AppStream: update to 0.16.0.
---
srcpkgs/AppStream/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 5eca5e52e637..d6ccdfffeab8 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,11 +1,11 @@
# Template file for 'AppStream'
pkgname=AppStream
-version=0.15.6
+version=0.16.0
revision=1
build_style=meson
build_helper="gir qemu"
configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
- -Dstemming=false -Dapidocs=false -Dqt=true"
+ -Dstemming=false -Dapidocs=false -Dqt=true -Dsystemd=false"
hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
qt5-host-tools $(vopt_if vala vala) itstool"
makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/ximion/appstream"
changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=d46a6689f57aaefb587f01bf91071966b3e65de15b833d11e1911ce07a1350f2
+checksum=ffbd4af94aafd3edd8f965391b95a49b385918ed8633b96406e2c225baffec9b
conf_files="/etc/appstream.conf"
triggers="appstream-cache"
@@ -24,7 +24,7 @@ build_options="gir vala"
build_options_default="gir vala"
AppStream-devel_package() {
- depends="AppStream-${version}_${revision} AppStream-qt-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} AppStream-qt>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 863f74fb91e39ae68e252fbd7390d21d5a3d2c5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 21:43:34 +0100
Subject: [PATCH 299/356] less: fix update-check, add changelog
---
srcpkgs/less/template | 1 +
srcpkgs/less/update | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index b700271611e2..3a6680224b55 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -9,5 +9,6 @@ short_desc="Pager program similar to more(1)"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.greenwoodsoftware.com/less"
+changelog="https://raw.githubusercontent.com/gwsw/less/master/NEWS"
distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
checksum=a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
diff --git a/srcpkgs/less/update b/srcpkgs/less/update
index 50cae37e4fa6..582a7ed6c740 100644
--- a/srcpkgs/less/update
+++ b/srcpkgs/less/update
@@ -1,2 +1 @@
-site='https://greenwoodsoftware.com/less/release.txt'
-pattern='\d+'
+site="https://greenwoodsoftware.com/less/download.html"
From 90f01f909c6b38300d0587e0f5ed620cd76893a4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 6 Feb 2023 12:22:00 +0530
Subject: [PATCH 300/356] noto-fonts-ttf: update to 23.2.1.
Fix update reporting.
---
srcpkgs/noto-fonts-ttf/template | 18 +++++++-----------
srcpkgs/noto-fonts-ttf/update | 1 +
2 files changed, 8 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/noto-fonts-ttf/update
diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index c676d1773e31..d3ac05ed8dfb 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,25 +1,21 @@
# Template file for 'noto-fonts-ttf'
pkgname=noto-fonts-ttf
-version=20220810
+reverts="20220810_1 20190926_2 20190926_1 20181202_1 20181106_1"
+version=23.2.1
revision=1
-_githash=2725c70baa8b0176c7577093ba1fc6179aa79478
depends="font-util"
short_desc="Google Noto TTF Fonts"
maintainer="classabbyamp <void@placeviolette.net>"
license="OFL-1.1"
-homepage="https://www.google.com/get/noto/"
-# XXX: change to https://github.com/notofonts/notofonts.github.io/tree/main/fonts when migration is complete
-# also see https://github.com/notofonts/noto-fonts/issues/2388
-distfiles="https://github.com/notofonts/noto-fonts/archive/${_githash}.tar.gz"
-checksum=c1238ca0fc1e954ee2be444cafd53c033b13fa93f8a1e88f7137e9e028e6891e
+homepage="https://notofonts.github.io/"
+distfiles="https://github.com/notofonts/notofonts.github.io/archive/refs/tags/noto-monthly-release-${version}.tar.gz"
+checksum=af1c9b5e2ea768da792b1a95a5aabd36afc8b76131f04e7adc5ea7857b0c4791
font_dirs="/usr/share/fonts/noto"
do_install() {
- # remove duplicates
- rm hinted/ttf/NotoSansTifinagh/NotoSansTifinagh[AGHRST]*.ttf
+ vlicense fonts/LICENSE
vmkdir usr/share/fonts/noto
- vcopy "hinted/ttf/Noto*/*" usr/share/fonts/noto
- vlicense LICENSE
+ vcopy "fonts/Noto*/hinted/ttf/*.ttf" usr/share/fonts/noto
}
noto-fonts-ttf-extra_package() {
diff --git a/srcpkgs/noto-fonts-ttf/update b/srcpkgs/noto-fonts-ttf/update
new file mode 100644
index 000000000000..f5a25386ba8b
--- /dev/null
+++ b/srcpkgs/noto-fonts-ttf/update
@@ -0,0 +1 @@
+pattern="/archive/refs/tags/noto-monthly-release-\K[\d.]+(?=\.tar\.gz)"
From 90808a5787590cc34ccaa9db69b8b64294a90983 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 8 Feb 2023 17:15:36 +0100
Subject: [PATCH 301/356] chromium: update to 110.0.5481.77.
---
...chromium-110-CredentialUIEntry-const.patch | 41 ++++
...romium-110-DarkModeLABColorSpace-pow.patch | 37 ++++
.../chromium-110-NativeThemeBase-fabs.patch | 29 +++
...the-Stack-object-from-ThreadLocalTop.patch | 205 ++++++++++++++++++
srcpkgs/chromium/template | 11 +-
5 files changed, 317 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
create mode 100644 srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
create mode 100644 srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
create mode 100644 srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
diff --git a/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch b/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
new file mode 100644
index 000000000000..eb68aa27aca4
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
@@ -0,0 +1,41 @@
+From b4e56d22275cae5a910463a966a96345430a83ea Mon Sep 17 00:00:00 2001
+From: Ivan Murashov <ivan.murashov@lge.com>
+Date: Sat, 17 Dec 2022 12:06:01 +0000
+Subject: [PATCH] libstdc++: Don't use const members in std::vector in password_manager::CredentialUIEntry
+
+Otherwise build fails when building with use_custom_libcxx=false.
+The error example:
+std::vector must have a non-const, non-volatile value_type
+
+Implementation of std::vector in libstdc++ does not allow const.
+
+Bug: 957519
+Change-Id: I089de2d52df25138d74dbf01fdf61d6301b4d871
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4111037
+Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
+Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1084697}
+---
+
+diff --git a/components/password_manager/core/browser/ui/credential_ui_entry.cc b/components/password_manager/core/browser/ui/credential_ui_entry.cc
+index 1e0766a..a9a34f7 100644
+--- a/components/password_manager/core/browser/ui/credential_ui_entry.cc
++++ b/components/password_manager/core/browser/ui/credential_ui_entry.cc
+@@ -97,7 +97,7 @@
+ // For cases when the notes differ within grouped passwords (e.g: a
+ // credential exists in both account and profile stores), respective notes
+ // should be concatenated and linebreak used as a delimiter.
+- std::vector<const std::u16string> notes_with_duplicates;
++ std::vector<std::u16string> notes_with_duplicates;
+ for (const auto& form : forms) {
+ // Only notes with an empty `unique_display_name` are supported in the
+ // settings UI.
+@@ -109,7 +109,7 @@
+ }
+ auto unique_notes =
+ base::MakeFlatSet<std::u16string>(std::move(notes_with_duplicates));
+- note = base::JoinString(std::vector<const std::u16string>(
++ note = base::JoinString(std::vector<std::u16string>(
+ unique_notes.begin(), unique_notes.end()),
+ u"\n");
+
diff --git a/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch b/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
new file mode 100644
index 000000000000..91f1aee073e6
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
@@ -0,0 +1,37 @@
+From 795c311aae4b718585bc6194189f061000c823a1 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 23 Dec 2022 14:28:55 +0000
+Subject: [PATCH] libstdc++: fix narrowing in blink::DarkModeLABColorSpace
+
+Clang-14 errors out with narrowing from double to float. Use std::pow
+instead.
+---
+ .../renderer/platform/graphics/dark_mode_lab_color_space.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h b/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
+index 999c3e5..c18ea7b 100644
+--- a/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
++++ b/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
+@@ -125,7 +125,7 @@ class DarkModeLABColorSpace {
+ // https://en.wikipedia.org/wiki/CIELAB_color_space#Reverse_transformation.
+ SkV3 FromXYZ(const SkV3& v) const {
+ auto f = [](float x) {
+- return x > kSigma3 ? pow(x, 1.0f / 3.0f)
++ return x > kSigma3 ? std::pow(x, 1.0f / 3.0f)
+ : x / (3 * kSigma2) + 4.0f / 29.0f;
+ };
+
+@@ -145,7 +145,8 @@ class DarkModeLABColorSpace {
+ // https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
+ SkV3 ToXYZ(const SkV3& lab) const {
+ auto invf = [](float x) {
+- return x > kSigma ? pow(x, 3.0f) : 3.0f * kSigma2 * (x - 4.0f / 29.0f);
++ return x > kSigma ? std::pow(x, 3.0f)
++ : 3.0f * kSigma2 * (x - 4.0f / 29.0f);
+ };
+
+ SkV3 v = {Clamp(lab.x, 0.0f, 100.0f), Clamp(lab.y, -128.0f, 128.0f),
+--
+2.38.2
+
diff --git a/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch b/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
new file mode 100644
index 000000000000..c7d0e8b1de8d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
@@ -0,0 +1,29 @@
+From 07f0a87e4409f27854b3a1d17f270a3497f38947 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 19 Dec 2022 19:07:37 +0000
+Subject: [PATCH] GCC: use fabsf in ui::NativeThemeBase::OutlineColor
+
+Template deduction fails for base::clamp, because return type of
+fabs is double and all other parameters are float.
+
+Bug: 819294
+Change-Id: I34f1c9c99d13f69097d899bfcb0526cbdf4fe1c1
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4110869
+Reviewed-by: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#1085034}
+---
+
+diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
+index 169c60c..36db49a 100644
+--- a/ui/native_theme/native_theme_base.cc
++++ b/ui/native_theme/native_theme_base.cc
+@@ -1336,7 +1336,7 @@
+ // The following code has been tested to look OK with all of the
+ // default GTK themes.
+ SkScalar min_diff = base::clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
+- SkScalar diff = base::clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
++ SkScalar diff = base::clamp(fabsf(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
+
+ if (hsv1[2] + hsv2[2] > 1.0)
+ diff = -diff;
diff --git a/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch b/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
new file mode 100644
index 000000000000..73e042cf5562
--- /dev/null
+++ b/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
@@ -0,0 +1,205 @@
+From 7b6fbcd0a6700db498ad55db046ecda92c8ee8c1 Mon Sep 17 00:00:00 2001
+From: Nikolaos Papaspyrou <nikolaos@chromium.org>
+Date: Sun, 29 Jan 2023 17:18:08 +0100
+Subject: [PATCH] Merge: [heap] Move the Stack object from ThreadLocalTop to
+ Isolate
+
+This is just for nodejs, do not backmerge to 11.0.
+(cherry picked from commit 1e4b71d99fea5ea6bb4bf6420585a7819872bb0f)
+
+> Change-Id: I026a35af3bc6999a09b21f277756d4454c086343
+> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4152476
+> Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
+> Reviewed-by: Omer Katz <omerkatz@chromium.org>
+> Commit-Queue: Nikolaos Papaspyrou <nikolaos@chromium.org>
+> Cr-Commit-Position: refs/heads/main@{#85445}
+
+Stack information is thread-specific and, until now, it was stored in a
+field in ThreadLocalTop. This CL moves stack information to the isolate
+and makes sure to update the stack start whenever a main thread enters
+the isolate. At the same time, the Stack object is refactored and
+simplified.
+
+As a side effect, after removing the Stack object, ThreadLocalTop
+satisfies the std::standard_layout trait; this fixes some issues
+observed with different C++ compilers.
+
+Bug: v8:13630
+Bug: v8:13257
+Change-Id: I4be1f04fe90699e1a6e456dad3e0dd623851acce
+---
+ src/execution/isolate.cc | 36 +++++++++++++++----------------
+ src/execution/isolate.h | 6 ++++++
+ src/execution/thread-local-top.cc | 2 --
+ src/execution/thread-local-top.h | 6 +-----
+ src/heap/heap.cc | 4 +---
+ 5 files changed, 25 insertions(+), 29 deletions(-)
+
+diff --git a/src/execution/isolate.cc b/src/execution/isolate.cc
+index 4edf364e0a..be4fd400d2 100644
+--- a/v8/src/execution/isolate.cc
++++ b/v8/src/execution/isolate.cc
+@@ -3074,22 +3074,23 @@ void Isolate::AddSharedWasmMemory(Handle<WasmMemoryObject> memory_object) {
+ void Isolate::RecordStackSwitchForScanning() {
+ Object current = root(RootIndex::kActiveContinuation);
+ DCHECK(!current.IsUndefined());
+- thread_local_top()->stack_.ClearStackSegments();
+- wasm::StackMemory* stack = Managed<wasm::StackMemory>::cast(
+- WasmContinuationObject::cast(current).stack())
+- .get()
+- .get();
++ stack().ClearStackSegments();
++ wasm::StackMemory* wasm_stack =
++ Managed<wasm::StackMemory>::cast(
++ WasmContinuationObject::cast(current).stack())
++ .get()
++ .get();
+ current = WasmContinuationObject::cast(current).parent();
+- thread_local_top()->stack_.SetStackStart(
+- reinterpret_cast<void*>(stack->base()));
++ heap()->SetStackStart(reinterpret_cast<void*>(wasm_stack->base()));
+ // We don't need to add all inactive stacks. Only the ones in the active chain
+ // may contain cpp heap pointers.
+ while (!current.IsUndefined()) {
+ auto cont = WasmContinuationObject::cast(current);
+- auto* stack = Managed<wasm::StackMemory>::cast(cont.stack()).get().get();
+- thread_local_top()->stack_.AddStackSegment(
+- reinterpret_cast<const void*>(stack->base()),
+- reinterpret_cast<const void*>(stack->jmpbuf()->sp));
++ auto* wasm_stack =
++ Managed<wasm::StackMemory>::cast(cont.stack()).get().get();
++ stack().AddStackSegment(
++ reinterpret_cast<const void*>(wasm_stack->base()),
++ reinterpret_cast<const void*>(wasm_stack->jmpbuf()->sp));
+ current = cont.parent();
+ }
+ }
+@@ -3377,20 +3378,13 @@ void Isolate::Delete(Isolate* isolate) {
+ Isolate* saved_isolate = isolate->TryGetCurrent();
+ SetIsolateThreadLocals(isolate, nullptr);
+ isolate->set_thread_id(ThreadId::Current());
+- isolate->thread_local_top()->stack_ =
+- saved_isolate ? std::move(saved_isolate->thread_local_top()->stack_)
+- : ::heap::base::Stack(base::Stack::GetStackStart());
++ isolate->heap()->SetStackStart(base::Stack::GetStackStart());
+
+ bool owns_shared_isolate = isolate->owns_shared_isolate_;
+ Isolate* maybe_shared_isolate = isolate->shared_isolate_;
+
+ isolate->Deinit();
+
+- // Restore the saved isolate's stack.
+- if (saved_isolate)
+- saved_isolate->thread_local_top()->stack_ =
+- std::move(isolate->thread_local_top()->stack_);
+-
+ #ifdef DEBUG
+ non_disposed_isolates_--;
+ #endif // DEBUG
+@@ -4647,6 +4641,10 @@ bool Isolate::Init(SnapshotData* startup_snapshot_data,
+ void Isolate::Enter() {
+ Isolate* current_isolate = nullptr;
+ PerIsolateThreadData* current_data = CurrentPerIsolateThreadData();
++
++ // Set the stack start for the main thread that enters the isolate.
++ heap()->SetStackStart(base::Stack::GetStackStart());
++
+ if (current_data != nullptr) {
+ current_isolate = current_data->isolate_;
+ DCHECK_NOT_NULL(current_isolate);
+diff --git a/src/execution/isolate.h b/src/execution/isolate.h
+index a32f999fe5..1cb6e10661 100644
+--- a/v8/src/execution/isolate.h
++++ b/v8/src/execution/isolate.h
+@@ -32,6 +32,7 @@
+ #include "src/execution/stack-guard.h"
+ #include "src/handles/handles.h"
+ #include "src/handles/traced-handles.h"
++#include "src/heap/base/stack.h"
+ #include "src/heap/factory.h"
+ #include "src/heap/heap.h"
+ #include "src/heap/read-only-heap.h"
+@@ -2022,6 +2023,8 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
+ SimulatorData* simulator_data() { return simulator_data_; }
+ #endif
+
++ ::heap::base::Stack& stack() { return stack_; }
++
+ #ifdef V8_ENABLE_WEBASSEMBLY
+ wasm::StackMemory*& wasm_stacks() { return wasm_stacks_; }
+ // Update the thread local's Stack object so that it is aware of the new stack
+@@ -2520,6 +2523,9 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
+ // The mutex only guards adding pages, the retrieval is signal safe.
+ base::Mutex code_pages_mutex_;
+
++ // Stack information for the main thread.
++ ::heap::base::Stack stack_;
++
+ #ifdef V8_ENABLE_WEBASSEMBLY
+ wasm::StackMemory* wasm_stacks_;
+ #endif
+diff --git a/src/execution/thread-local-top.cc b/src/execution/thread-local-top.cc
+index 0d7071ddda..05cc20b8e4 100644
+--- a/v8/src/execution/thread-local-top.cc
++++ b/v8/src/execution/thread-local-top.cc
+@@ -37,14 +37,12 @@ void ThreadLocalTop::Clear() {
+ current_embedder_state_ = nullptr;
+ failed_access_check_callback_ = nullptr;
+ thread_in_wasm_flag_address_ = kNullAddress;
+- stack_ = ::heap::base::Stack();
+ }
+
+ void ThreadLocalTop::Initialize(Isolate* isolate) {
+ Clear();
+ isolate_ = isolate;
+ thread_id_ = ThreadId::Current();
+- stack_.SetStackStart(base::Stack::GetStackStart());
+ #if V8_ENABLE_WEBASSEMBLY
+ thread_in_wasm_flag_address_ = reinterpret_cast<Address>(
+ trap_handler::GetThreadInWasmThreadLocalAddress());
+diff --git a/src/execution/thread-local-top.h b/src/execution/thread-local-top.h
+index 43fec0a7df..989c817f31 100644
+--- a/v8/src/execution/thread-local-top.h
++++ b/v8/src/execution/thread-local-top.h
+@@ -10,7 +10,6 @@
+ #include "include/v8-unwinder.h"
+ #include "src/common/globals.h"
+ #include "src/execution/thread-id.h"
+-#include "src/heap/base/stack.h"
+ #include "src/objects/contexts.h"
+ #include "src/utils/utils.h"
+
+@@ -30,7 +29,7 @@ class ThreadLocalTop {
+ // TODO(all): This is not particularly beautiful. We should probably
+ // refactor this to really consist of just Addresses and 32-bit
+ // integer fields.
+- static constexpr uint32_t kSizeInBytes = 30 * kSystemPointerSize;
++ static constexpr uint32_t kSizeInBytes = 25 * kSystemPointerSize;
+
+ // Does early low-level initialization that does not depend on the
+ // isolate being present.
+@@ -147,9 +146,6 @@ class ThreadLocalTop {
+
+ // Address of the thread-local "thread in wasm" flag.
+ Address thread_in_wasm_flag_address_;
+-
+- // Stack information.
+- ::heap::base::Stack stack_;
+ };
+
+ } // namespace internal
+diff --git a/src/heap/heap.cc b/src/heap/heap.cc
+index 51a90ddcab..b5722ab6ec 100644
+--- a/v8/src/heap/heap.cc
++++ b/v8/src/heap/heap.cc
+@@ -5851,9 +5851,7 @@ void Heap::SetStackStart(void* stack_start) {
+ stack().SetStackStart(stack_start);
+ }
+
+-::heap::base::Stack& Heap::stack() {
+- return isolate_->thread_local_top()->stack_;
+-}
++::heap::base::Stack& Heap::stack() { return isolate_->stack(); }
+
+ void Heap::RegisterExternallyReferencedObject(Address* location) {
+ Object object = TracedHandles::Mark(location, TracedHandles::MarkMode::kAll);
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 54b2bc4fd3a3..b4b03f3b1410 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,14 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=109.0.5414.119
+version=110.0.5481.77
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm12")
$(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel wayland-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -18,7 +18,7 @@ makedepends="
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,7 +28,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d
+checksum=e348ab2dc4311083e729d714a81e95dd9db108ff71437dde451c97ac939881ce
lib32disabled=yes
@@ -213,8 +213,7 @@ do_configure() {
'enable_hangout_services_extension=true'
'use_system_harfbuzz=false'
- 'use_system_libwayland=true'
- 'use_system_wayland_scanner=true'
+ 'use_system_libffi=true'
'use_qt=false'
From dfd9b1c1ade601f7dc12d4a29f72a4c06053bb23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Feb 2023 19:54:31 +0100
Subject: [PATCH 302/356] domain_exporter: update to 0.1.24.
---
srcpkgs/domain_exporter/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 5035a3b4240c..b122720b0c71 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,13 +1,12 @@
# Template file for 'domain_exporter'
pkgname=domain_exporter
-version=0.1.8
+version=0.1.24
revision=1
build_style=go
go_import_path="github.com/shift/domain_exporter"
-hostmakedepends="git"
short_desc="Prometheus WHOIS domain details exporter"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/shift/domain_exporter"
distfiles="https://github.com/shift/domain_exporter/archive/v${version}.tar.gz"
-checksum=f45a60f75832cf6b2df8943b570a636956901399d01f10b2d6bbf7e5ed24077d
+checksum=62262d3234f7404859b21647dbb3661e425eeb44b9fad8e5368ddc4bd91364f2
From fd5444bb2574a5fc2d5fc002876af1d4afa55df2 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 9 Feb 2023 05:04:14 -0500
Subject: [PATCH 303/356] discord-ptb: update to 0.0.39.
---
srcpkgs/discord-ptb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index eb92370a7d8e..86351339a372 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
# Template file for 'discord-ptb'
pkgname=discord-ptb
-version=0.0.38
+version=0.0.39
revision=1
archs="x86_64"
depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="custom:Proprietary"
homepage="https://discord.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=6cf83b64d410c44a514a9a7c8f9fd72c10c427221df260c6c52eadaa4cf3235b
+checksum=2e80e0de2c0ad7cac3b3353f75010ad3f27c0c8c6bab276c7df959a3c200464b
nopie=yes
restricted=yes
repository=nonfree
From 8087666b296c2789f17dda23ca0ad9ad6a660a92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Feb 2023 19:54:31 +0100
Subject: [PATCH 304/356] element-desktop: add Proper MimeType to .desktop
---
srcpkgs/element-desktop/files/element-desktop.desktop | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/element-desktop/files/element-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
index e8ab06a41aaa..640f029499c9 100644
--- a/srcpkgs/element-desktop/files/element-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -7,3 +7,4 @@ Type=Application
Icon=element
StartupWMClass=element
Categories=Network;InstantMessaging;Chat;IRCClient
+MimeType=x-scheme-handler/element;
From a2dc1f68bf98217d51c2ffb3697b74c03694e40a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Feb 2023 09:12:51 +0100
Subject: [PATCH 305/356] uchardet: update to 0.0.8.
---
srcpkgs/uchardet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uchardet/template b/srcpkgs/uchardet/template
index 1a2f1e2f6d74..8b7e4a2f870f 100644
--- a/srcpkgs/uchardet/template
+++ b/srcpkgs/uchardet/template
@@ -1,6 +1,6 @@
# Template file for 'uchardet'
pkgname=uchardet
-version=0.0.7
+version=0.0.8
revision=1
build_style=cmake
short_desc="Encoding detector library ported from Mozilla"
@@ -9,7 +9,7 @@ license="MPL-1.1"
homepage="https://www.freedesktop.org/wiki/Software/uchardet"
changelog="https://cgit.freedesktop.org/uchardet/uchardet/tag/?id=v${version}"
distfiles="$FREEDESKTOP_SITE/uchardet/releases/uchardet-${version}.tar.xz"
-checksum=3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1
+checksum=e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0
uchardet-devel_package() {
short_desc+=" - development files"
From b7cade31e99fd76563eec55ee59d87feba7ffcc1 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 6 Feb 2023 10:31:09 +0100
Subject: [PATCH 306/356] python3-PGPy: update to 0.6.0.
---
srcpkgs/python3-PGPy/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index 5268c19777ad..ee059076e373 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,18 +1,17 @@
# Template file for 'python3-PGPy'
pkgname=python3-PGPy
-version=0.5.4
-revision=2
+version=0.6.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-cryptography python3-pyasn1 python3-six"
+checkdepends="python3-pytest python3-progressbar $depends"
short_desc="Pretty Good Privacy for Python"
maintainer="Anjandev Momi <anjan@momi.ca>"
license="BSD-3-Clause"
homepage="https://github.com/SecurityInnovation/PGPy"
distfiles="https://github.com/SecurityInnovation/PGPy/archive/v${version}.tar.gz"
-checksum=beb2e7745ddebf85a24239aa681fa83a9ab8f8867d7ac55351fb0732279ac4fa
-# requires progressbar
-make_check=no
+checksum=33028fc2c47718a9215311bb22d6fed042074afbc91bf4e9764fdf0df54fc2b3
post_install() {
vlicense LICENSE
From 49b1990df1d3b0537eb9c217eaf342d48613a706 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:04:30 +0100
Subject: [PATCH 307/356] byacc: update to 20230201.
---
srcpkgs/byacc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 5f9d13aed378..c4165b043ced 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
# Template file for 'byacc'
pkgname=byacc
-version=20221229
+version=20230201
revision=1
build_style=gnu-configure
configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="https://invisible-island.net/byacc/"
distfiles="ftp://ftp.invisible-island.net/byacc/byacc-${version}.tgz"
-checksum=1316c6f790fafa6688427f1ff91267b61d8b7873b443c620eef69a6eff0503bc
+checksum=576cc9d9ae5e22503ed5e3582498cf2cccacef401969106420547b4d05c87d76
alternatives="
yacc:yacc:/usr/bin/byacc
From 3eecf04b518447ba4203308c9a412a8cba7a2a5c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 5 Feb 2023 10:33:31 +0300
Subject: [PATCH 308/356] darkhttpd: update to 1.14.
Closes: #42087 [via git-merge-pr]
---
srcpkgs/darkhttpd/template | 20 +++++++++-----------
srcpkgs/darkhttpd/update | 1 -
2 files changed, 9 insertions(+), 12 deletions(-)
delete mode 100644 srcpkgs/darkhttpd/update
diff --git a/srcpkgs/darkhttpd/template b/srcpkgs/darkhttpd/template
index 4a07f0c0ae51..9168438d17c7 100644
--- a/srcpkgs/darkhttpd/template
+++ b/srcpkgs/darkhttpd/template
@@ -1,27 +1,25 @@
# Template file for 'darkhttpd'
pkgname=darkhttpd
-version=1.13
+version=1.14
revision=1
short_desc="Small and secure static webserver"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="ISC"
homepage="https://unix4lyfe.org/darkhttpd/"
-distfiles="https://github.com/emikulic/darkhttpd/archive/v${version}.tar.gz"
-checksum=1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2
-CFLAGS="$CFLAGS $LDFLAGS"
+distfiles="https://github.com/emikulic/darkhttpd/archive/refs/tags/v${version}.tar.gz"
+checksum=e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195
# Create darkhttpd system user/group
system_accounts="_darkhttpd"
-make_dirs="/srv/www/${pkgname} 0755 _${pkgname} _${pkgname}
- /var/log/${pkgname} 0755 _${pkgname} _${pkgname}"
+make_dirs="/srv/www/darkhttpd 0755 _darkhttpd _darkhttpd
+ /var/log/darkhttpd 0755 _darkhttpd _darkhttpd"
do_build() {
- ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${pkgname}.c -o ${pkgname}
+ ${CC} ${CFLAGS} ${LDFLAGS} darkhttpd.c -o darkhttpd
}
do_install() {
- vsv ${pkgname}
- vbin ${pkgname}
- sed -n '0,/^$/p' darkhttpd.c > LICENSE
- vlicense LICENSE
+ vsv darkhttpd
+ vbin darkhttpd
+ vlicense COPYING LICENSE
}
diff --git a/srcpkgs/darkhttpd/update b/srcpkgs/darkhttpd/update
deleted file mode 100644
index 2c906cdbfdeb..000000000000
--- a/srcpkgs/darkhttpd/update
+++ /dev/null
@@ -1 +0,0 @@
-site=https://unix4lyfe.org/darkhttpd/
From 53e3703b84c12f8df37f9eef137611dc9581d7fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:18:18 +0100
Subject: [PATCH 309/356] acpid: don't generate events for cursor keys and
keypad enter.
Closes #41994.
---
srcpkgs/acpid/patches/no-cursor-events.patch | 16 ++++++++++++++++
srcpkgs/acpid/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/acpid/patches/no-cursor-events.patch
diff --git a/srcpkgs/acpid/patches/no-cursor-events.patch b/srcpkgs/acpid/patches/no-cursor-events.patch
new file mode 100644
index 000000000000..983c291153c2
--- /dev/null
+++ b/srcpkgs/acpid/patches/no-cursor-events.patch
@@ -0,0 +1,16 @@
+--- a/input_layer.c
++++ b/input_layer.c
+@@ -181,11 +181,13 @@
+ "button/kbdillumdown KBILLUMDOWN 00000080 00000000" },
+ { EV_KEY, KEY_COPY, 1, "button/copy COPY 00000080 00000000" },
+ { EV_KEY, KEY_RESTART, 1, "button/restart RSTR 00000080 00000000" },
++#if 0
+ { EV_KEY, KEY_KPENTER, 1, "button/kpenter KPENTER 00000080 00000000" },
+ { EV_KEY, KEY_UP, 1, "button/up UP 00000080 00000000" },
+ { EV_KEY, KEY_LEFT, 1, "button/left LEFT 00000080 00000000" },
+ { EV_KEY, KEY_RIGHT, 1, "button/right RIGHT 00000080 00000000" },
+ { EV_KEY, KEY_DOWN, 1, "button/down DOWN 00000080 00000000" },
++#endif
+ { EV_KEY, KEY_MENU, 1, "button/menu MENU 00000080 00000000" },
+ { EV_KEY, KEY_BACK, 1, "button/back BACK 00000080 00000000" },
+ { EV_KEY, KEY_HOMEPAGE, 1, "button/homepage HOMEPAGE 00000080 00000000" },
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 6e066b9409ba..1c498a233322 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,7 @@
# Template file for 'acpid'
pkgname=acpid
version=2.0.34
-revision=1
+revision=2
build_style=gnu-configure
short_desc="ACPI Daemon (acpid) With Netlink Support"
maintainer="Enno Boland <gottox@voidlinux.org>"
From bdef53b8838f51a7d6edd1ae50c955df775eaabd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:24:57 +0100
Subject: [PATCH 310/356] collectl: update to 4.3.8.
---
srcpkgs/collectl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 8eb6009ab822..0bb564862bfe 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,6 +1,6 @@
# Template file for 'collectl'
pkgname=collectl
-version=4.3.7
+version=4.3.8
revision=1
conf_files="/etc/collectl.conf"
depends="perl perl-Term-ReadKey"
@@ -10,7 +10,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
homepage="https://collectl.sourceforge.net/"
changelog="https://collectl.sourceforge.net/Releases.html"
distfiles="${SOURCEFORGE_SITE}/collectl/collectl-${version}.src.tar.gz"
-checksum=36a4cdf61c6880cc77fedf19a3bf10503e3f0783d77f589ba570a3006d501d5e
+checksum=6831de65a0af377b7dc92bd6439253f4f5d06cd77752d7ec5b8d92bfaa28240a
do_install() {
export DESTDIR
From c9e9b9131b49d2f540594b0c9203dbc9ff99e23a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:25:57 +0100
Subject: [PATCH 311/356] python3-pipenv: update to 2023.2.4.
---
srcpkgs/python3-pipenv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 5f819ac2c958..c619da985ef8 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pipenv'
pkgname=python3-pipenv
-version=2022.12.19
+version=2023.2.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/pypa/pipenv"
changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=56a0e9305912293a8205e23b836b4abb9bca912fd5ef131214cdcdbc1861a1cc
+checksum=18a3eba519e36d59f0d5a7f9c42bd268521e4b9b7b3d1bd6adcf131569323275
conflicts="python-pipenv>=0"
make_check=no # tests are not contained in release tarball
From 2e0654ebb059d1ac281146d45cd3e6c6550f0cdd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:30:21 +0100
Subject: [PATCH 312/356] tig: update to 2.5.8.
---
srcpkgs/tig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index dbaae5bc2c3d..ee1ffcd00619 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -1,6 +1,6 @@
# Template file for 'tig'
pkgname=tig
-version=2.5.7
+version=2.5.8
revision=1
build_style=gnu-configure
make_install_args="install-doc-man"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="https://jonas.github.io/tig/"
changelog="https://github.com/jonas/tig/blob/master/NEWS.adoc"
distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
-checksum=60a1acfda3238df28dfbe309adc1892a8c9b35138c738f1567c6c3c65c81fb72
+checksum=d8cbfe4ede9d79b0da93d9002e79e8e466d5b4d2eee3dfa3dabf9cd5551a51c9
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 18efd0bd1d32dc9a86f69ec6f89571fe81b33c1f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:48:55 +0100
Subject: [PATCH 313/356] qemacs: update to 5.4.1c.
Upstream moved to Github.
---
srcpkgs/qemacs/template | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/qemacs/template b/srcpkgs/qemacs/template
index a82bd65e0d37..dd6101eb9ac2 100644
--- a/srcpkgs/qemacs/template
+++ b/srcpkgs/qemacs/template
@@ -1,34 +1,29 @@
# Template file for 'qemacs'
pkgname=qemacs
-version=0.5.0.20170701
-revision=3
-create_wrksrc=yes
-build_wrksrc=qemacs
+version=5.4.1c
+revision=1
+_githash=216b3ff8b77ff138aec22045522d5601b7390e58
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man
--disable-x11 --disable-plugins"
-hostmakedepends="cvs"
short_desc="Small but powerful Emacs clone (with UTF-8, HTML, shell, dired)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
-homepage="https://bellard.org/qemacs/"
+homepage="https://github.com/qemacs/qemacs"
+distfiles="https://github.com/qemacs/qemacs/archive/${_githash}.tar.gz"
+checksum=cacf12beb925c427204db8e828f1c5bad41cff3439293d03e28631b6a9e66869
-do_fetch() {
- cd ${wrksrc}
- cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs \
- co -D ${version##*.} qemacs
-}
do_build() {
sed -i -e /HOST_CC/s/CFLAGS/HOST_CFLAGS/ -e /INSTALL/s/-s// \
Makefile */Makefile
echo CONFIG_HTML=yes >>config.mak
echo '#define CONFIG_HTML 1' >>config.h
- make V=1 TARGETS=qe STRIP=echo CC="$CC" \
- CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
+ make ${makejobs} V=1 TARGETS=qe STRIP=true CC="$CC" \
+ CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.. -I." \
LDFLAGS="$LDFLAGS"
}
do_install() {
- make V=1 TARGETS=qe STRIP=echo CC="$CC" \
+ make V=1 TARGETS=qe STRIP=true CC="$CC" \
CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
LDFLAGS="$LDFLAGS" CONFIG_HTML= DESTDIR="$DESTDIR" install
vdoc qe-doc.html
From 305a39591ef5a918c9afa5d3982a91b3e02c868b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 16:19:21 +0100
Subject: [PATCH 314/356] bpftrace: update to 0.17.0.
---
srcpkgs/bpftrace/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 857815d29eef..952682662128 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,10 +1,10 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.16.0
+version=0.17.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
-configure_args="-DBUILD_TESTING=OFF" # needs root to run
+configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
@@ -12,12 +12,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
+checksum=ccc853205b081fd7e4270016065ccc04764286644bf8e0eee9bd7f344cad63e5
nostrip=yes # needs to read own symbol table
-post_extract() {
- vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' src/btf.cpp
-}
+CXXFLAGS="-isystem ${XBPS_CROSS_BASE}/usr/include/bcc/compat"
post_install() {
# clashes with bcc-tools
From ad2c5064d8595cbbf3b759fda52577984989d761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Feb 2023 19:21:18 +0100
Subject: [PATCH 315/356] qemacs: disable parallel build
---
srcpkgs/qemacs/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/qemacs/template b/srcpkgs/qemacs/template
index dd6101eb9ac2..25b37fcdf1cb 100644
--- a/srcpkgs/qemacs/template
+++ b/srcpkgs/qemacs/template
@@ -12,6 +12,8 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/qemacs/qemacs"
distfiles="https://github.com/qemacs/qemacs/archive/${_githash}.tar.gz"
checksum=cacf12beb925c427204db8e828f1c5bad41cff3439293d03e28631b6a9e66869
+# make: *** No rule to make target '.objs/Linux-x86_64-riscv64-linux-gnu-gcc/libqhtml.a', needed by 'qe_g'. Stop.
+disable_parallel_build=yes
do_build() {
sed -i -e /HOST_CC/s/CFLAGS/HOST_CFLAGS/ -e /INSTALL/s/-s// \
From 989c83bb812a897332c19e27c6d3f1f89da739a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 22:00:03 +0100
Subject: [PATCH 316/356] caddy: update to 2.6.3.
---
srcpkgs/caddy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 8a52cdf5933b..5fd43bb04758 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
# Template file for 'caddy'
pkgname=caddy
-version=2.6.2
-revision=2
+version=2.6.3
+revision=1
build_style=go
go_import_path=github.com/caddyserver/caddy/v2
go_package="${go_import_path}/cmd/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="Apache-2.0"
homepage="https://caddyserver.com"
distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=563d027a78919f859188fb894ae5f3669508a3430db347aa726cd73c19fb7038
+checksum=86d6bb9b90fb21b223dc570eb2ccc8cf917750d70fb0d9c4a86d3ec6c13c712c
system_accounts="caddy"
caddy_homedir="/var/lib/caddy"
From 29333991805b1ebb52484ef2804fb90e07aa0e6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 9 Feb 2023 20:12:43 +0100
Subject: [PATCH 317/356] youtube-viewer: update to 3.10.6.
---
srcpkgs/youtube-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index c7efbf8d0213..d4016db082c8 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-viewer'
pkgname=youtube-viewer
-version=3.10.5
+version=3.10.6
revision=1
build_style=perl-ModuleBuild
configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
homepage="https://github.com/trizen/youtube-viewer"
changelog="https://github.com/trizen/youtube-viewer/releases"
distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=5b2c2cf14ecd6aa18a681e3c25ca64720ec4c56cfd179f07d64d84ec4c5054ff
+checksum=4a01984b6b6fd870eb873dd3838411119a23c46950ec10f8f1c460513c218ac4
gtk-youtube-viewer_package() {
depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
From 5d5f5a6ef4fe28e80cb8baa3909ba3be70185b9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 9 Feb 2023 16:48:06 -0500
Subject: [PATCH 318/356] python3-pyzbar: update to 0.1.9.
---
srcpkgs/python3-pyzbar/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
index 2e982852c090..7bf276853321 100644
--- a/srcpkgs/python3-pyzbar/template
+++ b/srcpkgs/python3-pyzbar/template
@@ -1,16 +1,17 @@
# Template file for 'python3-pyzbar'
pkgname=python3-pyzbar
-version=0.1.8
-revision=6
+version=0.1.9
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="libzbar python3"
+checkdepends="python3-pytest-xdist python3-Pillow python3-numpy $depends"
short_desc="Read one-dimensional barcodes and QR codes"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://github.com/NaturalHistoryMuseum/pyzbar/"
distfiles="https://github.com/NaturalHistoryMuseum/pyzbar/archive/v${version}.tar.gz"
-checksum=f51c82c2864f8e5a8d44f55853e027f8cbc592324b7afffa62100f2f9c54cbdb
+checksum=6b84ec4c1f36df590c65b610a7757ef8829f202a7df210d2891e6592a8bee8bb
conflicts="python-pyzbar>=0"
post_install() {
From 1f4b76a8b684e0425572ea2922d9c3573233e596 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:02:12 -0500
Subject: [PATCH 319/356] common/environment/setup/install.sh: always add log
service
- overridable by having a log service at `$pkgname/files/$service/log`
- warns if stderr is not redirected in the main service
- uses a sane default run script with the service name set as tag and
daemon facility
---
common/environment/setup/install.sh | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index 5f0571de14ae..b0c5b22f4c2a 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -19,11 +19,12 @@ done
_vsv() {
local service="$1"
+ local facility="${2:-daemon}"
local LN_OPTS="-s"
local svdir="${PKGDESTDIR}/etc/sv/${service}"
- if [ $# -lt 1 ]; then
- msg_red "$pkgver: vsv: 1 argument expected: <service>\n"
+ if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+ msg_red "$pkgver: vsv: up to 2 arguments expected: <service> [<log facility>]\n"
return 1
fi
@@ -34,17 +35,25 @@ _vsv() {
vmkdir etc/sv
vcopy "${FILESDIR}/$service" etc/sv
if [ ! -L $svdir/run ]; then
+ grep -Fq 'exec 2>&1' $svdir/run || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
chmod 755 $svdir/run
fi
if [ -e $svdir/finish ] && [ ! -L $svdir/finish ]; then
chmod 755 $svdir/finish
fi
ln ${LN_OPTS} /run/runit/supervise.${service} $svdir/supervise
- if [ -d $svdir/log ]; then
- ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
- if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
- chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
- fi
+ if [ -d $svdir/log ] || [ -L $svdir/log ]; then
+ msg_warn "$pkgver: vsv: overriding default log service\n"
+ else
+ mkdir $svdir/log
+ cat <<-EOF > $svdir/log/run
+ #!/bin/sh
+ exec vlogger -t $service -p $facility
+ EOF
+ fi
+ ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
+ if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
+ chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
fi
}
From a8e751194d0249b2d45815f16ca4c0dea3e219a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:09:42 -0500
Subject: [PATCH 320/356] Manual.md: document vsv log autocreation
---
Manual.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index a5e99d29fe4c..31494036d5e2 100644
--- a/Manual.md
+++ b/Manual.md
@@ -304,7 +304,7 @@ The following functions are defined by `xbps-src` and can be used on any templat
`$DESTDIR`. The optional 2nd argument can be used to change the
`file name`. See [license](#var_license) for when to use it.
-- *vsv()* `vsv <service>`
+- *vsv()* `vsv <service> [<facility>]`
Installs `service` from `${FILESDIR}` to /etc/sv. The service must
be a directory containing at least a run script. Note the `supervise`
@@ -312,6 +312,11 @@ The following functions are defined by `xbps-src` and can be used on any templat
is automatically made executable by this function.
For further information on how to create a new service directory see
[The corresponding section the FAQ](http://smarden.org/runit/faq.html#create).
+ A `log` sub-service will be automatically created if one does not exist in
+ `${FILESDIR}/$service`, containing `exec vlogger -t $service -p $facility`.
+ if a second argument is not specified, the `daemon` facility is used.
+ For more information about `vlogger` and available values for the facility,
+ see [vlogger(1)](https://man.voidlinux.org/vlogger.1).
- *vsed()* `vsed -i <file> -e <regex>`
From c07f8d13a1be73c0974c65772da7ab7f33729bd8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:10:03 -0500
Subject: [PATCH 321/356] *: remove log dir en-masse
---
srcpkgs/Clightd/files/Clightd/log/run | 3 ---
srcpkgs/Gokapi/files/gokapi/log/run | 3 ---
srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run | 4 ----
srcpkgs/NetAuth/files/netauthd/log/run | 4 ----
srcpkgs/PopCorn/files/popcorn/log/run | 2 --
srcpkgs/TerraState/files/terrastate/log/run | 4 ----
srcpkgs/activityrelay/files/activityrelay/log/run | 1 -
srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run | 2 --
srcpkgs/apache-kafka/files/apache-kafka/log/run | 2 --
srcpkgs/autofs/files/autofs/log/run | 2 --
srcpkgs/beanstalkd/files/beanstalkd/log/run | 2 --
srcpkgs/bind/files/named/log/run | 2 --
srcpkgs/bluez/files/bluetooth-meshd/log/run | 1 -
srcpkgs/bluez/files/bluetoothd/log/run | 1 -
srcpkgs/boinc/files/boinc/log/run | 1 -
srcpkgs/busybox/files/busybox-ntpd/log/run | 2 --
srcpkgs/caddy/files/caddy/log/run | 1 -
srcpkgs/ckb-next/files/ckb-next-daemon/log/run | 2 --
srcpkgs/conduit/files/conduit/log/run | 1 -
srcpkgs/coredns/files/coredns/log/run | 3 ---
srcpkgs/coturn/files/coturnserver/log/run | 1 -
srcpkgs/cronie/files/cronie/log/run | 2 --
srcpkgs/dcron/files/dcron/log/run | 2 --
srcpkgs/dendrite/files/dendrite-monolith-server/log/run | 1 -
srcpkgs/dhcp/files/dhclient/log/run | 1 -
srcpkgs/dhcp/files/dhcpd4/log/run | 1 -
srcpkgs/dhcp/files/dhcpd6/log/run | 1 -
srcpkgs/dkimproxy/files/dkimproxy_in/log/run | 2 --
srcpkgs/dkimproxy/files/dkimproxy_out/log/run | 2 --
srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run | 2 --
srcpkgs/dotool/files/dotoold/log/run | 2 --
srcpkgs/dq/files/dqcache/log/run | 2 --
srcpkgs/duiadns/files/duiadns/log/run | 3 ---
srcpkgs/earlyoom/files/earlyoom/log/run | 2 --
srcpkgs/espeakup/files/espeakup/log/run | 2 --
srcpkgs/gerbera/files/gerbera/log/run | 1 -
srcpkgs/gitea/files/gitea/log/run | 1 -
srcpkgs/go-ipfs/files/ipfs/log/run | 1 -
srcpkgs/goatcounter/files/goatcounter/log/run | 2 --
srcpkgs/gotify-server/files/gotify-server/log/run | 1 -
srcpkgs/grafana/files/grafana/log/run | 2 --
srcpkgs/grub-btrfs/files/grub-btrfs/log/run | 2 --
srcpkgs/i2pd/files/i2pd/log/run | 1 -
srcpkgs/incron/files/incron/log/run | 2 --
srcpkgs/influxdb/files/influxdb/log/run | 2 --
srcpkgs/iwd/files/ead/log/run | 2 --
srcpkgs/iwd/files/iwd/log/run | 2 --
srcpkgs/libvirt/files/libvirt-generic/log/run | 7 -------
srcpkgs/libvirt/files/libvirtd/log/run | 1 -
srcpkgs/libvirt/files/virtinterfaced/log/run | 1 -
srcpkgs/libvirt/files/virtlockd/log/run | 1 -
srcpkgs/libvirt/files/virtlogd/log/run | 1 -
srcpkgs/libvirt/files/virtlxcd/log/run | 1 -
srcpkgs/libvirt/files/virtnetworkd/log/run | 1 -
srcpkgs/libvirt/files/virtnodedevd/log/run | 1 -
srcpkgs/libvirt/files/virtnwfilterd/log/run | 1 -
srcpkgs/libvirt/files/virtproxyd/log/run | 1 -
srcpkgs/libvirt/files/virtqemud/log/run | 1 -
srcpkgs/libvirt/files/virtsecretd/log/run | 1 -
srcpkgs/libvirt/files/virtstoraged/log/run | 1 -
srcpkgs/libvirt/files/virtvboxd/log/run | 1 -
srcpkgs/libvirt/files/virtxend/log/run | 1 -
srcpkgs/lldpd/files/lldpd/log/run | 1 -
srcpkgs/lsyncd/files/lsyncd/log/run | 2 --
srcpkgs/lxd/files/lxd/log/run | 2 --
srcpkgs/mariadb/files/mysqld/log/run | 2 --
srcpkgs/minidlna/files/minidlnad/log/run | 1 -
srcpkgs/miniflux/files/miniflux/log/run | 1 -
srcpkgs/minio/files/minio/log/run | 2 --
srcpkgs/moby/files/docker/log/run | 1 -
srcpkgs/monero/files/monerod/log/run | 3 ---
srcpkgs/mumble/files/mumble-server/log/run | 3 ---
srcpkgs/ndhc/files/ndhc/log/run | 2 --
srcpkgs/ndppd/files/ndppd/log/run | 3 ---
srcpkgs/neard/files/neard/log/run | 1 -
srcpkgs/neard/files/seeld/log/run | 1 -
srcpkgs/nebula/files/nebula/log/run | 2 --
srcpkgs/net-snmp/files/snmpd/log/run | 1 -
srcpkgs/node_exporter/files/node_exporter/log/run | 2 --
srcpkgs/openntpd/files/openntpd/log/run | 2 --
srcpkgs/openrgb/files/openrgb/log/run | 2 --
srcpkgs/oragono/files/oragono/log/run | 2 --
srcpkgs/podman/files/podman/log/run | 1 -
srcpkgs/postgresql14/files/postgresql14/log/run | 2 --
srcpkgs/postgresql15/files/postgresql15/log/run | 2 --
srcpkgs/preload/files/preload/log/run | 2 --
srcpkgs/privoxy/files/privoxy/log/run | 2 --
srcpkgs/prometheus/files/prometheus/log/run | 2 --
srcpkgs/qrtr-ns/files/qrtr-ns/log/run | 1 -
srcpkgs/radicale/files/radicale/log/run | 2 --
srcpkgs/routinator/files/routinator/log/run | 1 -
srcpkgs/samba/files/ctdbd/log/run | 2 --
srcpkgs/samba/files/nmbd/log/run | 2 --
srcpkgs/samba/files/smbd/log/run | 2 --
srcpkgs/sklogw/files/sklogw/log/run | 5 -----
srcpkgs/snapcast/files/snapclient/log/run | 2 --
srcpkgs/snapcast/files/snapserver/log/run | 2 --
srcpkgs/sndio/files/sndiod/log/run | 2 --
srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run | 3 ---
srcpkgs/soju/files/soju/log/run | 2 --
srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run | 2 --
srcpkgs/sqmail/files/qmail-send/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpd/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpsd/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpsub/log/run | 2 --
srcpkgs/stubby/files/stubby/log/run | 2 --
srcpkgs/syncthing/files/discosrv/log/run | 3 ---
srcpkgs/syncthing/files/relaysrv/log/run | 3 ---
srcpkgs/tailscale/files/tailscaled/log/run | 4 ----
srcpkgs/thermald/files/thermald/log/run | 1 -
srcpkgs/tqftpserv/files/tqftpserv/log/run | 1 -
srcpkgs/trousers/files/tcsd/log/run | 2 --
srcpkgs/umurmur/files/umurmurd/log/run | 3 ---
srcpkgs/up_rewrite/files/up_rewrite/log/run | 1 -
srcpkgs/upmpdcli/files/upmpdcli/log/run | 2 --
srcpkgs/varnish/files/varnishd/log/run | 2 --
srcpkgs/vaultwarden/files/vaultwarden/log/run | 1 -
srcpkgs/vnstat/files/vnstatd/log/run | 1 -
srcpkgs/waydroid/files/waydroid-container/log/run | 1 -
srcpkgs/webhook/files/webhook/log/run | 2 --
srcpkgs/wireplumber/files/wireplumber/log/run | 3 ---
srcpkgs/x2goserver/files/x2gocleansessions/log/run | 2 --
srcpkgs/yggdrasil/files/yggdrasil/log/run | 1 -
srcpkgs/znc/files/znc/log/run | 1 -
124 files changed, 228 deletions(-)
delete mode 100644 srcpkgs/Clightd/files/Clightd/log/run
delete mode 100644 srcpkgs/Gokapi/files/gokapi/log/run
delete mode 100644 srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
delete mode 100644 srcpkgs/NetAuth/files/netauthd/log/run
delete mode 100644 srcpkgs/PopCorn/files/popcorn/log/run
delete mode 100644 srcpkgs/TerraState/files/terrastate/log/run
delete mode 120000 srcpkgs/activityrelay/files/activityrelay/log/run
delete mode 100644 srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
delete mode 100644 srcpkgs/apache-kafka/files/apache-kafka/log/run
delete mode 100644 srcpkgs/autofs/files/autofs/log/run
delete mode 100755 srcpkgs/beanstalkd/files/beanstalkd/log/run
delete mode 100644 srcpkgs/bind/files/named/log/run
delete mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
delete mode 120000 srcpkgs/bluez/files/bluetoothd/log/run
delete mode 120000 srcpkgs/boinc/files/boinc/log/run
delete mode 100755 srcpkgs/busybox/files/busybox-ntpd/log/run
delete mode 120000 srcpkgs/caddy/files/caddy/log/run
delete mode 100644 srcpkgs/ckb-next/files/ckb-next-daemon/log/run
delete mode 120000 srcpkgs/conduit/files/conduit/log/run
delete mode 100755 srcpkgs/coredns/files/coredns/log/run
delete mode 120000 srcpkgs/coturn/files/coturnserver/log/run
delete mode 100755 srcpkgs/cronie/files/cronie/log/run
delete mode 100755 srcpkgs/dcron/files/dcron/log/run
delete mode 120000 srcpkgs/dendrite/files/dendrite-monolith-server/log/run
delete mode 120000 srcpkgs/dhcp/files/dhclient/log/run
delete mode 120000 srcpkgs/dhcp/files/dhcpd4/log/run
delete mode 120000 srcpkgs/dhcp/files/dhcpd6/log/run
delete mode 100644 srcpkgs/dkimproxy/files/dkimproxy_in/log/run
delete mode 100644 srcpkgs/dkimproxy/files/dkimproxy_out/log/run
delete mode 100755 srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
delete mode 100755 srcpkgs/dotool/files/dotoold/log/run
delete mode 100644 srcpkgs/dq/files/dqcache/log/run
delete mode 100755 srcpkgs/duiadns/files/duiadns/log/run
delete mode 100755 srcpkgs/earlyoom/files/earlyoom/log/run
delete mode 100755 srcpkgs/espeakup/files/espeakup/log/run
delete mode 120000 srcpkgs/gerbera/files/gerbera/log/run
delete mode 120000 srcpkgs/gitea/files/gitea/log/run
delete mode 120000 srcpkgs/go-ipfs/files/ipfs/log/run
delete mode 100755 srcpkgs/goatcounter/files/goatcounter/log/run
delete mode 120000 srcpkgs/gotify-server/files/gotify-server/log/run
delete mode 100755 srcpkgs/grafana/files/grafana/log/run
delete mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
delete mode 120000 srcpkgs/i2pd/files/i2pd/log/run
delete mode 100644 srcpkgs/incron/files/incron/log/run
delete mode 100755 srcpkgs/influxdb/files/influxdb/log/run
delete mode 100755 srcpkgs/iwd/files/ead/log/run
delete mode 100755 srcpkgs/iwd/files/iwd/log/run
delete mode 100644 srcpkgs/libvirt/files/libvirt-generic/log/run
delete mode 120000 srcpkgs/libvirt/files/libvirtd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtinterfaced/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlockd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlogd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlxcd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnetworkd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnodedevd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnwfilterd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtproxyd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtqemud/log/run
delete mode 120000 srcpkgs/libvirt/files/virtsecretd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtstoraged/log/run
delete mode 120000 srcpkgs/libvirt/files/virtvboxd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtxend/log/run
delete mode 120000 srcpkgs/lldpd/files/lldpd/log/run
delete mode 100755 srcpkgs/lsyncd/files/lsyncd/log/run
delete mode 100644 srcpkgs/lxd/files/lxd/log/run
delete mode 100755 srcpkgs/mariadb/files/mysqld/log/run
delete mode 120000 srcpkgs/minidlna/files/minidlnad/log/run
delete mode 120000 srcpkgs/miniflux/files/miniflux/log/run
delete mode 100644 srcpkgs/minio/files/minio/log/run
delete mode 120000 srcpkgs/moby/files/docker/log/run
delete mode 100644 srcpkgs/monero/files/monerod/log/run
delete mode 100644 srcpkgs/mumble/files/mumble-server/log/run
delete mode 100755 srcpkgs/ndhc/files/ndhc/log/run
delete mode 100755 srcpkgs/ndppd/files/ndppd/log/run
delete mode 120000 srcpkgs/neard/files/neard/log/run
delete mode 120000 srcpkgs/neard/files/seeld/log/run
delete mode 100755 srcpkgs/nebula/files/nebula/log/run
delete mode 120000 srcpkgs/net-snmp/files/snmpd/log/run
delete mode 100755 srcpkgs/node_exporter/files/node_exporter/log/run
delete mode 100644 srcpkgs/openntpd/files/openntpd/log/run
delete mode 100644 srcpkgs/openrgb/files/openrgb/log/run
delete mode 100644 srcpkgs/oragono/files/oragono/log/run
delete mode 120000 srcpkgs/podman/files/podman/log/run
delete mode 100755 srcpkgs/postgresql14/files/postgresql14/log/run
delete mode 100755 srcpkgs/postgresql15/files/postgresql15/log/run
delete mode 100644 srcpkgs/preload/files/preload/log/run
delete mode 100755 srcpkgs/privoxy/files/privoxy/log/run
delete mode 100755 srcpkgs/prometheus/files/prometheus/log/run
delete mode 120000 srcpkgs/qrtr-ns/files/qrtr-ns/log/run
delete mode 100755 srcpkgs/radicale/files/radicale/log/run
delete mode 120000 srcpkgs/routinator/files/routinator/log/run
delete mode 100644 srcpkgs/samba/files/ctdbd/log/run
delete mode 100755 srcpkgs/samba/files/nmbd/log/run
delete mode 100755 srcpkgs/samba/files/smbd/log/run
delete mode 100755 srcpkgs/sklogw/files/sklogw/log/run
delete mode 100644 srcpkgs/snapcast/files/snapclient/log/run
delete mode 100644 srcpkgs/snapcast/files/snapserver/log/run
delete mode 100755 srcpkgs/sndio/files/sndiod/log/run
delete mode 100644 srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
delete mode 100755 srcpkgs/soju/files/soju/log/run
delete mode 100755 srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-send/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpd/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpsd/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpsub/log/run
delete mode 100644 srcpkgs/stubby/files/stubby/log/run
delete mode 100755 srcpkgs/syncthing/files/discosrv/log/run
delete mode 100755 srcpkgs/syncthing/files/relaysrv/log/run
delete mode 100755 srcpkgs/tailscale/files/tailscaled/log/run
delete mode 120000 srcpkgs/thermald/files/thermald/log/run
delete mode 120000 srcpkgs/tqftpserv/files/tqftpserv/log/run
delete mode 100644 srcpkgs/trousers/files/tcsd/log/run
delete mode 100644 srcpkgs/umurmur/files/umurmurd/log/run
delete mode 120000 srcpkgs/up_rewrite/files/up_rewrite/log/run
delete mode 100644 srcpkgs/upmpdcli/files/upmpdcli/log/run
delete mode 100755 srcpkgs/varnish/files/varnishd/log/run
delete mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run
delete mode 120000 srcpkgs/vnstat/files/vnstatd/log/run
delete mode 120000 srcpkgs/waydroid/files/waydroid-container/log/run
delete mode 100644 srcpkgs/webhook/files/webhook/log/run
delete mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run
delete mode 100644 srcpkgs/x2goserver/files/x2gocleansessions/log/run
delete mode 120000 srcpkgs/yggdrasil/files/yggdrasil/log/run
delete mode 120000 srcpkgs/znc/files/znc/log/run
diff --git a/srcpkgs/Clightd/files/Clightd/log/run b/srcpkgs/Clightd/files/Clightd/log/run
deleted file mode 100644
index bfcfbef2823b..000000000000
--- a/srcpkgs/Clightd/files/Clightd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/vlogger -t Clightd
diff --git a/srcpkgs/Gokapi/files/gokapi/log/run b/srcpkgs/Gokapi/files/gokapi/log/run
deleted file mode 100644
index cb759c1f80d7..000000000000
--- a/srcpkgs/Gokapi/files/gokapi/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t gokapi -p daemon.info
diff --git a/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run b/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
deleted file mode 100644
index 29dc909b4d8d..000000000000
--- a/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t netauth-ldap
diff --git a/srcpkgs/NetAuth/files/netauthd/log/run b/srcpkgs/NetAuth/files/netauthd/log/run
deleted file mode 100644
index c128c8e303a2..000000000000
--- a/srcpkgs/NetAuth/files/netauthd/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t netauthd
diff --git a/srcpkgs/PopCorn/files/popcorn/log/run b/srcpkgs/PopCorn/files/popcorn/log/run
deleted file mode 100644
index 35f950bef681..000000000000
--- a/srcpkgs/PopCorn/files/popcorn/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t popcorn
diff --git a/srcpkgs/TerraState/files/terrastate/log/run b/srcpkgs/TerraState/files/terrastate/log/run
deleted file mode 100644
index 8ea6f0f74369..000000000000
--- a/srcpkgs/TerraState/files/terrastate/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t terrastate
diff --git a/srcpkgs/activityrelay/files/activityrelay/log/run b/srcpkgs/activityrelay/files/activityrelay/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/activityrelay/files/activityrelay/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
deleted file mode 100644
index 043340b61258..000000000000
--- a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t apache-kafka-zookeeper -p 'daemon.info'
diff --git a/srcpkgs/apache-kafka/files/apache-kafka/log/run b/srcpkgs/apache-kafka/files/apache-kafka/log/run
deleted file mode 100644
index 94f6f1f9164e..000000000000
--- a/srcpkgs/apache-kafka/files/apache-kafka/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t apache-kafka -p 'daemon.info'
diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
deleted file mode 100644
index a2abfe61e846..000000000000
--- a/srcpkgs/autofs/files/autofs/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/beanstalkd/files/beanstalkd/log/run b/srcpkgs/beanstalkd/files/beanstalkd/log/run
deleted file mode 100755
index 4eb11581262c..000000000000
--- a/srcpkgs/beanstalkd/files/beanstalkd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t beanstalkd -p daemon.info
diff --git a/srcpkgs/bind/files/named/log/run b/srcpkgs/bind/files/named/log/run
deleted file mode 100644
index 142fbd4af3f9..000000000000
--- a/srcpkgs/bind/files/named/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t named
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/bluez/files/bluetooth-meshd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/bluez/files/bluetoothd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/boinc/files/boinc/log/run b/srcpkgs/boinc/files/boinc/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/boinc/files/boinc/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/busybox/files/busybox-ntpd/log/run b/srcpkgs/busybox/files/busybox-ntpd/log/run
deleted file mode 100755
index 077ea46d31d4..000000000000
--- a/srcpkgs/busybox/files/busybox-ntpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t busybox-ntpd
diff --git a/srcpkgs/caddy/files/caddy/log/run b/srcpkgs/caddy/files/caddy/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/caddy/files/caddy/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ckb-next/files/ckb-next-daemon/log/run b/srcpkgs/ckb-next/files/ckb-next-daemon/log/run
deleted file mode 100644
index 778760156ff0..000000000000
--- a/srcpkgs/ckb-next/files/ckb-next-daemon/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t ckb-next-daemon -p daemon.notice
diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/conduit/files/conduit/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/coredns/files/coredns/log/run b/srcpkgs/coredns/files/coredns/log/run
deleted file mode 100755
index f0680f7cfe3d..000000000000
--- a/srcpkgs/coredns/files/coredns/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec vlogger -t coredns
diff --git a/srcpkgs/coturn/files/coturnserver/log/run b/srcpkgs/coturn/files/coturnserver/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/coturn/files/coturnserver/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/cronie/files/cronie/log/run b/srcpkgs/cronie/files/cronie/log/run
deleted file mode 100755
index 6ff79ce509cb..000000000000
--- a/srcpkgs/cronie/files/cronie/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p cron.notice
diff --git a/srcpkgs/dcron/files/dcron/log/run b/srcpkgs/dcron/files/dcron/log/run
deleted file mode 100755
index 481c04d62077..000000000000
--- a/srcpkgs/dcron/files/dcron/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p cron.notice
diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/log/run b/srcpkgs/dendrite/files/dendrite-monolith-server/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dendrite/files/dendrite-monolith-server/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhclient/log/run b/srcpkgs/dhcp/files/dhclient/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhclient/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd4/log/run b/srcpkgs/dhcp/files/dhcpd4/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhcpd4/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd6/log/run b/srcpkgs/dhcp/files/dhcpd6/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhcpd6/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_in/log/run b/srcpkgs/dkimproxy/files/dkimproxy_in/log/run
deleted file mode 100644
index a4a63ef73234..000000000000
--- a/srcpkgs/dkimproxy/files/dkimproxy_in/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t dkimproxy_in -p mail.info
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_out/log/run b/srcpkgs/dkimproxy/files/dkimproxy_out/log/run
deleted file mode 100644
index 45736fa75504..000000000000
--- a/srcpkgs/dkimproxy/files/dkimproxy_out/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t dkimproxy_out -p mail.info
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
deleted file mode 100755
index d6ba4e8a0b48..000000000000
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec chpst -u dnscrypt_proxy:dnscrypt_proxy svlogd -t /var/log/dnscrypt-proxy
diff --git a/srcpkgs/dotool/files/dotoold/log/run b/srcpkgs/dotool/files/dotoold/log/run
deleted file mode 100755
index 762ba9e6cc26..000000000000
--- a/srcpkgs/dotool/files/dotoold/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t dotoold
diff --git a/srcpkgs/dq/files/dqcache/log/run b/srcpkgs/dq/files/dqcache/log/run
deleted file mode 100644
index ffcdcdb3736c..000000000000
--- a/srcpkgs/dq/files/dqcache/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec chpst -u _dqcache svlogd -t /var/log/dqcache
diff --git a/srcpkgs/duiadns/files/duiadns/log/run b/srcpkgs/duiadns/files/duiadns/log/run
deleted file mode 100755
index 94a82bf82dac..000000000000
--- a/srcpkgs/duiadns/files/duiadns/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec vlogger -t duiadns
diff --git a/srcpkgs/earlyoom/files/earlyoom/log/run b/srcpkgs/earlyoom/files/earlyoom/log/run
deleted file mode 100755
index 33d072e97ca1..000000000000
--- a/srcpkgs/earlyoom/files/earlyoom/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t earlyoom
diff --git a/srcpkgs/espeakup/files/espeakup/log/run b/srcpkgs/espeakup/files/espeakup/log/run
deleted file mode 100755
index 6d6f481c3794..000000000000
--- a/srcpkgs/espeakup/files/espeakup/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.debug -t espeakup
diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gerbera/files/gerbera/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gitea/files/gitea/log/run b/srcpkgs/gitea/files/gitea/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gitea/files/gitea/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/go-ipfs/files/ipfs/log/run b/srcpkgs/go-ipfs/files/ipfs/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/go-ipfs/files/ipfs/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/goatcounter/files/goatcounter/log/run b/srcpkgs/goatcounter/files/goatcounter/log/run
deleted file mode 100755
index 0713d90a612e..000000000000
--- a/srcpkgs/goatcounter/files/goatcounter/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t goatcounter
diff --git a/srcpkgs/gotify-server/files/gotify-server/log/run b/srcpkgs/gotify-server/files/gotify-server/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gotify-server/files/gotify-server/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/grafana/files/grafana/log/run b/srcpkgs/grafana/files/grafana/log/run
deleted file mode 100755
index 422fc14b90d7..000000000000
--- a/srcpkgs/grafana/files/grafana/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t grafana
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
deleted file mode 100755
index 267659045cda..000000000000
--- a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t grub-btrfs
diff --git a/srcpkgs/i2pd/files/i2pd/log/run b/srcpkgs/i2pd/files/i2pd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/i2pd/files/i2pd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/incron/files/incron/log/run b/srcpkgs/incron/files/incron/log/run
deleted file mode 100644
index 481c04d62077..000000000000
--- a/srcpkgs/incron/files/incron/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p cron.notice
diff --git a/srcpkgs/influxdb/files/influxdb/log/run b/srcpkgs/influxdb/files/influxdb/log/run
deleted file mode 100755
index 642fc2657098..000000000000
--- a/srcpkgs/influxdb/files/influxdb/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t influxdb
diff --git a/srcpkgs/iwd/files/ead/log/run b/srcpkgs/iwd/files/ead/log/run
deleted file mode 100755
index 22cce06edfd9..000000000000
--- a/srcpkgs/iwd/files/ead/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t ead
diff --git a/srcpkgs/iwd/files/iwd/log/run b/srcpkgs/iwd/files/iwd/log/run
deleted file mode 100755
index 1e182b5a754e..000000000000
--- a/srcpkgs/iwd/files/iwd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t iwd
diff --git a/srcpkgs/libvirt/files/libvirt-generic/log/run b/srcpkgs/libvirt/files/libvirt-generic/log/run
deleted file mode 100644
index fe803f0a723c..000000000000
--- a/srcpkgs/libvirt/files/libvirt-generic/log/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Take daemon name from parent of the log subservice
-daemon="${PWD%/*}"
-daemon="${daemon##*/}"
-
-exec logger -t "$daemon" -p daemon.info
diff --git a/srcpkgs/libvirt/files/libvirtd/log/run b/srcpkgs/libvirt/files/libvirtd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/libvirtd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtinterfaced/log/run b/srcpkgs/libvirt/files/virtinterfaced/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtinterfaced/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlockd/log/run b/srcpkgs/libvirt/files/virtlockd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlockd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlogd/log/run b/srcpkgs/libvirt/files/virtlogd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlogd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlxcd/log/run b/srcpkgs/libvirt/files/virtlxcd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlxcd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnetworkd/log/run b/srcpkgs/libvirt/files/virtnetworkd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnetworkd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnodedevd/log/run b/srcpkgs/libvirt/files/virtnodedevd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnodedevd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnwfilterd/log/run b/srcpkgs/libvirt/files/virtnwfilterd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnwfilterd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtproxyd/log/run b/srcpkgs/libvirt/files/virtproxyd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtproxyd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtqemud/log/run b/srcpkgs/libvirt/files/virtqemud/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtqemud/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtsecretd/log/run b/srcpkgs/libvirt/files/virtsecretd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtsecretd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtstoraged/log/run b/srcpkgs/libvirt/files/virtstoraged/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtstoraged/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtvboxd/log/run b/srcpkgs/libvirt/files/virtvboxd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtvboxd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtxend/log/run b/srcpkgs/libvirt/files/virtxend/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtxend/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/lldpd/files/lldpd/log/run b/srcpkgs/lldpd/files/lldpd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/lldpd/files/lldpd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/lsyncd/files/lsyncd/log/run b/srcpkgs/lsyncd/files/lsyncd/log/run
deleted file mode 100755
index 114c954f1d99..000000000000
--- a/srcpkgs/lsyncd/files/lsyncd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t lsyncd -p 'daemon.info'
diff --git a/srcpkgs/lxd/files/lxd/log/run b/srcpkgs/lxd/files/lxd/log/run
deleted file mode 100644
index 817e6073ea07..000000000000
--- a/srcpkgs/lxd/files/lxd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t lxd
diff --git a/srcpkgs/mariadb/files/mysqld/log/run b/srcpkgs/mariadb/files/mysqld/log/run
deleted file mode 100755
index b36c4dafa403..000000000000
--- a/srcpkgs/mariadb/files/mysqld/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/minidlna/files/minidlnad/log/run b/srcpkgs/minidlna/files/minidlnad/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/minidlna/files/minidlnad/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/miniflux/files/miniflux/log/run b/srcpkgs/miniflux/files/miniflux/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/miniflux/files/miniflux/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/minio/files/minio/log/run b/srcpkgs/minio/files/minio/log/run
deleted file mode 100644
index b36c4dafa403..000000000000
--- a/srcpkgs/minio/files/minio/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/moby/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/moby/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
deleted file mode 100644
index afcb02949c66..000000000000
--- a/srcpkgs/monero/files/monerod/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
deleted file mode 100644
index 6b01a89f5be9..000000000000
--- a/srcpkgs/mumble/files/mumble-server/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/ndhc/files/ndhc/log/run b/srcpkgs/ndhc/files/ndhc/log/run
deleted file mode 100755
index 3dd63242fc51..000000000000
--- a/srcpkgs/ndhc/files/ndhc/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t ndhc
diff --git a/srcpkgs/ndppd/files/ndppd/log/run b/srcpkgs/ndppd/files/ndppd/log/run
deleted file mode 100755
index 6351a7cbc249..000000000000
--- a/srcpkgs/ndppd/files/ndppd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t ndppd
diff --git a/srcpkgs/neard/files/neard/log/run b/srcpkgs/neard/files/neard/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/neard/files/neard/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/neard/files/seeld/log/run b/srcpkgs/neard/files/seeld/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/neard/files/seeld/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/nebula/files/nebula/log/run b/srcpkgs/nebula/files/nebula/log/run
deleted file mode 100755
index 6a816023830d..000000000000
--- a/srcpkgs/nebula/files/nebula/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger --tag nebula --priority daemon.info
diff --git a/srcpkgs/net-snmp/files/snmpd/log/run b/srcpkgs/net-snmp/files/snmpd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/net-snmp/files/snmpd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/node_exporter/files/node_exporter/log/run b/srcpkgs/node_exporter/files/node_exporter/log/run
deleted file mode 100755
index 719aeb1c263e..000000000000
--- a/srcpkgs/node_exporter/files/node_exporter/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t node_exporter
diff --git a/srcpkgs/openntpd/files/openntpd/log/run b/srcpkgs/openntpd/files/openntpd/log/run
deleted file mode 100644
index 1401554c5c37..000000000000
--- a/srcpkgs/openntpd/files/openntpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t openntpd -p daemon.notice
diff --git a/srcpkgs/openrgb/files/openrgb/log/run b/srcpkgs/openrgb/files/openrgb/log/run
deleted file mode 100644
index 12023ee0eca3..000000000000
--- a/srcpkgs/openrgb/files/openrgb/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t openrgb -p daemon.info
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/podman/files/podman/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/postgresql14/files/postgresql14/log/run b/srcpkgs/postgresql14/files/postgresql14/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql14/files/postgresql14/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql15/files/postgresql15/log/run b/srcpkgs/postgresql15/files/postgresql15/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql15/files/postgresql15/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/preload/files/preload/log/run b/srcpkgs/preload/files/preload/log/run
deleted file mode 100644
index 03f18ca93f33..000000000000
--- a/srcpkgs/preload/files/preload/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec svlogd -t /var/log/preload
diff --git a/srcpkgs/privoxy/files/privoxy/log/run b/srcpkgs/privoxy/files/privoxy/log/run
deleted file mode 100755
index fa590adf4e6a..000000000000
--- a/srcpkgs/privoxy/files/privoxy/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t privoxy
diff --git a/srcpkgs/prometheus/files/prometheus/log/run b/srcpkgs/prometheus/files/prometheus/log/run
deleted file mode 100755
index d93cf9f498ea..000000000000
--- a/srcpkgs/prometheus/files/prometheus/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t prometheus
diff --git a/srcpkgs/qrtr-ns/files/qrtr-ns/log/run b/srcpkgs/qrtr-ns/files/qrtr-ns/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/qrtr-ns/files/qrtr-ns/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/radicale/files/radicale/log/run b/srcpkgs/radicale/files/radicale/log/run
deleted file mode 100755
index 37284378a054..000000000000
--- a/srcpkgs/radicale/files/radicale/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec svlogd /var/log/radicale
diff --git a/srcpkgs/routinator/files/routinator/log/run b/srcpkgs/routinator/files/routinator/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/routinator/files/routinator/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/samba/files/ctdbd/log/run b/srcpkgs/samba/files/ctdbd/log/run
deleted file mode 100644
index 7b12895c7406..000000000000
--- a/srcpkgs/samba/files/ctdbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t ctdbd
diff --git a/srcpkgs/samba/files/nmbd/log/run b/srcpkgs/samba/files/nmbd/log/run
deleted file mode 100755
index fb52de5c92a1..000000000000
--- a/srcpkgs/samba/files/nmbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t nmbd
diff --git a/srcpkgs/samba/files/smbd/log/run b/srcpkgs/samba/files/smbd/log/run
deleted file mode 100755
index 3131489de9f3..000000000000
--- a/srcpkgs/samba/files/smbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t smbd
diff --git a/srcpkgs/sklogw/files/sklogw/log/run b/srcpkgs/sklogw/files/sklogw/log/run
deleted file mode 100755
index 8d9259845801..000000000000
--- a/srcpkgs/sklogw/files/sklogw/log/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/sh
-
-#log script
-[ -d /var/log/sklogw ] || mkdir -p /var/log/sklogw
-exec svlogd -ttt /var/log/sklogw
diff --git a/srcpkgs/snapcast/files/snapclient/log/run b/srcpkgs/snapcast/files/snapclient/log/run
deleted file mode 100644
index 67d63360736a..000000000000
--- a/srcpkgs/snapcast/files/snapclient/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t snapclient
diff --git a/srcpkgs/snapcast/files/snapserver/log/run b/srcpkgs/snapcast/files/snapserver/log/run
deleted file mode 100644
index 13577cf7f054..000000000000
--- a/srcpkgs/snapcast/files/snapserver/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t snapserver
diff --git a/srcpkgs/sndio/files/sndiod/log/run b/srcpkgs/sndio/files/sndiod/log/run
deleted file mode 100755
index 4472c76afb44..000000000000
--- a/srcpkgs/sndio/files/sndiod/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t sndiod
diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
deleted file mode 100644
index acfadabea4d8..000000000000
--- a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec vlogger -p daemon -t socklog-ucspi-tcp
diff --git a/srcpkgs/soju/files/soju/log/run b/srcpkgs/soju/files/soju/log/run
deleted file mode 100755
index e3e1d1b70f91..000000000000
--- a/srcpkgs/soju/files/soju/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t soju -p daemon
diff --git a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
deleted file mode 100755
index c50c10aa0da9..000000000000
--- a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t spreed-webrtc-server -p daemon.notice
diff --git a/srcpkgs/sqmail/files/qmail-send/log/run b/srcpkgs/sqmail/files/qmail-send/log/run
deleted file mode 100755
index dfe9ca0c0e91..000000000000
--- a/srcpkgs/sqmail/files/qmail-send/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-send
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/log/run b/srcpkgs/sqmail/files/qmail-smtpd/log/run
deleted file mode 100755
index e8b65cb0b353..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpd
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/log/run b/srcpkgs/sqmail/files/qmail-smtpsd/log/run
deleted file mode 100755
index 933100cc3f74..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpsd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpsd
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/log/run b/srcpkgs/sqmail/files/qmail-smtpsub/log/run
deleted file mode 100755
index c7918d4ee26a..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpsub/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpsub
diff --git a/srcpkgs/stubby/files/stubby/log/run b/srcpkgs/stubby/files/stubby/log/run
deleted file mode 100644
index 133f33a73b58..000000000000
--- a/srcpkgs/stubby/files/stubby/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t stubby -p daemon.notice
diff --git a/srcpkgs/syncthing/files/discosrv/log/run b/srcpkgs/syncthing/files/discosrv/log/run
deleted file mode 100755
index a667e5fd80c7..000000000000
--- a/srcpkgs/syncthing/files/discosrv/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec svlogd /var/log/discosrv
diff --git a/srcpkgs/syncthing/files/relaysrv/log/run b/srcpkgs/syncthing/files/relaysrv/log/run
deleted file mode 100755
index b1d5a28a7bf5..000000000000
--- a/srcpkgs/syncthing/files/relaysrv/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec svlogd /var/log/relaysrv
diff --git a/srcpkgs/tailscale/files/tailscaled/log/run b/srcpkgs/tailscale/files/tailscaled/log/run
deleted file mode 100755
index 28894bc17c6a..000000000000
--- a/srcpkgs/tailscale/files/tailscaled/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec logger -t tailscaled -p daemon.info
diff --git a/srcpkgs/thermald/files/thermald/log/run b/srcpkgs/thermald/files/thermald/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/thermald/files/thermald/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/tqftpserv/files/tqftpserv/log/run b/srcpkgs/tqftpserv/files/tqftpserv/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/tqftpserv/files/tqftpserv/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/trousers/files/tcsd/log/run b/srcpkgs/trousers/files/tcsd/log/run
deleted file mode 100644
index f74f42b898ec..000000000000
--- a/srcpkgs/trousers/files/tcsd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t tcsd
diff --git a/srcpkgs/umurmur/files/umurmurd/log/run b/srcpkgs/umurmur/files/umurmurd/log/run
deleted file mode 100644
index 4935a89f175e..000000000000
--- a/srcpkgs/umurmur/files/umurmurd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t umurmurd
diff --git a/srcpkgs/up_rewrite/files/up_rewrite/log/run b/srcpkgs/up_rewrite/files/up_rewrite/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/up_rewrite/files/up_rewrite/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/upmpdcli/files/upmpdcli/log/run b/srcpkgs/upmpdcli/files/upmpdcli/log/run
deleted file mode 100644
index 9d3d8b8d9878..000000000000
--- a/srcpkgs/upmpdcli/files/upmpdcli/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t upmpdcli
diff --git a/srcpkgs/varnish/files/varnishd/log/run b/srcpkgs/varnish/files/varnishd/log/run
deleted file mode 100755
index 280d955ac11c..000000000000
--- a/srcpkgs/varnish/files/varnishd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t varnishd -p daemon.info
diff --git a/srcpkgs/vaultwarden/files/vaultwarden/log/run b/srcpkgs/vaultwarden/files/vaultwarden/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/vaultwarden/files/vaultwarden/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/vnstat/files/vnstatd/log/run b/srcpkgs/vnstat/files/vnstatd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/vnstat/files/vnstatd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/waydroid/files/waydroid-container/log/run b/srcpkgs/waydroid/files/waydroid-container/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/waydroid/files/waydroid-container/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/webhook/files/webhook/log/run b/srcpkgs/webhook/files/webhook/log/run
deleted file mode 100644
index 700bf023a873..000000000000
--- a/srcpkgs/webhook/files/webhook/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t webhook
diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run
deleted file mode 100644
index 4dd58318870e..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t wireplumber -p daemon.info
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/log/run b/srcpkgs/x2goserver/files/x2gocleansessions/log/run
deleted file mode 100644
index d5901d1fc65f..000000000000
--- a/srcpkgs/x2goserver/files/x2gocleansessions/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t x2gocleansessions
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/log/run b/srcpkgs/yggdrasil/files/yggdrasil/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/yggdrasil/files/yggdrasil/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/znc/files/znc/log/run b/srcpkgs/znc/files/znc/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/znc/files/znc/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
From 88e664c64040f473ac7b3ca39c970e28d3188979 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 7 Feb 2023 02:04:26 -0500
Subject: [PATCH 322/356] cronie, dcron, dkimproxy, sqmail: override default
log facility
previous log service used cron/mail facility
---
srcpkgs/cronie/template | 2 +-
srcpkgs/dcron/template | 2 +-
srcpkgs/dkimproxy/template | 4 ++--
srcpkgs/sqmail/template | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 2c26c2dc6352..3f8fbbcc4f30 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -44,7 +44,7 @@ pre_configure() {
}
post_install() {
- vsv cronie
+ vsv cronie cron
vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond
# Add /etc/cron.deny empty, to allow all users.
diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index eb975fd13a30..ab92850344ee 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -47,7 +47,7 @@ do_install() {
# crontab must be setuid for all users to work!
chmod 4755 ${DESTDIR}/usr/bin/crontab
- vsv dcron
+ vsv dcron cron
# Fix conflicts with other packages
mv ${DESTDIR}/usr/bin/crond ${DESTDIR}/usr/bin/dcrond
diff --git a/srcpkgs/dkimproxy/template b/srcpkgs/dkimproxy/template
index bab8cee6633f..4c411af516c1 100644
--- a/srcpkgs/dkimproxy/template
+++ b/srcpkgs/dkimproxy/template
@@ -20,6 +20,6 @@ post_install() {
vsconf ${DESTDIR}/etc/dkimproxy_out.conf.example
mv ${DESTDIR}/etc/dkimproxy_in.conf.example ${DESTDIR}/etc/dkimproxy_in.conf
mv ${DESTDIR}/etc/dkimproxy_out.conf.example ${DESTDIR}/etc/dkimproxy_out.conf
- vsv dkimproxy_in
- vsv dkimproxy_out
+ vsv dkimproxy_in mail
+ vsv dkimproxy_out mail
}
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 78c0af18eadb..3ba60479850c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -117,10 +117,10 @@ do_install() {
done
rm ${DESTDIR}/usr/bin/hostname
rm ${DESTDIR}/usr/share/man/man8/hostname.8
- vsv qmail-send
- vsv qmail-smtpd
- vsv qmail-smtpsd
- vsv qmail-smtpsub
+ vsv qmail-send mail
+ vsv qmail-smtpd mail
+ vsv qmail-smtpsd mail
+ vsv qmail-smtpsub mail
vlicense ../doc/LICENSE
mv ${DESTDIR}/usr/bin/maildirmake ${DESTDIR}/usr/bin/maildirmake.sqmail
mv ${DESTDIR}/usr/share/man/man1/maildirmake.1 ${DESTDIR}/usr/share/man/man1/maildirmake.sqmail.1
From fa6de531bfa94b3639b26ab196b92ad863e3d5dc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 7 Feb 2023 02:25:27 -0500
Subject: [PATCH 323/356] *: add exec 2>&1 to all existing services
except when it already exists, of course
---
srcpkgs/3proxy/files/3proxy/run | 1 +
srcpkgs/Clightd/files/Clightd/run | 1 +
srcpkgs/EternalTerminal/files/etserver/run | 1 +
srcpkgs/FreeRADIUS/files/FreeRADIUS/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run | 1 +
srcpkgs/Gokapi/files/gokapi/run | 1 +
srcpkgs/NetAuth-ldap/files/netauth-ldap/run | 1 +
srcpkgs/NetAuth/files/netauthd/run | 1 +
srcpkgs/NetworkManager/files/NetworkManager/run | 1 +
srcpkgs/PopCorn/files/pqueryd/run | 1 +
srcpkgs/PopCorn/files/statrepo/run | 1 +
srcpkgs/Swapspace/files/swapspace/run | 1 +
srcpkgs/acpid/files/acpid/run | 1 +
srcpkgs/alertmanager/files/alertmanager/run | 1 +
srcpkgs/alfred/files/alfred/run | 1 +
srcpkgs/alfred/files/batadv-vis/run | 1 +
srcpkgs/alsa-utils/files/alsa/run | 1 +
srcpkgs/android-tools/files/adb/run | 1 +
srcpkgs/anope/files/anope/run | 1 +
srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run | 1 +
srcpkgs/apache-kafka/files/apache-kafka/run | 1 +
srcpkgs/apache-tomcat/files/apache-tomcat/run | 1 +
srcpkgs/apache/files/apache/run | 1 +
srcpkgs/apcupsd/files/apcupsd/run | 1 +
srcpkgs/ardor/files/ardor-tor/run | 1 +
srcpkgs/ardor/files/ardor/run | 1 +
srcpkgs/armagetronad/files/armagetronad-dedicated/run | 1 +
srcpkgs/asus-kbd-backlight/files/asus-kbd/run | 1 +
srcpkgs/at/files/at/run | 1 +
srcpkgs/atop/files/atop/run | 1 +
srcpkgs/audit/files/auditctl/run | 1 +
srcpkgs/audit/files/auditd/run | 1 +
srcpkgs/avahi/files/avahi-daemon/run | 1 +
srcpkgs/bacula-common/files/bacula-dir/run | 1 +
srcpkgs/bacula-common/files/bacula-fd/run | 1 +
srcpkgs/bacula-common/files/bacula-sd/run | 1 +
srcpkgs/barrier/files/barrierc/run | 1 +
srcpkgs/barrier/files/barriers/run | 1 +
srcpkgs/beanstalkd/files/beanstalkd/run | 1 +
srcpkgs/beard/files/beard/run | 1 +
srcpkgs/bftpd/files/bftpd/run | 1 +
srcpkgs/binfmt-support/files/binfmt-support/run | 1 +
srcpkgs/bird/files/bird/run | 1 +
srcpkgs/bird_exporter/files/bird_exporter/run | 1 +
srcpkgs/bitlbee/files/bitlbee/run | 1 +
srcpkgs/blackbox_exporter/files/blackbox_exporter/run | 1 +
srcpkgs/bluez-alsa/files/bluez-alsa/run | 1 +
srcpkgs/bolt/files/boltd/run | 1 +
srcpkgs/brltty/files/brltty/run | 1 +
srcpkgs/bumblebee/files/bumblebeed/run | 1 +
srcpkgs/burp2-server/files/burp2-server/run | 1 +
srcpkgs/busybox/files/busybox-klogd/run | 1 +
srcpkgs/busybox/files/busybox-ntpd/run | 1 +
srcpkgs/busybox/files/busybox-syslogd/run | 1 +
srcpkgs/cachefilesd/files/cachefilesd/run | 1 +
srcpkgs/caddy/files/caddy/run | 1 +
srcpkgs/canto-next/files/canto-daemon/run | 1 +
srcpkgs/chronograf/files/chronograf/run | 1 +
srcpkgs/chrony/files/chronyd/run | 1 +
srcpkgs/ckb-next/files/ckb-next-daemon/run | 1 +
srcpkgs/cntlm/files/cntlm/run | 1 +
srcpkgs/collectd/files/collectd/run | 1 +
srcpkgs/colord/files/colord/run | 1 +
srcpkgs/conduit/files/conduit/run | 1 +
srcpkgs/connman/files/connmand/run | 1 +
srcpkgs/containerd/files/containerd/run | 1 +
srcpkgs/coturn/files/coturnserver/run | 1 +
srcpkgs/criu/files/criu/run | 1 +
srcpkgs/cronie/files/cronie/run | 1 +
srcpkgs/cups-filters/files/cups-browsed/run | 1 +
srcpkgs/cups/files/cupsd/run | 1 +
srcpkgs/darkhttpd/files/darkhttpd/run | 1 +
srcpkgs/dbus-elogind/files/dbus/run | 1 +
srcpkgs/dbus/files/dbus/run | 1 +
srcpkgs/dcron/files/dcron/run | 1 +
srcpkgs/ddclient/files/ddclient/run | 1 +
srcpkgs/deluge/files/deluge-web/run | 1 +
srcpkgs/deluge/files/deluged/run | 1 +
srcpkgs/dhcpcd/files/dhcpcd-eth0/run | 1 +
srcpkgs/dhcpcd/files/dhcpcd/run | 1 +
srcpkgs/dictd/files/dictd/run | 1 +
srcpkgs/diod/files/diod/run | 1 +
srcpkgs/distcc/files/distccd/run | 1 +
srcpkgs/dkimproxy/files/dkimproxy_in/run | 1 +
srcpkgs/dkimproxy/files/dkimproxy_out/run | 1 +
srcpkgs/dnsdist/files/dnsdist/run | 1 +
srcpkgs/dnsmasq/files/dnsmasq/run | 1 +
srcpkgs/dovecot/files/dovecot/run | 1 +
srcpkgs/dq/files/dqcache/run | 1 +
srcpkgs/drbd-utils/files/drbd/run | 1 +
srcpkgs/dropbear/files/dropbear/run | 1 +
srcpkgs/duiadns/files/duiadns/run | 1 +
srcpkgs/earlyoom/files/earlyoom/run | 1 +
srcpkgs/edac-utils/files/edac/run | 1 +
srcpkgs/elog/files/elogd/run | 1 +
srcpkgs/elogind/files/elogind/run | 1 +
srcpkgs/etcd/files/etcd/run | 1 +
srcpkgs/eudev/files/udevd/run | 1 +
srcpkgs/fah/files/FAHClient/run | 1 +
srcpkgs/fail2ban/files/fail2ban/run | 1 +
srcpkgs/fake-hwclock/files/fake-hwclock/run | 1 +
srcpkgs/fastd/files/fastd/run | 1 +
srcpkgs/fcron/files/fcron/run | 1 +
srcpkgs/fiche/files/fiche/run | 1 +
srcpkgs/firehol/files/firehol/run | 1 +
srcpkgs/flannel/files/flannel/run | 1 +
srcpkgs/freeipmi/files/bmc-watchdog/run | 1 +
srcpkgs/freeipmi/files/ipmidetectd/run | 1 +
srcpkgs/freeipmi/files/ipmiseld/run | 1 +
srcpkgs/frp/files/frpc/run | 1 +
srcpkgs/frp/files/frps/run | 1 +
srcpkgs/frr/files/frr-generic/run | 1 +
srcpkgs/fwknop/files/fwknopd/run | 1 +
srcpkgs/gdm/files/gdm/run | 1 +
srcpkgs/gemserv/files/gemserv/run | 1 +
srcpkgs/geomyidae/files/geomyidae/run | 1 +
srcpkgs/gerbera/files/gerbera/run | 1 +
srcpkgs/gitea/files/gitea/run | 1 +
srcpkgs/gitlab-runner/files/gitlab-runner/run | 1 +
srcpkgs/glibc/files/nscd/run | 1 +
srcpkgs/glider/files/glider/run | 1 +
srcpkgs/glusterfs/files/glusterd/run | 1 +
srcpkgs/glusterfs/files/glusterfsd/run | 1 +
srcpkgs/gnunet/files/gnunet/run | 1 +
srcpkgs/go-ipfs/files/ipfs/run | 1 +
srcpkgs/goatcounter/files/goatcounter/run | 1 +
srcpkgs/gogs/files/gogs/run | 1 +
srcpkgs/gpm/files/gpm/run | 1 +
srcpkgs/gpsd/files/gpsd/run | 1 +
srcpkgs/grafana/files/grafana/run | 1 +
srcpkgs/h2o/files/h2o/run | 1 +
srcpkgs/haproxy/files/haproxy/run | 1 +
srcpkgs/haveged/files/haveged/run | 1 +
srcpkgs/hddtemp/files/hddtemp/run | 1 +
srcpkgs/hiawatha/files/hiawatha/run | 1 +
srcpkgs/hitch/files/hitch/run | 1 +
srcpkgs/hostapd/files/hostapd/run | 1 +
srcpkgs/i2pd/files/i2pd/run | 1 +
srcpkgs/i8kutils/files/i8kmon/run | 1 +
srcpkgs/icinga2/files/icinga2/run | 1 +
srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run | 1 +
srcpkgs/inadyn/files/inadyn/run | 1 +
srcpkgs/incron/files/incron/run | 1 +
srcpkgs/influxdb/files/influxdb/run | 1 +
srcpkgs/inspircd/files/inspircd/run | 1 +
srcpkgs/iptables/files/ip6tables/run | 1 +
srcpkgs/iptables/files/iptables/run | 1 +
srcpkgs/ipvsadm/files/ipvsadm/run | 1 +
srcpkgs/irqbalance/files/irqbalance/run | 1 +
srcpkgs/iwd/files/ead/run | 1 +
srcpkgs/iwd/files/iwd/run | 1 +
srcpkgs/jenkins/files/jenkins/run | 1 +
srcpkgs/kapacitor/files/kapacitor/run | 1 +
srcpkgs/kea/files/kea-dhcp-ddns/run | 1 +
srcpkgs/kea/files/kea-dhcp4/run | 1 +
srcpkgs/kea/files/kea-dhcp6/run | 1 +
srcpkgs/keepalived/files/keepalived/run | 1 +
srcpkgs/keyd/files/keyd/run | 1 +
srcpkgs/knot-resolver/files/kresd/run | 1 +
srcpkgs/knot/files/knotd/run | 1 +
srcpkgs/kubernetes/files/kube-apiserver/run | 1 +
srcpkgs/kubernetes/files/kube-controller-manager/run | 1 +
srcpkgs/kubernetes/files/kube-proxy/run | 1 +
srcpkgs/kubernetes/files/kube-scheduler/run | 1 +
srcpkgs/kubernetes/files/kubelet/run | 1 +
srcpkgs/laptop-mode/files/laptop-mode/run | 1 +
srcpkgs/ldm/files/ldm/run | 1 +
srcpkgs/libcgroup/files/cgred/run | 1 +
srcpkgs/libratbag/files/ratbagd/run | 1 +
srcpkgs/libvirt/files/libvirt-generic/run | 1 +
srcpkgs/lightdm/files/lightdm/run | 1 +
srcpkgs/lighttpd/files/lighttpd/run | 1 +
srcpkgs/linux-tools/files/freefall/run | 1 +
srcpkgs/linux-tools/files/usbipd/run | 1 +
srcpkgs/lldpd/files/lldpd/run | 1 +
srcpkgs/lm_sensors/files/fancontrol/run | 1 +
srcpkgs/lsyncd/files/lsyncd/run | 1 +
srcpkgs/lvm2/files/dmeventd/run | 1 +
srcpkgs/lvm2/files/lvmetad/run | 1 +
srcpkgs/lxc/files/lxc-autostart/run | 1 +
srcpkgs/lxcfs/files/lxcfs/run | 1 +
srcpkgs/lxd-lts/files/lxd/run | 1 +
srcpkgs/lxd/files/lxd/run | 1 +
srcpkgs/lxdm/files/lxdm/run | 1 +
srcpkgs/mDNSResponder/files/dnsextd/run | 1 +
srcpkgs/mDNSResponder/files/mdnsd/run | 1 +
srcpkgs/mariadb/files/mysqld/run | 1 +
srcpkgs/mcelog/files/mcelog/run | 1 +
srcpkgs/mdadm/files/mdadm/run | 1 +
srcpkgs/metalog/files/metalog/run | 1 +
srcpkgs/minidlna/files/minidlnad/run | 1 +
srcpkgs/minio/files/minio/run | 1 +
srcpkgs/mit-krb5/files/kadmind/run | 1 +
srcpkgs/mit-krb5/files/krb5kdc/run | 1 +
srcpkgs/moby/files/docker/run | 1 +
srcpkgs/monero/files/monerod/run | 1 +
srcpkgs/monit/files/monit/run | 1 +
srcpkgs/monkey/files/monkey/run | 1 +
srcpkgs/moosefs/files/mfschunkserver/run | 1 +
srcpkgs/moosefs/files/mfsmaster/run | 1 +
srcpkgs/moosefs/files/mfsmetalogger/run | 1 +
srcpkgs/mopidy/files/mopidy/run | 1 +
srcpkgs/mosquitto/files/mosquitto/run | 1 +
srcpkgs/mouseemu/files/mouseemu/run | 1 +
srcpkgs/mpDris2/files/mpDris2/run | 1 +
srcpkgs/mpd/files/mpd/run | 1 +
srcpkgs/mpdscribble/files/mpdscribble/run | 1 +
srcpkgs/munge/files/munge/run | 1 +
srcpkgs/musl-nscd/files/nscd/run | 1 +
srcpkgs/nbd/files/nbd/run | 1 +
srcpkgs/ndhc/files/ndhc/run | 1 +
srcpkgs/ndppd/files/ndppd/run | 1 +
srcpkgs/neard/files/neard/run | 1 +
srcpkgs/neard/files/seeld/run | 1 +
srcpkgs/net-snmp/files/snmpd/run | 1 +
srcpkgs/netdata/files/netdata/run | 1 +
srcpkgs/network-ups-tools/files/upsd/run | 1 +
srcpkgs/network-ups-tools/files/upsdrvctl/run | 1 +
srcpkgs/network-ups-tools/files/upsmon/run | 1 +
srcpkgs/nfs-utils/files/nfs-server/run | 1 +
srcpkgs/nfs-utils/files/rpcblkmapd/run | 1 +
srcpkgs/nfs-utils/files/rpcgssd/run | 1 +
srcpkgs/nfs-utils/files/rpcidmapd/run | 1 +
srcpkgs/nfs-utils/files/rpcsvcgssd/run | 1 +
srcpkgs/nfs-utils/files/statd/run | 1 +
srcpkgs/nftables/files/nftables/run | 1 +
srcpkgs/ngetty/files/ngetty/run | 1 +
srcpkgs/nginx/files/nginx/run | 1 +
srcpkgs/ngircd/files/ngircd/run | 1 +
srcpkgs/nix/files/nix-daemon/run | 1 +
srcpkgs/node_exporter/files/node_exporter/run | 1 +
srcpkgs/nodm/files/nodm/run | 1 +
srcpkgs/noip2/files/noip2/run | 1 +
srcpkgs/nrpe/files/nrpe/run | 1 +
srcpkgs/nsd/files/nsd/run | 1 +
srcpkgs/nss-pam-ldapd/files/nslcd/run | 1 +
srcpkgs/ntp/files/isc-ntpd/run | 1 +
srcpkgs/nullmailer/files/nullmailer/run | 1 +
srcpkgs/nvidia/files/nvidia-powerd/run | 1 +
srcpkgs/nxt/files/nxt-tor/run | 1 +
srcpkgs/nxt/files/nxt/run | 1 +
srcpkgs/odroid-u2-base/files/odroid-led/run | 1 +
srcpkgs/ofono/files/ofonod/run | 1 +
srcpkgs/oidentd/files/oidentd/run | 1 +
srcpkgs/olsrd/files/olsrd/run | 1 +
srcpkgs/open-vm-tools/files/vmtoolsd/run | 1 +
srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run | 1 +
srcpkgs/opendkim/files/opendkim/run | 1 +
srcpkgs/openntpd/files/openntpd/run | 1 +
srcpkgs/openrgb/files/openrgb/run | 1 +
srcpkgs/opensmtpd/files/opensmtpd/run | 1 +
srcpkgs/openssh/files/sshd/run | 1 +
srcpkgs/openvswitch/files/ovs-vswitchd/run | 1 +
srcpkgs/openvswitch/files/ovsdb-server/run | 1 +
srcpkgs/parpd/files/parpd/run | 1 +
srcpkgs/parprouted/files/parprouted/run | 1 +
srcpkgs/pbbuttonsd/files/pbbuttonsd/run | 1 +
srcpkgs/pcsclite/files/pcscd/run | 1 +
srcpkgs/pd-mapper/files/pd-mapper/run | 1 +
srcpkgs/php/files/php-fpm/run | 1 +
srcpkgs/php8.0/files/php-fpm8.0/run | 1 +
srcpkgs/php8.1/files/php-fpm8.1/run | 1 +
srcpkgs/pipewire/files/pipewire-pulse/run | 1 +
srcpkgs/pipewire/files/pipewire/run | 1 +
srcpkgs/podman/files/podman-docker/run | 1 +
srcpkgs/podman/files/podman/run | 1 +
srcpkgs/polipo/files/polipo/run | 1 +
srcpkgs/polkit/files/polkitd/run | 1 +
srcpkgs/postfix/files/postfix/run | 1 +
srcpkgs/postgresql14/files/postgresql14/run | 1 +
srcpkgs/postgresql15/files/postgresql15/run | 1 +
srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run | 1 +
srcpkgs/privoxy/files/privoxy/run | 1 +
srcpkgs/prometheus/files/prometheus/run | 1 +
srcpkgs/prosody/files/prosody/run | 1 +
srcpkgs/pulseaudio/files/pulseaudio/run | 1 +
srcpkgs/qemu/files/qemu-ga/run | 1 +
srcpkgs/qrtr-ns/files/qrtr-ns/run | 1 +
srcpkgs/quassel/files/quasselcore/run | 1 +
srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run | 1 +
srcpkgs/radvd/files/radvd/run | 1 +
srcpkgs/redis/files/redis/run | 1 +
srcpkgs/rest-server/files/rest-server/run | 1 +
srcpkgs/rmilter/files/rmilter/run | 1 +
srcpkgs/rmtfs/files/rmtfs/run | 1 +
srcpkgs/rng-tools/files/rngd/run | 1 +
srcpkgs/routinator/files/routinator/run | 1 +
srcpkgs/rpcbind/files/rpcbind/run | 1 +
srcpkgs/rspamd/files/rspamd/run | 1 +
srcpkgs/rsync/files/rsyncd/run | 1 +
srcpkgs/rsyslog/files/rsyslogd/run | 1 +
srcpkgs/rtkit/files/rtkit/run | 1 +
srcpkgs/salt/files/salt-api/run | 1 +
srcpkgs/salt/files/salt-master/run | 1 +
srcpkgs/salt/files/salt-minion/run | 1 +
srcpkgs/salt/files/salt-syndic/run | 1 +
srcpkgs/samba/files/ctdbd/run | 1 +
srcpkgs/sane/files/saned/run | 1 +
srcpkgs/scron/files/scron/run | 1 +
srcpkgs/sddm/files/sddm/run | 1 +
srcpkgs/seatd/files/seatd/run | 1 +
srcpkgs/sftpgo/files/sftpgo/run | 1 +
srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run | 1 +
srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run | 1 +
srcpkgs/shinit/files/shinit/run | 1 +
srcpkgs/shiori/files/shiori/run | 1 +
srcpkgs/shorewall/files/shorewall/run | 1 +
srcpkgs/shorewall/files/shorewall6/run | 1 +
srcpkgs/slim/files/slim/run | 1 +
srcpkgs/smartmontools/files/smartd/run | 1 +
srcpkgs/smcroute/files/smcrouted/run | 1 +
srcpkgs/snapcast/files/snapclient/run | 1 +
srcpkgs/snapcast/files/snapserver/run | 1 +
srcpkgs/snapper/files/snapperd/run | 1 +
srcpkgs/sndio/files/sndiod/run | 1 +
srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run | 1 +
srcpkgs/spamassassin/files/spamd/run | 1 +
srcpkgs/spampd/files/spampd/run | 1 +
srcpkgs/spice-vdagent/files/spice-vdagentd/run | 1 +
srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run | 1 +
srcpkgs/sqmail/files/qmail-send/run | 1 +
srcpkgs/sqmail/files/qmail-smtpd/run | 1 +
srcpkgs/sqmail/files/qmail-smtpsd/run | 1 +
srcpkgs/sqmail/files/qmail-smtpsub/run | 1 +
srcpkgs/squid/files/squid/run | 1 +
srcpkgs/sshguard/files/sshguard-socklog/run | 1 +
srcpkgs/ssl_exporter/files/ssl_exporter/run | 1 +
srcpkgs/sslh/files/sslh/run | 1 +
srcpkgs/sssd/files/sssd/run | 1 +
srcpkgs/strongswan/files/strongswan/run | 1 +
srcpkgs/stubby/files/stubby/run | 1 +
srcpkgs/subversion/files/svnserve/run | 1 +
srcpkgs/sv-netmount/files/netmount/run | 1 +
srcpkgs/synapse/files/synapse/run | 1 +
srcpkgs/synergy/files/synergyc/run | 1 +
srcpkgs/synergy/files/synergys/run | 1 +
srcpkgs/telegraf/files/telegraf/run | 1 +
srcpkgs/tftp-hpa/files/tftpd-hpa/run | 1 +
srcpkgs/thermald/files/thermald/run | 1 +
srcpkgs/thttpd/files/thttpd/run | 1 +
srcpkgs/tinc/files/tincd/run | 1 +
srcpkgs/tinyproxy/files/tinyproxy/run | 1 +
srcpkgs/tinyssh/files/tinysshd/run | 1 +
srcpkgs/tlp/files/tlp/run | 1 +
srcpkgs/tor/files/tor/run | 1 +
srcpkgs/touchegg/files/touchegg/run | 1 +
srcpkgs/toxcore/files/tox-bootstrapd/run | 1 +
srcpkgs/transmission/files/transmission-daemon/run | 1 +
srcpkgs/twoftpd/files/twoftpd-anon/run | 1 +
srcpkgs/ufw/files/ufw/run | 1 +
srcpkgs/ulogd/files/ulogd/run | 1 +
srcpkgs/unbound/files/unbound/run | 1 +
srcpkgs/upmpdcli/files/upmpdcli/run | 1 +
srcpkgs/uptimed/files/uptimed/run | 1 +
srcpkgs/usbguard/files/usbguard/run | 1 +
srcpkgs/usbmuxd/files/usbmuxd/run | 1 +
srcpkgs/util-linux/files/uuidd/run | 1 +
srcpkgs/v2ray/files/v2ray/run | 1 +
srcpkgs/varnish/files/varnishd/run | 1 +
srcpkgs/vault/files/vault/run | 1 +
srcpkgs/vaultwarden/files/vaultwarden/run | 1 +
srcpkgs/virtualbox-ose/files/vboxservice/run | 1 +
srcpkgs/virtualbox-ose/files/vboxwebsrv/run | 1 +
srcpkgs/vnstat/files/vnstatd/run | 1 +
srcpkgs/vpnd/files/vpnd/run | 1 +
srcpkgs/vsftpd/files/vsftpd-ipv6/run | 1 +
srcpkgs/vsftpd/files/vsftpd/run | 1 +
srcpkgs/watchdog/files/watchdog/run | 1 +
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/wesnoth/files/wesnothd/run | 1 +
srcpkgs/wicd/files/wicd/run | 1 +
srcpkgs/wireguard-tools/files/wireguard/run | 1 +
srcpkgs/wireproxy/files/wireproxy/run | 1 +
srcpkgs/x2goserver/files/x2gocleansessions/run | 1 +
srcpkgs/xdm/files/xdm/run | 1 +
srcpkgs/xen/files/xen/run | 1 +
srcpkgs/xen/files/xenconsoled/run | 1 +
srcpkgs/xen/files/xenstored/run | 1 +
srcpkgs/xinetd/files/xinetd/run | 1 +
srcpkgs/xl2tpd/files/xl2tpd/run | 1 +
srcpkgs/yggdrasil/files/yggdrasil/run | 1 +
srcpkgs/zabbix/files/zabbix-agent/run | 1 +
srcpkgs/zabbix/files/zabbix-proxy/run | 1 +
srcpkgs/zabbix/files/zabbix-server/run | 1 +
srcpkgs/zeek/files/bro/run | 1 +
srcpkgs/zeek/files/zeek/run | 1 +
srcpkgs/zfs/files/zed/run | 1 +
srcpkgs/znc/files/znc/run | 1 +
srcpkgs/zrepl/files/zrepl/run | 1 +
392 files changed, 392 insertions(+)
diff --git a/srcpkgs/3proxy/files/3proxy/run b/srcpkgs/3proxy/files/3proxy/run
index bbdcd1a51bca..ddb3a1fa6b63 100755
--- a/srcpkgs/3proxy/files/3proxy/run
+++ b/srcpkgs/3proxy/files/3proxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec 3proxy /etc/3proxy/3proxy.cfg
diff --git a/srcpkgs/Clightd/files/Clightd/run b/srcpkgs/Clightd/files/Clightd/run
index 9170543376b5..4319b150787e 100644
--- a/srcpkgs/Clightd/files/Clightd/run
+++ b/srcpkgs/Clightd/files/Clightd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec /usr/libexec/clightd 2>&1
diff --git a/srcpkgs/EternalTerminal/files/etserver/run b/srcpkgs/EternalTerminal/files/etserver/run
index 97e23f86cf88..a5e3fe2a793f 100644
--- a/srcpkgs/EternalTerminal/files/etserver/run
+++ b/srcpkgs/EternalTerminal/files/etserver/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _eternal etserver
diff --git a/srcpkgs/FreeRADIUS/files/FreeRADIUS/run b/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
index 525e8d2ae103..65baa3ee7901 100644
--- a/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
+++ b/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _freeradius:_freeradius radiusd -f
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run b/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
index 163298b9fa5f..33d97affb4d3 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# The Google services assert that the init is performing some
# sequencing. Since runit provides no such facility, we will block
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run b/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
index 286d7b59f1d5..a387bca2edbd 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run b/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
index 33615f7eec01..e2c5534669b0 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run b/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
index 31a2fd454520..3cb07ac1cf33 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/Gokapi/files/gokapi/run b/srcpkgs/Gokapi/files/gokapi/run
index 8f4295583d2c..24213299c51e 100644
--- a/srcpkgs/Gokapi/files/gokapi/run
+++ b/srcpkgs/Gokapi/files/gokapi/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetAuth-ldap/files/netauth-ldap/run b/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
index 465f4e54904a..c49142f50e96 100644
--- a/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
+++ b/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetAuth/files/netauthd/run b/srcpkgs/NetAuth/files/netauthd/run
index 2f15234c2505..718a5deb4b18 100644
--- a/srcpkgs/NetAuth/files/netauthd/run
+++ b/srcpkgs/NetAuth/files/netauthd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run
index 2df342d579b0..a1a143999ad7 100755
--- a/srcpkgs/NetworkManager/files/NetworkManager/run
+++ b/srcpkgs/NetworkManager/files/NetworkManager/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec NetworkManager -n > /dev/null 2>&1
diff --git a/srcpkgs/PopCorn/files/pqueryd/run b/srcpkgs/PopCorn/files/pqueryd/run
index b413a58cf116..db1958bea23d 100644
--- a/srcpkgs/PopCorn/files/pqueryd/run
+++ b/srcpkgs/PopCorn/files/pqueryd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/PopCorn/files/statrepo/run b/srcpkgs/PopCorn/files/statrepo/run
index 05c15baf1b75..33bbfcc7014e 100644
--- a/srcpkgs/PopCorn/files/statrepo/run
+++ b/srcpkgs/PopCorn/files/statrepo/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/Swapspace/files/swapspace/run b/srcpkgs/Swapspace/files/swapspace/run
index d07bc78f2e7d..3317e23833f8 100644
--- a/srcpkgs/Swapspace/files/swapspace/run
+++ b/srcpkgs/Swapspace/files/swapspace/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec swapspace
diff --git a/srcpkgs/acpid/files/acpid/run b/srcpkgs/acpid/files/acpid/run
index 0f41739c080b..20e374fa70a1 100755
--- a/srcpkgs/acpid/files/acpid/run
+++ b/srcpkgs/acpid/files/acpid/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec acpid -f ${OPTS:=-l}
diff --git a/srcpkgs/alertmanager/files/alertmanager/run b/srcpkgs/alertmanager/files/alertmanager/run
index c4ca4e70d674..2c86493d2115 100755
--- a/srcpkgs/alertmanager/files/alertmanager/run
+++ b/srcpkgs/alertmanager/files/alertmanager/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/alfred/files/alfred/run b/srcpkgs/alfred/files/alfred/run
index c80114d09a1f..362ada881786 100755
--- a/srcpkgs/alfred/files/alfred/run
+++ b/srcpkgs/alfred/files/alfred/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec alfred ${OPTS:=-i "bat0" -b "bat0"}
diff --git a/srcpkgs/alfred/files/batadv-vis/run b/srcpkgs/alfred/files/batadv-vis/run
index 2fe016ae3793..baf7acd68fdc 100755
--- a/srcpkgs/alfred/files/batadv-vis/run
+++ b/srcpkgs/alfred/files/batadv-vis/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec batadv-vis ${OPTS:=-si bat0}
diff --git a/srcpkgs/alsa-utils/files/alsa/run b/srcpkgs/alsa-utils/files/alsa/run
index 728c4c8dd76f..be7cbac7f80e 100755
--- a/srcpkgs/alsa-utils/files/alsa/run
+++ b/srcpkgs/alsa-utils/files/alsa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
alsactl restore
exec chpst -b alsa pause
diff --git a/srcpkgs/android-tools/files/adb/run b/srcpkgs/android-tools/files/adb/run
index 9d81719e4c7c..d5ad652e33fb 100755
--- a/srcpkgs/android-tools/files/adb/run
+++ b/srcpkgs/android-tools/files/adb/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
[ -r conf ] && . ./conf
adb ${OPTS:=start-server -P5037}
diff --git a/srcpkgs/anope/files/anope/run b/srcpkgs/anope/files/anope/run
index ca9b72cedbf2..964ce8945da7 100644
--- a/srcpkgs/anope/files/anope/run
+++ b/srcpkgs/anope/files/anope/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec anopeservices \
--confdir=/etc/anope \
--dbdir=/var/lib/anope \
diff --git a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
index 1fcaf44eeb96..bb9d5c0ea683 100644
--- a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
+++ b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/lib/kafka/bin/zookeeper-server-start.sh ${PROPERTIES_FILE:-/usr/lib/kafka/config/zookeeper.properties}
diff --git a/srcpkgs/apache-kafka/files/apache-kafka/run b/srcpkgs/apache-kafka/files/apache-kafka/run
index 7f888a35e8cd..8a8c13c6c3d0 100644
--- a/srcpkgs/apache-kafka/files/apache-kafka/run
+++ b/srcpkgs/apache-kafka/files/apache-kafka/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/lib/kafka/bin/kafka-server-start.sh ${PROPERTIES_FILE:-/usr/lib/kafka/config/server.properties}
diff --git a/srcpkgs/apache-tomcat/files/apache-tomcat/run b/srcpkgs/apache-tomcat/files/apache-tomcat/run
index 03f3c94067ea..1cf370821e57 100644
--- a/srcpkgs/apache-tomcat/files/apache-tomcat/run
+++ b/srcpkgs/apache-tomcat/files/apache-tomcat/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export CATALINA_BASE=/usr/share/apache-tomcat
diff --git a/srcpkgs/apache/files/apache/run b/srcpkgs/apache/files/apache/run
index d1995dd04de1..1579bdfed20e 100644
--- a/srcpkgs/apache/files/apache/run
+++ b/srcpkgs/apache/files/apache/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/apcupsd/files/apcupsd/run b/srcpkgs/apcupsd/files/apcupsd/run
index 2c0b807da287..e570f226c90a 100644
--- a/srcpkgs/apcupsd/files/apcupsd/run
+++ b/srcpkgs/apcupsd/files/apcupsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf] && . ./conf
exec apcupsd -b ${OPTS}
diff --git a/srcpkgs/ardor/files/ardor-tor/run b/srcpkgs/ardor/files/ardor-tor/run
index a18a2d10d191..03526311ac8b 100644
--- a/srcpkgs/ardor/files/ardor-tor/run
+++ b/srcpkgs/ardor/files/ardor-tor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ardor-tor > /dev/null
diff --git a/srcpkgs/ardor/files/ardor/run b/srcpkgs/ardor/files/ardor/run
index b872eb1da727..f09d2d4ced10 100644
--- a/srcpkgs/ardor/files/ardor/run
+++ b/srcpkgs/ardor/files/ardor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ardor > /dev/null
diff --git a/srcpkgs/armagetronad/files/armagetronad-dedicated/run b/srcpkgs/armagetronad/files/armagetronad-dedicated/run
index 52127b128b5a..d129885f870b 100644
--- a/srcpkgs/armagetronad/files/armagetronad-dedicated/run
+++ b/srcpkgs/armagetronad/files/armagetronad-dedicated/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec armagetronad-dedicated
diff --git a/srcpkgs/asus-kbd-backlight/files/asus-kbd/run b/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
index dc41b16f87b2..06420e9fd7ac 100644
--- a/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
+++ b/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
asus-kbd-backlight allowusers
diff --git a/srcpkgs/at/files/at/run b/srcpkgs/at/files/at/run
index 967ced04cbeb..083a67dfdfcf 100755
--- a/srcpkgs/at/files/at/run
+++ b/srcpkgs/at/files/at/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec atd -f
diff --git a/srcpkgs/atop/files/atop/run b/srcpkgs/atop/files/atop/run
index 532e35f595a1..431d390345f8 100755
--- a/srcpkgs/atop/files/atop/run
+++ b/srcpkgs/atop/files/atop/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec atop -a -w /var/log/atop/atop_$(date +%Y%m%d) 600
diff --git a/srcpkgs/audit/files/auditctl/run b/srcpkgs/audit/files/auditctl/run
index 64a2820eb21e..ebfa223efed5 100755
--- a/srcpkgs/audit/files/auditctl/run
+++ b/srcpkgs/audit/files/auditctl/run
@@ -1,4 +1,5 @@
#!/bin/sh -e
+exec 2>&1
test ! -r ./conf || . ./conf
diff --git a/srcpkgs/audit/files/auditd/run b/srcpkgs/audit/files/auditd/run
index 4b5c68a0bdbd..7e3427652f5d 100755
--- a/srcpkgs/audit/files/auditd/run
+++ b/srcpkgs/audit/files/auditd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec auditd -n
diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run
index af2dc17a93dd..b0d858438fde 100755
--- a/srcpkgs/avahi/files/avahi-daemon/run
+++ b/srcpkgs/avahi/files/avahi-daemon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# if dbus is enabled wait for it.
if [ -e /var/service/dbus ]; then
sv check dbus > /dev/null || exit 1
diff --git a/srcpkgs/bacula-common/files/bacula-dir/run b/srcpkgs/bacula-common/files/bacula-dir/run
index be89aac60783..5632681e99d0 100755
--- a/srcpkgs/bacula-common/files/bacula-dir/run
+++ b/srcpkgs/bacula-common/files/bacula-dir/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-dir -f -c /etc/bacula/bacula-dir.conf
diff --git a/srcpkgs/bacula-common/files/bacula-fd/run b/srcpkgs/bacula-common/files/bacula-fd/run
index 6f3765f1fa75..40411de5b170 100755
--- a/srcpkgs/bacula-common/files/bacula-fd/run
+++ b/srcpkgs/bacula-common/files/bacula-fd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-fd -f -c /etc/bacula/bacula-fd.conf
diff --git a/srcpkgs/bacula-common/files/bacula-sd/run b/srcpkgs/bacula-common/files/bacula-sd/run
index 6ef1480466fa..a46df0bb65a3 100755
--- a/srcpkgs/bacula-common/files/bacula-sd/run
+++ b/srcpkgs/bacula-common/files/bacula-sd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-sd -f -c /etc/bacula/bacula-sd.conf
diff --git a/srcpkgs/barrier/files/barrierc/run b/srcpkgs/barrier/files/barrierc/run
index f57a57edaf3a..ab7039aa2256 100755
--- a/srcpkgs/barrier/files/barrierc/run
+++ b/srcpkgs/barrier/files/barrierc/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SERVER_ADDR ] && exit 0
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
diff --git a/srcpkgs/barrier/files/barriers/run b/srcpkgs/barrier/files/barriers/run
index c59b48edf947..5d4deeefb8e7 100755
--- a/srcpkgs/barrier/files/barriers/run
+++ b/srcpkgs/barrier/files/barriers/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
exec barriers --no-daemon ${OPTS:=--restart}
diff --git a/srcpkgs/beanstalkd/files/beanstalkd/run b/srcpkgs/beanstalkd/files/beanstalkd/run
index dfba751acc8f..9823e332ece0 100755
--- a/srcpkgs/beanstalkd/files/beanstalkd/run
+++ b/srcpkgs/beanstalkd/files/beanstalkd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# By default use persistent storage (binary log)
[ -r conf ] && . ./conf
exec chpst -u _beanstalkd:_beanstalkd beanstalkd ${OPTS:=-b /var/lib/beanstalkd} 2>&1
diff --git a/srcpkgs/beard/files/beard/run b/srcpkgs/beard/files/beard/run
index 91fc4c7108f7..fe6be1a33e05 100644
--- a/srcpkgs/beard/files/beard/run
+++ b/srcpkgs/beard/files/beard/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec beard -H ${BEARD_HIBERNATE:=/usr/bin/zzz} $OPTS
diff --git a/srcpkgs/bftpd/files/bftpd/run b/srcpkgs/bftpd/files/bftpd/run
index a20f54a93383..7c8d7b2327e7 100755
--- a/srcpkgs/bftpd/files/bftpd/run
+++ b/srcpkgs/bftpd/files/bftpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bftpd -D
diff --git a/srcpkgs/binfmt-support/files/binfmt-support/run b/srcpkgs/binfmt-support/files/binfmt-support/run
index 3c4d89207d92..9bf7ccfe345e 100644
--- a/srcpkgs/binfmt-support/files/binfmt-support/run
+++ b/srcpkgs/binfmt-support/files/binfmt-support/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
update-binfmts --enable
exec chpst -b binfmt-support pause
diff --git a/srcpkgs/bird/files/bird/run b/srcpkgs/bird/files/bird/run
index 80a516e1e79d..5e0468a592dd 100644
--- a/srcpkgs/bird/files/bird/run
+++ b/srcpkgs/bird/files/bird/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bird -f -u _bird -g _bird ${OPTS:=-c /etc/bird.conf}
diff --git a/srcpkgs/bird_exporter/files/bird_exporter/run b/srcpkgs/bird_exporter/files/bird_exporter/run
index d92d81909407..bfb99f962057 100755
--- a/srcpkgs/bird_exporter/files/bird_exporter/run
+++ b/srcpkgs/bird_exporter/files/bird_exporter/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec bird_exporter ${OPTS:=-bird.v2 -format.new}
diff --git a/srcpkgs/bitlbee/files/bitlbee/run b/srcpkgs/bitlbee/files/bitlbee/run
index e6d5705b60fd..ac0dcef34601 100644
--- a/srcpkgs/bitlbee/files/bitlbee/run
+++ b/srcpkgs/bitlbee/files/bitlbee/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
install -d -m0755 -o bitlbee -g bitlbee /run/bitlbee
[ -r conf ] && . ./conf
diff --git a/srcpkgs/blackbox_exporter/files/blackbox_exporter/run b/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
index a6dd952eac8a..de51fb53d7f9 100755
--- a/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
+++ b/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments to blackbox_exporter
# $CONF_FILE is the location of the configuration file.
diff --git a/srcpkgs/bluez-alsa/files/bluez-alsa/run b/srcpkgs/bluez-alsa/files/bluez-alsa/run
index d7a73bbe2c73..2a52a6525812 100644
--- a/srcpkgs/bluez-alsa/files/bluez-alsa/run
+++ b/srcpkgs/bluez-alsa/files/bluez-alsa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _bluez_alsa -g audio /run/bluealsa
diff --git a/srcpkgs/bolt/files/boltd/run b/srcpkgs/bolt/files/boltd/run
index 90fc46026684..8f90fd189efe 100644
--- a/srcpkgs/bolt/files/boltd/run
+++ b/srcpkgs/bolt/files/boltd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec /usr/libexec/boltd > /dev/null 2>&1
diff --git a/srcpkgs/brltty/files/brltty/run b/srcpkgs/brltty/files/brltty/run
index ef50183e589b..e97b3b626f04 100644
--- a/srcpkgs/brltty/files/brltty/run
+++ b/srcpkgs/brltty/files/brltty/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/brltty || exit 1
exec brltty -n
diff --git a/srcpkgs/bumblebee/files/bumblebeed/run b/srcpkgs/bumblebee/files/bumblebeed/run
index a8ee73c4373c..9a85db7e26fc 100755
--- a/srcpkgs/bumblebee/files/bumblebeed/run
+++ b/srcpkgs/bumblebee/files/bumblebeed/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bumblebeed --use-syslog
diff --git a/srcpkgs/burp2-server/files/burp2-server/run b/srcpkgs/burp2-server/files/burp2-server/run
index 14e3188c6f08..5ea7919b841a 100755
--- a/srcpkgs/burp2-server/files/burp2-server/run
+++ b/srcpkgs/burp2-server/files/burp2-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec burp -F -c /etc/burp/burp-server.conf
diff --git a/srcpkgs/busybox/files/busybox-klogd/run b/srcpkgs/busybox/files/busybox-klogd/run
index 3db6835ffe47..a3f11984e84a 100644
--- a/srcpkgs/busybox/files/busybox-klogd/run
+++ b/srcpkgs/busybox/files/busybox-klogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox klogd -n
diff --git a/srcpkgs/busybox/files/busybox-ntpd/run b/srcpkgs/busybox/files/busybox-ntpd/run
index 617b67f574bc..8fcd2df4f29b 100755
--- a/srcpkgs/busybox/files/busybox-ntpd/run
+++ b/srcpkgs/busybox/files/busybox-ntpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox ntpd -nN -p pool.ntp.org
diff --git a/srcpkgs/busybox/files/busybox-syslogd/run b/srcpkgs/busybox/files/busybox-syslogd/run
index d524941068c9..60d0be02ac28 100644
--- a/srcpkgs/busybox/files/busybox-syslogd/run
+++ b/srcpkgs/busybox/files/busybox-syslogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox syslogd -n
diff --git a/srcpkgs/cachefilesd/files/cachefilesd/run b/srcpkgs/cachefilesd/files/cachefilesd/run
index 5cc506581989..4785ef933e1b 100755
--- a/srcpkgs/cachefilesd/files/cachefilesd/run
+++ b/srcpkgs/cachefilesd/files/cachefilesd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
modprobe cachefiles || exit 1
exec cachefilesd -n ${OPTS:= -f /etc/cachefilesd.conf}
diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
index 58940d1bfd3b..9c259b6bb4c4 100644
--- a/srcpkgs/caddy/files/caddy/run
+++ b/srcpkgs/caddy/files/caddy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/canto-next/files/canto-daemon/run b/srcpkgs/canto-next/files/canto-daemon/run
index 37a5f8912c5f..8514ff6a8f83 100644
--- a/srcpkgs/canto-next/files/canto-daemon/run
+++ b/srcpkgs/canto-next/files/canto-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec canto-daemon
diff --git a/srcpkgs/chronograf/files/chronograf/run b/srcpkgs/chronograf/files/chronograf/run
index 3f3bb679fd8d..c5f6e0b2dc0b 100644
--- a/srcpkgs/chronograf/files/chronograf/run
+++ b/srcpkgs/chronograf/files/chronograf/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _chronograf:_chronograf chronograf --bolt-path=/var/lib/chronograf/chronograf-v1.db --canned-path=/usr/share/chronograf/canned
diff --git a/srcpkgs/chrony/files/chronyd/run b/srcpkgs/chrony/files/chronyd/run
index 75ee6102a3fb..a6aeb85624ce 100644
--- a/srcpkgs/chrony/files/chronyd/run
+++ b/srcpkgs/chrony/files/chronyd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m750 -o chrony -g chrony /var/run/chrony
exec chronyd -n -u chrony
diff --git a/srcpkgs/ckb-next/files/ckb-next-daemon/run b/srcpkgs/ckb-next/files/ckb-next-daemon/run
index fc0d263a74c8..65017ff8dc16 100644
--- a/srcpkgs/ckb-next/files/ckb-next-daemon/run
+++ b/srcpkgs/ckb-next/files/ckb-next-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/ckb-next-daemon 2>&1
diff --git a/srcpkgs/cntlm/files/cntlm/run b/srcpkgs/cntlm/files/cntlm/run
index b1e45897f545..f1d5a2fd5541 100755
--- a/srcpkgs/cntlm/files/cntlm/run
+++ b/srcpkgs/cntlm/files/cntlm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cntlm -f 2>&1
diff --git a/srcpkgs/collectd/files/collectd/run b/srcpkgs/collectd/files/collectd/run
index cb773129d1c6..bbb84229f7fc 100644
--- a/srcpkgs/collectd/files/collectd/run
+++ b/srcpkgs/collectd/files/collectd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec collectd -f
diff --git a/srcpkgs/colord/files/colord/run b/srcpkgs/colord/files/colord/run
index 5650cdaa8885..e03c807ddeea 100755
--- a/srcpkgs/colord/files/colord/run
+++ b/srcpkgs/colord/files/colord/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u colord /usr/libexec/colord 2>&1
diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run
index a3a42e323623..8ca07926e38b 100644
--- a/srcpkgs/conduit/files/conduit/run
+++ b/srcpkgs/conduit/files/conduit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-8192}
export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run
index e90eed5ba4ad..4e37b35268cd 100755
--- a/srcpkgs/connman/files/connmand/run
+++ b/srcpkgs/connman/files/connmand/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec connmand -n ${OPTS}
diff --git a/srcpkgs/containerd/files/containerd/run b/srcpkgs/containerd/files/containerd/run
index 92738de80995..b14083a80a22 100755
--- a/srcpkgs/containerd/files/containerd/run
+++ b/srcpkgs/containerd/files/containerd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
env modeprobe overlay
exec containerd
diff --git a/srcpkgs/coturn/files/coturnserver/run b/srcpkgs/coturn/files/coturnserver/run
index 3ccf906ded56..510fd31df919 100755
--- a/srcpkgs/coturn/files/coturnserver/run
+++ b/srcpkgs/coturn/files/coturnserver/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _coturn:_coturn turnserver -c /etc/turnserver.conf
diff --git a/srcpkgs/criu/files/criu/run b/srcpkgs/criu/files/criu/run
index fa7863abe797..19a67c430bea 100755
--- a/srcpkgs/criu/files/criu/run
+++ b/srcpkgs/criu/files/criu/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec criu service ${OPTS:=-o /var/log/criu-service.log}
diff --git a/srcpkgs/cronie/files/cronie/run b/srcpkgs/cronie/files/cronie/run
index d3045c363c6d..b7e77227b898 100755
--- a/srcpkgs/cronie/files/cronie/run
+++ b/srcpkgs/cronie/files/cronie/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec cronie-crond -n $OPTS 2>&1
diff --git a/srcpkgs/cups-filters/files/cups-browsed/run b/srcpkgs/cups-filters/files/cups-browsed/run
index 1a16f73d3886..2120dce7b0b6 100644
--- a/srcpkgs/cups-filters/files/cups-browsed/run
+++ b/srcpkgs/cups-filters/files/cups-browsed/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cups-browsed
diff --git a/srcpkgs/cups/files/cupsd/run b/srcpkgs/cups/files/cupsd/run
index 568bee19986d..d655c5d87e4d 100755
--- a/srcpkgs/cups/files/cupsd/run
+++ b/srcpkgs/cups/files/cupsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cupsd -f
diff --git a/srcpkgs/darkhttpd/files/darkhttpd/run b/srcpkgs/darkhttpd/files/darkhttpd/run
index 465456978b30..9b4eb122877c 100755
--- a/srcpkgs/darkhttpd/files/darkhttpd/run
+++ b/srcpkgs/darkhttpd/files/darkhttpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${WWWDIR:=/srv/www/darkhttpd}
exec darkhttpd "${WWWDIR}" --chroot --uid _darkhttpd --gid _darkhttpd $OPTS 2>&1 >>/var/log/darkhttpd/darkhttpd.log
diff --git a/srcpkgs/dbus-elogind/files/dbus/run b/srcpkgs/dbus-elogind/files/dbus/run
index ed60b734343a..4a6b981fd735 100755
--- a/srcpkgs/dbus-elogind/files/dbus/run
+++ b/srcpkgs/dbus-elogind/files/dbus/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dbus/files/dbus/run b/srcpkgs/dbus/files/dbus/run
index ed60b734343a..4a6b981fd735 100755
--- a/srcpkgs/dbus/files/dbus/run
+++ b/srcpkgs/dbus/files/dbus/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dcron/files/dcron/run b/srcpkgs/dcron/files/dcron/run
index dd4f22a28e59..d3bc290e799f 100755
--- a/srcpkgs/dcron/files/dcron/run
+++ b/srcpkgs/dcron/files/dcron/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dcrond -f $OPTS 2>&1
diff --git a/srcpkgs/ddclient/files/ddclient/run b/srcpkgs/ddclient/files/ddclient/run
index e77a50dd3d07..8b9e7a746ca9 100644
--- a/srcpkgs/ddclient/files/ddclient/run
+++ b/srcpkgs/ddclient/files/ddclient/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ddclient -foreground
diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run
index 9f56a76bdae8..861a81bea28f 100644
--- a/srcpkgs/deluge/files/deluge-web/run
+++ b/srcpkgs/deluge/files/deluge-web/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check deluged >/dev/null || exit 1
HOME=/var/lib/deluge
exec chpst -u deluge:deluge deluge-web -d 2>&1
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 6162f08d46b0..9c5887638e0e 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config/deluge ${OPTS} 2>&1
diff --git a/srcpkgs/dhcpcd/files/dhcpcd-eth0/run b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
index da17e8a99ae9..e468ad5fe570 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
+++ b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dhcpcd -B eth0 $OPTS 1>&2
diff --git a/srcpkgs/dhcpcd/files/dhcpcd/run b/srcpkgs/dhcpcd/files/dhcpcd/run
index ac656a2b22bb..c2489dc1cb5d 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd/run
+++ b/srcpkgs/dhcpcd/files/dhcpcd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dhcpcd -B ${OPTS:=-M} 1>&2
diff --git a/srcpkgs/dictd/files/dictd/run b/srcpkgs/dictd/files/dictd/run
index 0138bb406c29..f5ffd52e0a17 100644
--- a/srcpkgs/dictd/files/dictd/run
+++ b/srcpkgs/dictd/files/dictd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec 2>/dev/null
exec chpst -u dictd:dictd dictd --debug nodetach ${OPTS:=--locale en_US.UTF-8 -s}
diff --git a/srcpkgs/diod/files/diod/run b/srcpkgs/diod/files/diod/run
index a1d9faa1f11e..56e4f58f8c96 100755
--- a/srcpkgs/diod/files/diod/run
+++ b/srcpkgs/diod/files/diod/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec diod -f 2>&1
diff --git a/srcpkgs/distcc/files/distccd/run b/srcpkgs/distcc/files/distccd/run
index 58c2676387ac..7fd8322fea71 100755
--- a/srcpkgs/distcc/files/distccd/run
+++ b/srcpkgs/distcc/files/distccd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
PROG="distccd"
USER="nobody"
OPTIONS="--no-detach"
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_in/run b/srcpkgs/dkimproxy/files/dkimproxy_in/run
index 444d5b08158d..3ff39abc7078 100644
--- a/srcpkgs/dkimproxy/files/dkimproxy_in/run
+++ b/srcpkgs/dkimproxy/files/dkimproxy_in/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _dkim:_dkim dkimproxy.in --conf_file=/etc/dkimproxy_in.conf 2>&1
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_out/run b/srcpkgs/dkimproxy/files/dkimproxy_out/run
index b77c1a091bf8..b1d6cd3f3978 100644
--- a/srcpkgs/dkimproxy/files/dkimproxy_out/run
+++ b/srcpkgs/dkimproxy/files/dkimproxy_out/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _dkim:_dkim dkimproxy.out --conf_file=/etc/dkimproxy_out.conf 2>&1
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
index 130506a53b7d..fe83bbce5480 100644
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run
index f3504f9e6ece..5d3a69b38695 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq/run
+++ b/srcpkgs/dnsmasq/files/dnsmasq/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/lib/misc
[ -r ./conf ] && . ./conf
exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1
diff --git a/srcpkgs/dovecot/files/dovecot/run b/srcpkgs/dovecot/files/dovecot/run
index c3485096af91..b442b8c25cdf 100755
--- a/srcpkgs/dovecot/files/dovecot/run
+++ b/srcpkgs/dovecot/files/dovecot/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m 0755 -o root -g root /var/run/dovecot
exec dovecot -F
diff --git a/srcpkgs/dq/files/dqcache/run b/srcpkgs/dq/files/dqcache/run
index 5d3e34ebb66a..e86fe710ebcb 100644
--- a/srcpkgs/dq/files/dqcache/run
+++ b/srcpkgs/dq/files/dqcache/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -U _dqcache -e /etc/dqcache/env dqcache 2>&1
diff --git a/srcpkgs/drbd-utils/files/drbd/run b/srcpkgs/drbd-utils/files/drbd/run
index 0f594ec6a1df..e9b9a6d63e15 100755
--- a/srcpkgs/drbd-utils/files/drbd/run
+++ b/srcpkgs/drbd-utils/files/drbd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
/usr/libexec/drbd start
exec chpst -b drbd pause
diff --git a/srcpkgs/dropbear/files/dropbear/run b/srcpkgs/dropbear/files/dropbear/run
index 50c442b8cc98..a02d55320497 100755
--- a/srcpkgs/dropbear/files/dropbear/run
+++ b/srcpkgs/dropbear/files/dropbear/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dropbear ${OPTS:=-F -R}
diff --git a/srcpkgs/duiadns/files/duiadns/run b/srcpkgs/duiadns/files/duiadns/run
index c60644335b6a..ef0eade5050a 100755
--- a/srcpkgs/duiadns/files/duiadns/run
+++ b/srcpkgs/duiadns/files/duiadns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/earlyoom/files/earlyoom/run b/srcpkgs/earlyoom/files/earlyoom/run
index 7bc8877b5b26..fd2a22c36de9 100755
--- a/srcpkgs/earlyoom/files/earlyoom/run
+++ b/srcpkgs/earlyoom/files/earlyoom/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec earlyoom ${OPTS} 2>&1 >/dev/null
diff --git a/srcpkgs/edac-utils/files/edac/run b/srcpkgs/edac-utils/files/edac/run
index a2cc0160a2b6..6058f0b68f64 100644
--- a/srcpkgs/edac-utils/files/edac/run
+++ b/srcpkgs/edac-utils/files/edac/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
edac-ctl --register-labels
exec chpst -b edac pause
diff --git a/srcpkgs/elog/files/elogd/run b/srcpkgs/elog/files/elogd/run
index b196a73b4ef1..f754fa1e7f1d 100644
--- a/srcpkgs/elog/files/elogd/run
+++ b/srcpkgs/elog/files/elogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u elog:elog /usr/bin/elogd -c /etc/elog/elogd.cfg
diff --git a/srcpkgs/elogind/files/elogind/run b/srcpkgs/elogind/files/elogind/run
index e3564a0c745d..74c4c681df78 100644
--- a/srcpkgs/elogind/files/elogind/run
+++ b/srcpkgs/elogind/files/elogind/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# elogind doesn't work right if it starts before dbus
sv check dbus >/dev/null || exit 1
exec /usr/libexec/elogind/elogind.wrapper
diff --git a/srcpkgs/etcd/files/etcd/run b/srcpkgs/etcd/files/etcd/run
index 4d3f36562993..e525d638c054 100644
--- a/srcpkgs/etcd/files/etcd/run
+++ b/srcpkgs/etcd/files/etcd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export ETCD_DATA_DIR=/var/lib/etcd
export ETCD_NAME=etcd
diff --git a/srcpkgs/eudev/files/udevd/run b/srcpkgs/eudev/files/udevd/run
index 1196b0bd3eb1..b6af85ec341d 100755
--- a/srcpkgs/eudev/files/udevd/run
+++ b/srcpkgs/eudev/files/udevd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
udevadm control --exit
exec udevd
diff --git a/srcpkgs/fah/files/FAHClient/run b/srcpkgs/fah/files/FAHClient/run
index 08af6c9e12e1..98fc57d26a98 100755
--- a/srcpkgs/fah/files/FAHClient/run
+++ b/srcpkgs/fah/files/FAHClient/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
OPTS=--run-as=_fah
set -e
[ -r config ] && . config
diff --git a/srcpkgs/fail2ban/files/fail2ban/run b/srcpkgs/fail2ban/files/fail2ban/run
index c8e9a5b60f6d..c8cefb6a825d 100755
--- a/srcpkgs/fail2ban/files/fail2ban/run
+++ b/srcpkgs/fail2ban/files/fail2ban/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/fail2ban
exec fail2ban-server -f
diff --git a/srcpkgs/fake-hwclock/files/fake-hwclock/run b/srcpkgs/fake-hwclock/files/fake-hwclock/run
index e5f8c5a70c89..f2a6241a5da5 100755
--- a/srcpkgs/fake-hwclock/files/fake-hwclock/run
+++ b/srcpkgs/fake-hwclock/files/fake-hwclock/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
[ -r /etc/default/fake-hwclock ] && . /etc/default/fake-hwclock
fake-hwclock load $FORCE || exit 1
diff --git a/srcpkgs/fastd/files/fastd/run b/srcpkgs/fastd/files/fastd/run
index 86cda0bf1595..4d1bad07ae0a 100755
--- a/srcpkgs/fastd/files/fastd/run
+++ b/srcpkgs/fastd/files/fastd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fastd --config /etc/fastd/fastd.conf
diff --git a/srcpkgs/fcron/files/fcron/run b/srcpkgs/fcron/files/fcron/run
index a3b4afbc6d64..e0f0f9631021 100755
--- a/srcpkgs/fcron/files/fcron/run
+++ b/srcpkgs/fcron/files/fcron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fcron -f
diff --git a/srcpkgs/fiche/files/fiche/run b/srcpkgs/fiche/files/fiche/run
index 510687b56614..46873ebf7afd 100644
--- a/srcpkgs/fiche/files/fiche/run
+++ b/srcpkgs/fiche/files/fiche/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _fiche:_fiche fiche -d yourdomain.com -o /var/tmp/fiche -l /var/log/fiche/log
diff --git a/srcpkgs/firehol/files/firehol/run b/srcpkgs/firehol/files/firehol/run
index 44aa326c1c28..78c2996b16be 100644
--- a/srcpkgs/firehol/files/firehol/run
+++ b/srcpkgs/firehol/files/firehol/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/firehol/firehol.conf ] && exit 0
firehol start || exit 1
exec chpst -b firehol pause
diff --git a/srcpkgs/flannel/files/flannel/run b/srcpkgs/flannel/files/flannel/run
index 953f7459bbfd..7bc961915dd5 100644
--- a/srcpkgs/flannel/files/flannel/run
+++ b/srcpkgs/flannel/files/flannel/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check etcd >/dev/null || exit 1
exec flannel
diff --git a/srcpkgs/freeipmi/files/bmc-watchdog/run b/srcpkgs/freeipmi/files/bmc-watchdog/run
index 2747898f9457..ceab6fb7a269 100644
--- a/srcpkgs/freeipmi/files/bmc-watchdog/run
+++ b/srcpkgs/freeipmi/files/bmc-watchdog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/freeipmi/files/ipmidetectd/run b/srcpkgs/freeipmi/files/ipmidetectd/run
index 1e283cce88b9..d74d97c8d1eb 100644
--- a/srcpkgs/freeipmi/files/ipmidetectd/run
+++ b/srcpkgs/freeipmi/files/ipmidetectd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec ipmidetectd -d
diff --git a/srcpkgs/freeipmi/files/ipmiseld/run b/srcpkgs/freeipmi/files/ipmiseld/run
index 818d1bcb3e46..281a5f2d89c7 100644
--- a/srcpkgs/freeipmi/files/ipmiseld/run
+++ b/srcpkgs/freeipmi/files/ipmiseld/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ipmiseld --foreground
diff --git a/srcpkgs/frp/files/frpc/run b/srcpkgs/frp/files/frpc/run
index c095fe5260c0..eef6a5bbc1bd 100644
--- a/srcpkgs/frp/files/frpc/run
+++ b/srcpkgs/frp/files/frpc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/frpc -c /etc/frp/frpc.ini
diff --git a/srcpkgs/frp/files/frps/run b/srcpkgs/frp/files/frps/run
index 210f9fc25f77..d43adc966c6c 100644
--- a/srcpkgs/frp/files/frps/run
+++ b/srcpkgs/frp/files/frps/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/frps -c /etc/frp/frps.ini
diff --git a/srcpkgs/frr/files/frr-generic/run b/srcpkgs/frr/files/frr-generic/run
index 1a0d2dfb6cba..0725ba54ab21 100755
--- a/srcpkgs/frr/files/frr-generic/run
+++ b/srcpkgs/frr/files/frr-generic/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
daemon="$(basename "${PWD}")"
diff --git a/srcpkgs/fwknop/files/fwknopd/run b/srcpkgs/fwknop/files/fwknopd/run
index 9d915cb51e04..f96978344dce 100644
--- a/srcpkgs/fwknop/files/fwknopd/run
+++ b/srcpkgs/fwknop/files/fwknopd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fwknopd -f
diff --git a/srcpkgs/gdm/files/gdm/run b/srcpkgs/gdm/files/gdm/run
index a271fbcf070c..af0fbc08a88e 100755
--- a/srcpkgs/gdm/files/gdm/run
+++ b/srcpkgs/gdm/files/gdm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus > /dev/null || exit 1
[ ! -d /run/gdm ] && mkdir -m0711 -p /run/gdm && chown root:gdm /run/gdm
exec gdm
diff --git a/srcpkgs/gemserv/files/gemserv/run b/srcpkgs/gemserv/files/gemserv/run
index 954bc6026268..a7f60bc8d55d 100755
--- a/srcpkgs/gemserv/files/gemserv/run
+++ b/srcpkgs/gemserv/files/gemserv/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _gemserv gemserv ${CONF:-/etc/gemserv.conf}
diff --git a/srcpkgs/geomyidae/files/geomyidae/run b/srcpkgs/geomyidae/files/geomyidae/run
index c03e821b16db..f28cc87f0623 100755
--- a/srcpkgs/geomyidae/files/geomyidae/run
+++ b/srcpkgs/geomyidae/files/geomyidae/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
user=_geomyidae
diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index cab802769fe9..0bcd38bddbc6 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -d /var/lib/gerbera/.config ]; then
mkdir -p /var/lib/gerbera/.config/gerbera
diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index 0644a7895266..d16e22ba9d6e 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# USER and HOME are needed because gitea doesn't actually check the user it
# runs as, but instead just grabs the variables from the variables.
diff --git a/srcpkgs/gitlab-runner/files/gitlab-runner/run b/srcpkgs/gitlab-runner/files/gitlab-runner/run
index 5a137b78d9be..0ad8e3441d04 100644
--- a/srcpkgs/gitlab-runner/files/gitlab-runner/run
+++ b/srcpkgs/gitlab-runner/files/gitlab-runner/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec gitlab-runner run
diff --git a/srcpkgs/glibc/files/nscd/run b/srcpkgs/glibc/files/nscd/run
index e9ea04a19e97..53127524af2b 100755
--- a/srcpkgs/glibc/files/nscd/run
+++ b/srcpkgs/glibc/files/nscd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /var/run/nscd /var/db/nscd
exec nscd -F ${OPTS} >/dev/null
diff --git a/srcpkgs/glider/files/glider/run b/srcpkgs/glider/files/glider/run
index 807b7568362e..92802a87e5cd 100644
--- a/srcpkgs/glider/files/glider/run
+++ b/srcpkgs/glider/files/glider/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u nobody:nogroup glider -config /etc/glider/config
diff --git a/srcpkgs/glusterfs/files/glusterd/run b/srcpkgs/glusterfs/files/glusterd/run
index 7f0e6820e66f..41463c3f49af 100644
--- a/srcpkgs/glusterfs/files/glusterd/run
+++ b/srcpkgs/glusterfs/files/glusterd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec glusterd -N 2>&1
diff --git a/srcpkgs/glusterfs/files/glusterfsd/run b/srcpkgs/glusterfs/files/glusterfsd/run
index 15dd0bed4462..944b6ba04bf4 100644
--- a/srcpkgs/glusterfs/files/glusterfsd/run
+++ b/srcpkgs/glusterfs/files/glusterfsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec glusterfsd -N 2>&1
diff --git a/srcpkgs/gnunet/files/gnunet/run b/srcpkgs/gnunet/files/gnunet/run
index 4adb83a4d027..85671e61debf 100644
--- a/srcpkgs/gnunet/files/gnunet/run
+++ b/srcpkgs/gnunet/files/gnunet/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet/gnunet.conf
diff --git a/srcpkgs/go-ipfs/files/ipfs/run b/srcpkgs/go-ipfs/files/ipfs/run
index 29690e65659a..f93d0fade078 100755
--- a/srcpkgs/go-ipfs/files/ipfs/run
+++ b/srcpkgs/go-ipfs/files/ipfs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
export IPFS_PATH=${IPFS_PATH:=/var/lib/ipfs}
exec chpst -u _ipfs ipfs daemon ${OPTS:=--init --enable-gc --migrate} 2>&1
diff --git a/srcpkgs/goatcounter/files/goatcounter/run b/srcpkgs/goatcounter/files/goatcounter/run
index e52e6387f0a5..61bf906780cf 100755
--- a/srcpkgs/goatcounter/files/goatcounter/run
+++ b/srcpkgs/goatcounter/files/goatcounter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/gogs/files/gogs/run b/srcpkgs/gogs/files/gogs/run
index 361e12f0f75c..90aa26207388 100644
--- a/srcpkgs/gogs/files/gogs/run
+++ b/srcpkgs/gogs/files/gogs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export USER=gogs
export HOME=/srv/gogs
exec chpst -u gogs:gogs -P gogs web --config /etc/gogs.ini 2>&1
diff --git a/srcpkgs/gpm/files/gpm/run b/srcpkgs/gpm/files/gpm/run
index 1d1a3e77d9f2..6883c7c43de4 100755
--- a/srcpkgs/gpm/files/gpm/run
+++ b/srcpkgs/gpm/files/gpm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
exec gpm -D -m /dev/input/mice -t imps2
diff --git a/srcpkgs/gpsd/files/gpsd/run b/srcpkgs/gpsd/files/gpsd/run
index 43ad7c8f93f2..8c8d973044ef 100644
--- a/srcpkgs/gpsd/files/gpsd/run
+++ b/srcpkgs/gpsd/files/gpsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec /usr/bin/gpsd -N -F /run/gpsd.sock $OPTS ${DEV:=/dev/gps0}
diff --git a/srcpkgs/grafana/files/grafana/run b/srcpkgs/grafana/files/grafana/run
index 3a78eec79a79..f1d961e83f48 100755
--- a/srcpkgs/grafana/files/grafana/run
+++ b/srcpkgs/grafana/files/grafana/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _grafana:_grafana grafana-server -homepath /usr/share/grafana/ -config /etc/grafana/grafana.ini 2>&1
diff --git a/srcpkgs/h2o/files/h2o/run b/srcpkgs/h2o/files/h2o/run
index 57e623ede217..2e1e931f1701 100644
--- a/srcpkgs/h2o/files/h2o/run
+++ b/srcpkgs/h2o/files/h2o/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec h2o -c /etc/h2o.conf
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..822c75dba8db 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haveged/files/haveged/run b/srcpkgs/haveged/files/haveged/run
index 30abcbdc0d26..2c09586db33f 100644
--- a/srcpkgs/haveged/files/haveged/run
+++ b/srcpkgs/haveged/files/haveged/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
exec haveged -w 1024 -v 1 -F
diff --git a/srcpkgs/hddtemp/files/hddtemp/run b/srcpkgs/hddtemp/files/hddtemp/run
index fbed7ddb0bc7..790768cf33e1 100755
--- a/srcpkgs/hddtemp/files/hddtemp/run
+++ b/srcpkgs/hddtemp/files/hddtemp/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec hddtemp -dF ${OPTS:=/dev/sda}
diff --git a/srcpkgs/hiawatha/files/hiawatha/run b/srcpkgs/hiawatha/files/hiawatha/run
index eb962fb992ce..2865ab6f7c51 100755
--- a/srcpkgs/hiawatha/files/hiawatha/run
+++ b/srcpkgs/hiawatha/files/hiawatha/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hiawatha -d
diff --git a/srcpkgs/hitch/files/hitch/run b/srcpkgs/hitch/files/hitch/run
index bd09afdb4261..9e665f41f65e 100755
--- a/srcpkgs/hitch/files/hitch/run
+++ b/srcpkgs/hitch/files/hitch/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hitch -u _hitch --config=/etc/hitch.conf
diff --git a/srcpkgs/hostapd/files/hostapd/run b/srcpkgs/hostapd/files/hostapd/run
index 0d17269e5d5e..39628755b420 100644
--- a/srcpkgs/hostapd/files/hostapd/run
+++ b/srcpkgs/hostapd/files/hostapd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hostapd -s /etc/hostapd/hostapd.conf 2>&1
diff --git a/srcpkgs/i2pd/files/i2pd/run b/srcpkgs/i2pd/files/i2pd/run
index 2395b784eed4..a68c888a478b 100644
--- a/srcpkgs/i2pd/files/i2pd/run
+++ b/srcpkgs/i2pd/files/i2pd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-16384}
exec chpst -u _i2pd:_i2pd i2pd --service \
diff --git a/srcpkgs/i8kutils/files/i8kmon/run b/srcpkgs/i8kutils/files/i8kmon/run
index 4e0179182e77..569ebcc4a3be 100644
--- a/srcpkgs/i8kutils/files/i8kmon/run
+++ b/srcpkgs/i8kutils/files/i8kmon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -r ./conf ]; then
. ./conf
diff --git a/srcpkgs/icinga2/files/icinga2/run b/srcpkgs/icinga2/files/icinga2/run
index 456a8b246e41..d70f08eeaa99 100644
--- a/srcpkgs/icinga2/files/icinga2/run
+++ b/srcpkgs/icinga2/files/icinga2/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -oicinga -gicinga -d /run/icinga2
exec icinga2 daemon 2>&1
diff --git a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
index 5d3c8e9747ca..2744a2279c38 100755
--- a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
+++ b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/iio-sensor-proxy
diff --git a/srcpkgs/inadyn/files/inadyn/run b/srcpkgs/inadyn/files/inadyn/run
index 072f7fc1db52..d01febe7e8d6 100644
--- a/srcpkgs/inadyn/files/inadyn/run
+++ b/srcpkgs/inadyn/files/inadyn/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ ! -d /run/inadyn ] &&
mkdir -p /run/inadyn &&
diff --git a/srcpkgs/incron/files/incron/run b/srcpkgs/incron/files/incron/run
index 95fa0cfd9e3f..34c3272335a4 100644
--- a/srcpkgs/incron/files/incron/run
+++ b/srcpkgs/incron/files/incron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec incrond -n
diff --git a/srcpkgs/influxdb/files/influxdb/run b/srcpkgs/influxdb/files/influxdb/run
index dbb25cd03489..21a5285de281 100755
--- a/srcpkgs/influxdb/files/influxdb/run
+++ b/srcpkgs/influxdb/files/influxdb/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _influxdb:_influxdb influxd -config /etc/influxdb/influxdb.conf 2>&1
diff --git a/srcpkgs/inspircd/files/inspircd/run b/srcpkgs/inspircd/files/inspircd/run
index a9b6b365f977..a58657811577 100644
--- a/srcpkgs/inspircd/files/inspircd/run
+++ b/srcpkgs/inspircd/files/inspircd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u inspircd inspircd \
--nofork --config /etc/inspircd/inspircd.conf
diff --git a/srcpkgs/iptables/files/ip6tables/run b/srcpkgs/iptables/files/ip6tables/run
index 10e559afe91d..f62abbbb5415 100644
--- a/srcpkgs/iptables/files/ip6tables/run
+++ b/srcpkgs/iptables/files/ip6tables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/iptables/ip6tables.rules ] && exit 0
ip6tables-restore -w 3 /etc/iptables/ip6tables.rules || exit 1
exec chpst -b ip6tables pause
diff --git a/srcpkgs/iptables/files/iptables/run b/srcpkgs/iptables/files/iptables/run
index 74a2ab20d63c..346d7c332a1f 100644
--- a/srcpkgs/iptables/files/iptables/run
+++ b/srcpkgs/iptables/files/iptables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/iptables/iptables.rules ] && exit 0
iptables-restore -w 3 /etc/iptables/iptables.rules || exit 1
exec chpst -b iptables pause
diff --git a/srcpkgs/ipvsadm/files/ipvsadm/run b/srcpkgs/ipvsadm/files/ipvsadm/run
index 6bf7e37a3984..e4b60d5281f4 100644
--- a/srcpkgs/ipvsadm/files/ipvsadm/run
+++ b/srcpkgs/ipvsadm/files/ipvsadm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
: ${CONF_FILE:=/etc/ipvsadm.conf}
[ -r conf ] && . ./conf
[ -s $CONF_FILE ] || exit 0
diff --git a/srcpkgs/irqbalance/files/irqbalance/run b/srcpkgs/irqbalance/files/irqbalance/run
index 8c96e180cc71..cb32dd2597ad 100755
--- a/srcpkgs/irqbalance/files/irqbalance/run
+++ b/srcpkgs/irqbalance/files/irqbalance/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m0755 /run/irqbalance
exec irqbalance -f $OPTS
diff --git a/srcpkgs/iwd/files/ead/run b/srcpkgs/iwd/files/ead/run
index be32e2dbfa37..398550cf7d13 100644
--- a/srcpkgs/iwd/files/ead/run
+++ b/srcpkgs/iwd/files/ead/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . conf
exec /usr/libexec/ead ${OPTS} 2>&1
diff --git a/srcpkgs/iwd/files/iwd/run b/srcpkgs/iwd/files/iwd/run
index f42e3cfc4ffa..7b751e0a5a8c 100755
--- a/srcpkgs/iwd/files/iwd/run
+++ b/srcpkgs/iwd/files/iwd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/libexec/iwd ${OPTS} 2>&1
diff --git a/srcpkgs/jenkins/files/jenkins/run b/srcpkgs/jenkins/files/jenkins/run
index 05d8a79c68db..a17ef44df7f0 100755
--- a/srcpkgs/jenkins/files/jenkins/run
+++ b/srcpkgs/jenkins/files/jenkins/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/profile
[ -r conf ] && . ./conf
diff --git a/srcpkgs/kapacitor/files/kapacitor/run b/srcpkgs/kapacitor/files/kapacitor/run
index bf01be588bae..98965928a848 100644
--- a/srcpkgs/kapacitor/files/kapacitor/run
+++ b/srcpkgs/kapacitor/files/kapacitor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _kapacitor:_kapacitor kapacitord --config /etc/kapacitor/kapacitor.conf 2>&1
diff --git a/srcpkgs/kea/files/kea-dhcp-ddns/run b/srcpkgs/kea/files/kea-dhcp-ddns/run
index dc6ecbb017fe..5676ff1bfaec 100644
--- a/srcpkgs/kea/files/kea-dhcp-ddns/run
+++ b/srcpkgs/kea/files/kea-dhcp-ddns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /run/kea
exec kea-dhcp-ddns ${OPTS:=-c /etc/kea/kea.conf}
diff --git a/srcpkgs/kea/files/kea-dhcp4/run b/srcpkgs/kea/files/kea-dhcp4/run
index 1f99ae418bd9..faac2be967d6 100644
--- a/srcpkgs/kea/files/kea-dhcp4/run
+++ b/srcpkgs/kea/files/kea-dhcp4/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet address show "$WAIT_IFACE")" ] && exit 1
mkdir -p /run/kea
diff --git a/srcpkgs/kea/files/kea-dhcp6/run b/srcpkgs/kea/files/kea-dhcp6/run
index 00d0eeff8010..f3977e3cc86a 100644
--- a/srcpkgs/kea/files/kea-dhcp6/run
+++ b/srcpkgs/kea/files/kea-dhcp6/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet6 address show "$WAIT_IFACE")" ] && exit 1
mkdir -p /run/kea
diff --git a/srcpkgs/keepalived/files/keepalived/run b/srcpkgs/keepalived/files/keepalived/run
index bec8c0de5ee1..e542d2d20dca 100644
--- a/srcpkgs/keepalived/files/keepalived/run
+++ b/srcpkgs/keepalived/files/keepalived/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec keepalived --dont-fork
diff --git a/srcpkgs/keyd/files/keyd/run b/srcpkgs/keyd/files/keyd/run
index 5e62cef91c72..471e3f59b872 100644
--- a/srcpkgs/keyd/files/keyd/run
+++ b/srcpkgs/keyd/files/keyd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Sometimes when starting the keyd service, the keyboard can become unresponsive.
# This is the result of keyd starting when the early udevd process is still running but
diff --git a/srcpkgs/knot-resolver/files/kresd/run b/srcpkgs/knot-resolver/files/kresd/run
index 2342892a135f..43b80cda27f2 100644
--- a/srcpkgs/knot-resolver/files/kresd/run
+++ b/srcpkgs/knot-resolver/files/kresd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _knot_resolver -g _knot_resolver /run/knot-resolver
exec kresd ${OPTS:--f 1}
diff --git a/srcpkgs/knot/files/knotd/run b/srcpkgs/knot/files/knotd/run
index 85301ab0461d..ee822deb055d 100644
--- a/srcpkgs/knot/files/knotd/run
+++ b/srcpkgs/knot/files/knotd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _knot -g _knot /run/knot
exec knotd ${OPTS}
diff --git a/srcpkgs/kubernetes/files/kube-apiserver/run b/srcpkgs/kubernetes/files/kube-apiserver/run
index 159804b95a5b..a5106159a375 100644
--- a/srcpkgs/kubernetes/files/kube-apiserver/run
+++ b/srcpkgs/kubernetes/files/kube-apiserver/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/apiserver ] && . /etc/kubernetes/apiserver
exec chpst -u kube:kube kube-apiserver \
diff --git a/srcpkgs/kubernetes/files/kube-controller-manager/run b/srcpkgs/kubernetes/files/kube-controller-manager/run
index 5d298168109d..272df9c5495c 100644
--- a/srcpkgs/kubernetes/files/kube-controller-manager/run
+++ b/srcpkgs/kubernetes/files/kube-controller-manager/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/controller-manager ] && . /etc/kubernetes/controller-manager
exec chpst -u kube:kube kube-controller-manager \
diff --git a/srcpkgs/kubernetes/files/kube-proxy/run b/srcpkgs/kubernetes/files/kube-proxy/run
index 58f4865ccbe7..85f5ceac0fba 100644
--- a/srcpkgs/kubernetes/files/kube-proxy/run
+++ b/srcpkgs/kubernetes/files/kube-proxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/proxy ] && . /etc/kubernetes/proxy
exec kube-proxy \
diff --git a/srcpkgs/kubernetes/files/kube-scheduler/run b/srcpkgs/kubernetes/files/kube-scheduler/run
index 8e0a83a7613e..57925b60bcaa 100644
--- a/srcpkgs/kubernetes/files/kube-scheduler/run
+++ b/srcpkgs/kubernetes/files/kube-scheduler/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/scheduler ] && . /etc/kubernetes/scheduler
exec chpst -u kube:kube kube-scheduler \
diff --git a/srcpkgs/kubernetes/files/kubelet/run b/srcpkgs/kubernetes/files/kubelet/run
index 4b623e966e5c..0bea9b4d28f6 100644
--- a/srcpkgs/kubernetes/files/kubelet/run
+++ b/srcpkgs/kubernetes/files/kubelet/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/kubelet ] && . /etc/kubernetes/kubelet
exec kubelet $OPTS 2>/dev/null
diff --git a/srcpkgs/laptop-mode/files/laptop-mode/run b/srcpkgs/laptop-mode/files/laptop-mode/run
index 8d8e154ec876..ad3d976d14f7 100644
--- a/srcpkgs/laptop-mode/files/laptop-mode/run
+++ b/srcpkgs/laptop-mode/files/laptop-mode/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
laptop_mode init auto
exec chpst -b laptop-mode pause
diff --git a/srcpkgs/ldm/files/ldm/run b/srcpkgs/ldm/files/ldm/run
index bf242b7e00b5..e139a58df257 100644
--- a/srcpkgs/ldm/files/ldm/run
+++ b/srcpkgs/ldm/files/ldm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -s conf ] && . ./conf
exec ldm ${OPTS:=-u nobody}
diff --git a/srcpkgs/libcgroup/files/cgred/run b/srcpkgs/libcgroup/files/cgred/run
index 7b621d762c61..eb3a298bf855 100755
--- a/srcpkgs/libcgroup/files/cgred/run
+++ b/srcpkgs/libcgroup/files/cgred/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Default logs to syslog with facility DAEMON
# man cgrulesengd for options list and descriptions.
[ -r conf ] && . ./conf
diff --git a/srcpkgs/libratbag/files/ratbagd/run b/srcpkgs/libratbag/files/ratbagd/run
index 1fbf9c8e5a7d..b5ae8240f029 100755
--- a/srcpkgs/libratbag/files/ratbagd/run
+++ b/srcpkgs/libratbag/files/ratbagd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec ratbagd
diff --git a/srcpkgs/libvirt/files/libvirt-generic/run b/srcpkgs/libvirt/files/libvirt-generic/run
index 93b8a31ae81e..9d172da0a423 100644
--- a/srcpkgs/libvirt/files/libvirt-generic/run
+++ b/srcpkgs/libvirt/files/libvirt-generic/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
diff --git a/srcpkgs/lightdm/files/lightdm/run b/srcpkgs/lightdm/files/lightdm/run
index cabe9dd5b87d..f376f39f00a4 100755
--- a/srcpkgs/lightdm/files/lightdm/run
+++ b/srcpkgs/lightdm/files/lightdm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
install -d -m0711 -olightdm -glightdm /run/lightdm
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/lighttpd/files/lighttpd/run b/srcpkgs/lighttpd/files/lighttpd/run
index b1d0bb000f7f..59fbe4c0def2 100644
--- a/srcpkgs/lighttpd/files/lighttpd/run
+++ b/srcpkgs/lighttpd/files/lighttpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
diff --git a/srcpkgs/linux-tools/files/freefall/run b/srcpkgs/linux-tools/files/freefall/run
index 51a9f293b473..9aee7a51a7d3 100644
--- a/srcpkgs/linux-tools/files/freefall/run
+++ b/srcpkgs/linux-tools/files/freefall/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec freefall ${OPTS:=/dev/sda}
diff --git a/srcpkgs/linux-tools/files/usbipd/run b/srcpkgs/linux-tools/files/usbipd/run
index 9deca9bdfae8..4da64ab288e7 100755
--- a/srcpkgs/linux-tools/files/usbipd/run
+++ b/srcpkgs/linux-tools/files/usbipd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe -q usbip-host || exit 1
modprobe -q vhci-hcd || exit 1
exec usbipd
diff --git a/srcpkgs/lldpd/files/lldpd/run b/srcpkgs/lldpd/files/lldpd/run
index 79ec74814eaf..f10c7ddd50b1 100755
--- a/srcpkgs/lldpd/files/lldpd/run
+++ b/srcpkgs/lldpd/files/lldpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec lldpd ${OPTS:- -d} 2>&1
diff --git a/srcpkgs/lm_sensors/files/fancontrol/run b/srcpkgs/lm_sensors/files/fancontrol/run
index f04fce8d648f..0025d9784a5d 100644
--- a/srcpkgs/lm_sensors/files/fancontrol/run
+++ b/srcpkgs/lm_sensors/files/fancontrol/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . conf
[ ! -r ${CONF_FILE:-/etc/fancontrol} ] && exit 1
exec /usr/bin/fancontrol ${CONF_FILE:-/etc/fancontrol}
diff --git a/srcpkgs/lsyncd/files/lsyncd/run b/srcpkgs/lsyncd/files/lsyncd/run
index c6baeb891c2f..6a8a5ec808de 100644
--- a/srcpkgs/lsyncd/files/lsyncd/run
+++ b/srcpkgs/lsyncd/files/lsyncd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec lsyncd -nodaemon "${CONF_FILE:-/etc/lsyncd/lsyncd.conf.lua}"
diff --git a/srcpkgs/lvm2/files/dmeventd/run b/srcpkgs/lvm2/files/dmeventd/run
index 09ceb7fd8f3c..b6dc448dd990 100644
--- a/srcpkgs/lvm2/files/dmeventd/run
+++ b/srcpkgs/lvm2/files/dmeventd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec dmeventd -f
diff --git a/srcpkgs/lvm2/files/lvmetad/run b/srcpkgs/lvm2/files/lvmetad/run
index f85b5cf6f9c6..c203a0ed9a77 100644
--- a/srcpkgs/lvm2/files/lvmetad/run
+++ b/srcpkgs/lvm2/files/lvmetad/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lvmetad -f
diff --git a/srcpkgs/lxc/files/lxc-autostart/run b/srcpkgs/lxc/files/lxc-autostart/run
index 5e93d5ef35d2..5dd11d01c225 100755
--- a/srcpkgs/lxc/files/lxc-autostart/run
+++ b/srcpkgs/lxc/files/lxc-autostart/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
lxc-autostart || exit 1
exec chpst -b lxc-autostart pause
diff --git a/srcpkgs/lxcfs/files/lxcfs/run b/srcpkgs/lxcfs/files/lxcfs/run
index 2e751d7e9810..7ff382798f93 100755
--- a/srcpkgs/lxcfs/files/lxcfs/run
+++ b/srcpkgs/lxcfs/files/lxcfs/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lxcfs -f /var/lib/lxcfs
diff --git a/srcpkgs/lxd-lts/files/lxd/run b/srcpkgs/lxd-lts/files/lxd/run
index a32a24389378..4a9ea61ba9a6 100755
--- a/srcpkgs/lxd-lts/files/lxd/run
+++ b/srcpkgs/lxd-lts/files/lxd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
_systemd_cgrp="/sys/fs/cgroup/systemd"
if [ ! -d ${_systemd_cgrp} ]; then
mkdir ${_systemd_cgrp}
diff --git a/srcpkgs/lxd/files/lxd/run b/srcpkgs/lxd/files/lxd/run
index a32a24389378..4a9ea61ba9a6 100644
--- a/srcpkgs/lxd/files/lxd/run
+++ b/srcpkgs/lxd/files/lxd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
_systemd_cgrp="/sys/fs/cgroup/systemd"
if [ ! -d ${_systemd_cgrp} ]; then
mkdir ${_systemd_cgrp}
diff --git a/srcpkgs/lxdm/files/lxdm/run b/srcpkgs/lxdm/files/lxdm/run
index f25827cf42a0..55b6a191149d 100755
--- a/srcpkgs/lxdm/files/lxdm/run
+++ b/srcpkgs/lxdm/files/lxdm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lxdm
diff --git a/srcpkgs/mDNSResponder/files/dnsextd/run b/srcpkgs/mDNSResponder/files/dnsextd/run
index 640e11c76f9c..bf3f8ec1c79c 100644
--- a/srcpkgs/mDNSResponder/files/dnsextd/run
+++ b/srcpkgs/mDNSResponder/files/dnsextd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec dnsextd -d
diff --git a/srcpkgs/mDNSResponder/files/mdnsd/run b/srcpkgs/mDNSResponder/files/mdnsd/run
index 2eb4d89f2583..58b59acf898a 100644
--- a/srcpkgs/mDNSResponder/files/mdnsd/run
+++ b/srcpkgs/mDNSResponder/files/mdnsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mdnsd -debug
diff --git a/srcpkgs/mariadb/files/mysqld/run b/srcpkgs/mariadb/files/mysqld/run
index bc16a07883ed..6368eb526c5a 100755
--- a/srcpkgs/mariadb/files/mysqld/run
+++ b/srcpkgs/mariadb/files/mysqld/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/mysqld ] && mkdir -p /run/mysqld
chown mysql:mysql /run/mysqld
exec chpst -u mysql:mysql mysqld --user=mysql 2>&1
diff --git a/srcpkgs/mcelog/files/mcelog/run b/srcpkgs/mcelog/files/mcelog/run
index 18691c742c01..f0842d518919 100755
--- a/srcpkgs/mcelog/files/mcelog/run
+++ b/srcpkgs/mcelog/files/mcelog/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mcelog --daemon --foreground --syslog
diff --git a/srcpkgs/mdadm/files/mdadm/run b/srcpkgs/mdadm/files/mdadm/run
index b9684b26a831..38670a644ae3 100755
--- a/srcpkgs/mdadm/files/mdadm/run
+++ b/srcpkgs/mdadm/files/mdadm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
# --syslog makes it run in every case, yet forwards to mail address if given.
exec mdadm --monitor --scan --syslog
diff --git a/srcpkgs/metalog/files/metalog/run b/srcpkgs/metalog/files/metalog/run
index 0f801d171017..5b7ff14eba60 100755
--- a/srcpkgs/metalog/files/metalog/run
+++ b/srcpkgs/metalog/files/metalog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
[ -r conf ] && . ./conf
exec metalog ${OPTS=-v}
diff --git a/srcpkgs/minidlna/files/minidlnad/run b/srcpkgs/minidlna/files/minidlnad/run
index f38a72eb355f..406865afa577 100644
--- a/srcpkgs/minidlna/files/minidlnad/run
+++ b/srcpkgs/minidlna/files/minidlnad/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec minidlnad -S ${OPTS} 2>&1
diff --git a/srcpkgs/minio/files/minio/run b/srcpkgs/minio/files/minio/run
index ecea96356c9a..dfbae379b4a4 100755
--- a/srcpkgs/minio/files/minio/run
+++ b/srcpkgs/minio/files/minio/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/default/minio
: ${MINIO_VOLUMES:="/var/lib/minio/data/"}
exec chpst -u _minio:_minio minio -C /etc/minio/ server "$MINIO_VOLUMES"
diff --git a/srcpkgs/mit-krb5/files/kadmind/run b/srcpkgs/mit-krb5/files/kadmind/run
index 55ccb49c9141..0fa119dc9ab0 100755
--- a/srcpkgs/mit-krb5/files/kadmind/run
+++ b/srcpkgs/mit-krb5/files/kadmind/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec kadmind -nofork
diff --git a/srcpkgs/mit-krb5/files/krb5kdc/run b/srcpkgs/mit-krb5/files/krb5kdc/run
index f4d7314003a7..847e73e79503 100755
--- a/srcpkgs/mit-krb5/files/krb5kdc/run
+++ b/srcpkgs/mit-krb5/files/krb5kdc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec krb5kdc -n
diff --git a/srcpkgs/moby/files/docker/run b/srcpkgs/moby/files/docker/run
index ed42f5fa72f8..959c22b803c5 100644
--- a/srcpkgs/moby/files/docker/run
+++ b/srcpkgs/moby/files/docker/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
modprobe -q loop || exit 1
mountpoint -q /sys/fs/cgroup/systemd || {
diff --git a/srcpkgs/monero/files/monerod/run b/srcpkgs/monero/files/monerod/run
index bc06010c7c2e..f485e63659fa 100644
--- a/srcpkgs/monero/files/monerod/run
+++ b/srcpkgs/monero/files/monerod/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u monero:monero /usr/bin/monerod --non-interactive --config-file /etc/monerod.conf
diff --git a/srcpkgs/monit/files/monit/run b/srcpkgs/monit/files/monit/run
index f80af51c5397..13a36afab271 100644
--- a/srcpkgs/monit/files/monit/run
+++ b/srcpkgs/monit/files/monit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -f /etc/monit/monitrc ]; then
CONF="-c /etc/monit/monitrc"
fi
diff --git a/srcpkgs/monkey/files/monkey/run b/srcpkgs/monkey/files/monkey/run
index 95dad012d94d..15a45ba93f31 100644
--- a/srcpkgs/monkey/files/monkey/run
+++ b/srcpkgs/monkey/files/monkey/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec monkey
diff --git a/srcpkgs/moosefs/files/mfschunkserver/run b/srcpkgs/moosefs/files/mfschunkserver/run
index 3e02c6e9e60e..316c8507de62 100644
--- a/srcpkgs/moosefs/files/mfschunkserver/run
+++ b/srcpkgs/moosefs/files/mfschunkserver/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfschunkserver.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/moosefs/files/mfsmaster/run b/srcpkgs/moosefs/files/mfsmaster/run
index 083632c8a883..72389baab5fd 100644
--- a/srcpkgs/moosefs/files/mfsmaster/run
+++ b/srcpkgs/moosefs/files/mfsmaster/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfsmaster.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/moosefs/files/mfsmetalogger/run b/srcpkgs/moosefs/files/mfsmetalogger/run
index bdd9fdf432a9..2797217ea172 100644
--- a/srcpkgs/moosefs/files/mfsmetalogger/run
+++ b/srcpkgs/moosefs/files/mfsmetalogger/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfsmetalogger.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/mopidy/files/mopidy/run b/srcpkgs/mopidy/files/mopidy/run
index 558c2d7a4e67..68c0263086e2 100755
--- a/srcpkgs/mopidy/files/mopidy/run
+++ b/srcpkgs/mopidy/files/mopidy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec chpst -u mopidy:audio \
mopidy --config /etc/mopidy/mopidy.conf \
>/dev/null 2>&1
diff --git a/srcpkgs/mosquitto/files/mosquitto/run b/srcpkgs/mosquitto/files/mosquitto/run
index a33891408325..3a8ac97289a7 100644
--- a/srcpkgs/mosquitto/files/mosquitto/run
+++ b/srcpkgs/mosquitto/files/mosquitto/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
cd /var/lib/mosquitto
exec chpst -u _mosquitto:_mosquitto mosquitto -c /etc/mosquitto/mosquitto.conf
diff --git a/srcpkgs/mouseemu/files/mouseemu/run b/srcpkgs/mouseemu/files/mouseemu/run
index 1ce7c17df5ea..c35e3dafba57 100644
--- a/srcpkgs/mouseemu/files/mouseemu/run
+++ b/srcpkgs/mouseemu/files/mouseemu/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec mouseemu -nofork $MID_CLICK $RIGHT_CLICK $SCROLL $TYPING_BLOCK
diff --git a/srcpkgs/mpDris2/files/mpDris2/run b/srcpkgs/mpDris2/files/mpDris2/run
index a3cbb12868b9..2e2b4fef37d7 100644
--- a/srcpkgs/mpDris2/files/mpDris2/run
+++ b/srcpkgs/mpDris2/files/mpDris2/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mpDris2
\ No newline at end of file
diff --git a/srcpkgs/mpd/files/mpd/run b/srcpkgs/mpd/files/mpd/run
index bb7832c9e235..bc002d4f8507 100755
--- a/srcpkgs/mpd/files/mpd/run
+++ b/srcpkgs/mpd/files/mpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m 0755 -o mpd -g mpd /run/mpd
exec mpd --no-daemon ${OPTS:-}
diff --git a/srcpkgs/mpdscribble/files/mpdscribble/run b/srcpkgs/mpdscribble/files/mpdscribble/run
index 7a4243113078..29cceefca2bb 100755
--- a/srcpkgs/mpdscribble/files/mpdscribble/run
+++ b/srcpkgs/mpdscribble/files/mpdscribble/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mpdscribble --no-daemon
diff --git a/srcpkgs/munge/files/munge/run b/srcpkgs/munge/files/munge/run
index 9c773ca00578..4626b3ddc2ad 100644
--- a/srcpkgs/munge/files/munge/run
+++ b/srcpkgs/munge/files/munge/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -d /var/run/munge ]; then
mkdir -m0755 -p /var/run/munge
fi
diff --git a/srcpkgs/musl-nscd/files/nscd/run b/srcpkgs/musl-nscd/files/nscd/run
index e9ea04a19e97..53127524af2b 100755
--- a/srcpkgs/musl-nscd/files/nscd/run
+++ b/srcpkgs/musl-nscd/files/nscd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /var/run/nscd /var/db/nscd
exec nscd -F ${OPTS} >/dev/null
diff --git a/srcpkgs/nbd/files/nbd/run b/srcpkgs/nbd/files/nbd/run
index e4179d3e861d..ba721e5ea19b 100644
--- a/srcpkgs/nbd/files/nbd/run
+++ b/srcpkgs/nbd/files/nbd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nbd-server -d 2>&1
diff --git a/srcpkgs/ndhc/files/ndhc/run b/srcpkgs/ndhc/files/ndhc/run
index 93a73882002f..7302ad0b9275 100755
--- a/srcpkgs/ndhc/files/ndhc/run
+++ b/srcpkgs/ndhc/files/ndhc/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec ndhc -R /etc/resolv.conf -u ndhc -U ndhc -D ndhc -C /var/lib/ndhc/jail -s /var/lib/ndhc/state ${OPTS:=-i eth0} 2>&1
diff --git a/srcpkgs/ndppd/files/ndppd/run b/srcpkgs/ndppd/files/ndppd/run
index 6c36352ecd37..2fcc394d3bec 100755
--- a/srcpkgs/ndppd/files/ndppd/run
+++ b/srcpkgs/ndppd/files/ndppd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec ndppd -v
diff --git a/srcpkgs/neard/files/neard/run b/srcpkgs/neard/files/neard/run
index e26e7c0279c1..c1e1562afc2d 100644
--- a/srcpkgs/neard/files/neard/run
+++ b/srcpkgs/neard/files/neard/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
[ -r conf ] && . ./conf
exec /usr/libexec/nfc/neard --nodaemon ${OPTS}
diff --git a/srcpkgs/neard/files/seeld/run b/srcpkgs/neard/files/seeld/run
index 22790b957346..5c6a37eff096 100644
--- a/srcpkgs/neard/files/seeld/run
+++ b/srcpkgs/neard/files/seeld/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
[ -r conf ] && . ./conf
exec /usr/libexec/nfc/seeld --nodaemon ${OPTS}
diff --git a/srcpkgs/net-snmp/files/snmpd/run b/srcpkgs/net-snmp/files/snmpd/run
index bcb7b2004baa..13fafd7f2d89 100755
--- a/srcpkgs/net-snmp/files/snmpd/run
+++ b/srcpkgs/net-snmp/files/snmpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec snmpd -f -Lo $OPTS
diff --git a/srcpkgs/netdata/files/netdata/run b/srcpkgs/netdata/files/netdata/run
index a4c76948b16c..21bf679cf574 100644
--- a/srcpkgs/netdata/files/netdata/run
+++ b/srcpkgs/netdata/files/netdata/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _netdata:_netdata netdata -D
diff --git a/srcpkgs/network-ups-tools/files/upsd/run b/srcpkgs/network-ups-tools/files/upsd/run
index 53d9ba24a605..5a97d7e27c04 100755
--- a/srcpkgs/network-ups-tools/files/upsd/run
+++ b/srcpkgs/network-ups-tools/files/upsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - information server
# upsd will run in the foreground and prints information on stdout
install -d -m 0770 -o nut -g nut /run/ups
diff --git a/srcpkgs/network-ups-tools/files/upsdrvctl/run b/srcpkgs/network-ups-tools/files/upsdrvctl/run
index aab0bcc121fa..343c516e8ffa 100755
--- a/srcpkgs/network-ups-tools/files/upsdrvctl/run
+++ b/srcpkgs/network-ups-tools/files/upsdrvctl/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - driver controller
install -d -m 0770 -o nut -g nut /run/ups
upsdrvctl -D start
diff --git a/srcpkgs/network-ups-tools/files/upsmon/run b/srcpkgs/network-ups-tools/files/upsmon/run
index 714030cae547..b83cc7f335cf 100755
--- a/srcpkgs/network-ups-tools/files/upsmon/run
+++ b/srcpkgs/network-ups-tools/files/upsmon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - monitor and shutdown controller
# upsmon will run in the foreground and prints information on stdout
exec upsmon -D
diff --git a/srcpkgs/nfs-utils/files/nfs-server/run b/srcpkgs/nfs-utils/files/nfs-server/run
index 74ce0477fb75..b7ed2aa45fdf 100755
--- a/srcpkgs/nfs-utils/files/nfs-server/run
+++ b/srcpkgs/nfs-utils/files/nfs-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the statd service is running.
sv check statd >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcblkmapd/run b/srcpkgs/nfs-utils/files/rpcblkmapd/run
index 2acd9074ac80..269e72f9323e 100755
--- a/srcpkgs/nfs-utils/files/rpcblkmapd/run
+++ b/srcpkgs/nfs-utils/files/rpcblkmapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcgssd/run b/srcpkgs/nfs-utils/files/rpcgssd/run
index 439406037c25..1bd5c98a4a35 100755
--- a/srcpkgs/nfs-utils/files/rpcgssd/run
+++ b/srcpkgs/nfs-utils/files/rpcgssd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcidmapd/run b/srcpkgs/nfs-utils/files/rpcidmapd/run
index 5f75973d1439..f683b7a1ffac 100755
--- a/srcpkgs/nfs-utils/files/rpcidmapd/run
+++ b/srcpkgs/nfs-utils/files/rpcidmapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcsvcgssd/run b/srcpkgs/nfs-utils/files/rpcsvcgssd/run
index c751c60d051d..92be0858a7af 100755
--- a/srcpkgs/nfs-utils/files/rpcsvcgssd/run
+++ b/srcpkgs/nfs-utils/files/rpcsvcgssd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/statd/run b/srcpkgs/nfs-utils/files/statd/run
index 66900a3b4d9f..e2abb38aed87 100755
--- a/srcpkgs/nfs-utils/files/statd/run
+++ b/srcpkgs/nfs-utils/files/statd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nftables/files/nftables/run b/srcpkgs/nftables/files/nftables/run
index c8425d3753e3..fd385435a791 100644
--- a/srcpkgs/nftables/files/nftables/run
+++ b/srcpkgs/nftables/files/nftables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -r /etc/nftables.conf ] && exit 0
nft -f /etc/nftables.conf
exec chpst -b nftables pause
diff --git a/srcpkgs/ngetty/files/ngetty/run b/srcpkgs/ngetty/files/ngetty/run
index c68e80737f30..e8fa81e6ff50 100755
--- a/srcpkgs/ngetty/files/ngetty/run
+++ b/srcpkgs/ngetty/files/ngetty/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export TERM=linux
[ -r conf ] && . ./conf
exec ngetty ${OPTS:=tty1 tty2 tty3 tty4 tty5 tty6}
diff --git a/srcpkgs/nginx/files/nginx/run b/srcpkgs/nginx/files/nginx/run
index 05e9182e4f79..60a3d2e30ca9 100755
--- a/srcpkgs/nginx/files/nginx/run
+++ b/srcpkgs/nginx/files/nginx/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nginx -g 'daemon off;'
diff --git a/srcpkgs/ngircd/files/ngircd/run b/srcpkgs/ngircd/files/ngircd/run
index 253a0cdd3e72..19e4b8425294 100755
--- a/srcpkgs/ngircd/files/ngircd/run
+++ b/srcpkgs/ngircd/files/ngircd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ngircd -n
diff --git a/srcpkgs/nix/files/nix-daemon/run b/srcpkgs/nix/files/nix-daemon/run
index 4c277b2113ce..052cf9d45a8d 100644
--- a/srcpkgs/nix/files/nix-daemon/run
+++ b/srcpkgs/nix/files/nix-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nix-daemon
diff --git a/srcpkgs/node_exporter/files/node_exporter/run b/srcpkgs/node_exporter/files/node_exporter/run
index add864b742a2..5e06fc33bbe9 100755
--- a/srcpkgs/node_exporter/files/node_exporter/run
+++ b/srcpkgs/node_exporter/files/node_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments to node_exporter
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/nodm/files/nodm/run b/srcpkgs/nodm/files/nodm/run
index d43bfc7689bd..065c0208dfb7 100644
--- a/srcpkgs/nodm/files/nodm/run
+++ b/srcpkgs/nodm/files/nodm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
export NODM_USER NODM_X_OPTIONS NODM_MIN_SESSION_TIME NODM_XSESSION
exec nodm 1>&2
diff --git a/srcpkgs/noip2/files/noip2/run b/srcpkgs/noip2/files/noip2/run
index 1ae24f2a5686..6f4adc8cbd25 100755
--- a/srcpkgs/noip2/files/noip2/run
+++ b/srcpkgs/noip2/files/noip2/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec noip2 -f
diff --git a/srcpkgs/nrpe/files/nrpe/run b/srcpkgs/nrpe/files/nrpe/run
index 72612cf68aaf..704b91a68631 100644
--- a/srcpkgs/nrpe/files/nrpe/run
+++ b/srcpkgs/nrpe/files/nrpe/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nrpe --no-forking --config=/etc/nagios/nrpe.cfg 2>&1
diff --git a/srcpkgs/nsd/files/nsd/run b/srcpkgs/nsd/files/nsd/run
index a4c8172a7972..abfea3728fd3 100755
--- a/srcpkgs/nsd/files/nsd/run
+++ b/srcpkgs/nsd/files/nsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m 0755 -o nsd -g nsd /run/nsd
exec nsd -d 2>/dev/null
diff --git a/srcpkgs/nss-pam-ldapd/files/nslcd/run b/srcpkgs/nss-pam-ldapd/files/nslcd/run
index f3fdc75a7e0f..c17fecb4e4af 100755
--- a/srcpkgs/nss-pam-ldapd/files/nslcd/run
+++ b/srcpkgs/nss-pam-ldapd/files/nslcd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/nslcd
chown nslcd:nslcd /var/run/nslcd
exec chpst -u nslcd:nslcd nslcd -n
diff --git a/srcpkgs/ntp/files/isc-ntpd/run b/srcpkgs/ntp/files/isc-ntpd/run
index 84db62b851d7..62be4031a8d5 100755
--- a/srcpkgs/ntp/files/isc-ntpd/run
+++ b/srcpkgs/ntp/files/isc-ntpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec isc-ntpd -g -u ntpd:ntpd -n >/dev/null 2>&1
diff --git a/srcpkgs/nullmailer/files/nullmailer/run b/srcpkgs/nullmailer/files/nullmailer/run
index 2c3bc8aea0cc..9b893b27ba38 100644
--- a/srcpkgs/nullmailer/files/nullmailer/run
+++ b/srcpkgs/nullmailer/files/nullmailer/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _nullmail nullmailer-send 2>&1
diff --git a/srcpkgs/nvidia/files/nvidia-powerd/run b/srcpkgs/nvidia/files/nvidia-powerd/run
index 8fe7540cce5e..caffb87562e2 100644
--- a/srcpkgs/nvidia/files/nvidia-powerd/run
+++ b/srcpkgs/nvidia/files/nvidia-powerd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/nvidia-powerd
diff --git a/srcpkgs/nxt/files/nxt-tor/run b/srcpkgs/nxt/files/nxt-tor/run
index 7f4032c1bd56..c14f448c4950 100644
--- a/srcpkgs/nxt/files/nxt-tor/run
+++ b/srcpkgs/nxt/files/nxt-tor/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check tor >/dev/null || exit 1
exec nxt-tor > /dev/null
diff --git a/srcpkgs/nxt/files/nxt/run b/srcpkgs/nxt/files/nxt/run
index 2ffc87eaf557..a3479cc97b11 100644
--- a/srcpkgs/nxt/files/nxt/run
+++ b/srcpkgs/nxt/files/nxt/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nxt > /dev/null
diff --git a/srcpkgs/odroid-u2-base/files/odroid-led/run b/srcpkgs/odroid-u2-base/files/odroid-led/run
index a1ecf5f2b23d..0cea18182b7d 100755
--- a/srcpkgs/odroid-u2-base/files/odroid-led/run
+++ b/srcpkgs/odroid-u2-base/files/odroid-led/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
odroid-led
exec chpst -b odroid-led pause
diff --git a/srcpkgs/ofono/files/ofonod/run b/srcpkgs/ofono/files/ofonod/run
index 6bee7b3120c2..22352555a79d 100644
--- a/srcpkgs/ofono/files/ofonod/run
+++ b/srcpkgs/ofono/files/ofonod/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ofonod -n
diff --git a/srcpkgs/oidentd/files/oidentd/run b/srcpkgs/oidentd/files/oidentd/run
index 3d816c5ebfde..71e3d01b68fa 100644
--- a/srcpkgs/oidentd/files/oidentd/run
+++ b/srcpkgs/oidentd/files/oidentd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec oidentd -i ${OPTS:=-u nobody -g nogroup}
diff --git a/srcpkgs/olsrd/files/olsrd/run b/srcpkgs/olsrd/files/olsrd/run
index 098fa489691f..b769fb94bf59 100755
--- a/srcpkgs/olsrd/files/olsrd/run
+++ b/srcpkgs/olsrd/files/olsrd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec olsrd -nofork -f /etc/olsrd.conf
diff --git a/srcpkgs/open-vm-tools/files/vmtoolsd/run b/srcpkgs/open-vm-tools/files/vmtoolsd/run
index 302a6314bc33..59a49c394220 100644
--- a/srcpkgs/open-vm-tools/files/vmtoolsd/run
+++ b/srcpkgs/open-vm-tools/files/vmtoolsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
index b0a5cc121b90..2a4cb82fe3eb 100644
--- a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
+++ b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/opendkim/files/opendkim/run b/srcpkgs/opendkim/files/opendkim/run
index 644eaac43a88..3c875f777b5e 100644
--- a/srcpkgs/opendkim/files/opendkim/run
+++ b/srcpkgs/opendkim/files/opendkim/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec opendkim -f ${OPTS}
diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index 864c0eb418fa..1751437488e6 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec openntpd -d ${OPTS} 2>&1
diff --git a/srcpkgs/openrgb/files/openrgb/run b/srcpkgs/openrgb/files/openrgb/run
index 6bbee3483bd2..ee3712b755cc 100644
--- a/srcpkgs/openrgb/files/openrgb/run
+++ b/srcpkgs/openrgb/files/openrgb/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec openrgb --server 2>&1
diff --git a/srcpkgs/opensmtpd/files/opensmtpd/run b/srcpkgs/opensmtpd/files/opensmtpd/run
index 68ecaeadebcf..3f67c4e01566 100755
--- a/srcpkgs/opensmtpd/files/opensmtpd/run
+++ b/srcpkgs/opensmtpd/files/opensmtpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec smtpd -F 2>&1
diff --git a/srcpkgs/openssh/files/sshd/run b/srcpkgs/openssh/files/sshd/run
index b5e744a6fa85..a3594373b6d6 100755
--- a/srcpkgs/openssh/files/sshd/run
+++ b/srcpkgs/openssh/files/sshd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ssh-keygen -A >/dev/null 2>&1 # Will generate host keys if they don't already exist
[ -r conf ] && . ./conf
exec /usr/bin/sshd -D $OPTS
diff --git a/srcpkgs/openvswitch/files/ovs-vswitchd/run b/srcpkgs/openvswitch/files/ovs-vswitchd/run
index a0a6c98f997f..499795d53afd 100755
--- a/srcpkgs/openvswitch/files/ovs-vswitchd/run
+++ b/srcpkgs/openvswitch/files/ovs-vswitchd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe -q openvswitch || exit 1
sv check ovsdb-server >/dev/null || exit 1
install -d /run/openvswitch
diff --git a/srcpkgs/openvswitch/files/ovsdb-server/run b/srcpkgs/openvswitch/files/ovsdb-server/run
index 36528368a4d0..cf8947a8578b 100755
--- a/srcpkgs/openvswitch/files/ovsdb-server/run
+++ b/srcpkgs/openvswitch/files/ovsdb-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -f /etc/openvswitch/conf.db ]; then
install -d /etc/openvswitch
ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema || exit 1
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
index 029dfdac68dd..e5b5c3373648 100644
--- a/srcpkgs/parpd/files/parpd/run
+++ b/srcpkgs/parpd/files/parpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parprouted/files/parprouted/run b/srcpkgs/parprouted/files/parprouted/run
index 0029ad4590d0..2d835aef20a8 100644
--- a/srcpkgs/parprouted/files/parprouted/run
+++ b/srcpkgs/parprouted/files/parprouted/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec parprouted ${OPTS}
diff --git a/srcpkgs/pbbuttonsd/files/pbbuttonsd/run b/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
index 7acfdb354bb2..1dfcb9944494 100644
--- a/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
+++ b/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec pbbuttonsd --configfile=${CONF:=/etc/pbbuttonsd.cnf} ${OPTS}
diff --git a/srcpkgs/pcsclite/files/pcscd/run b/srcpkgs/pcsclite/files/pcscd/run
index 99c662d6ebf2..6ae35a3c76ab 100755
--- a/srcpkgs/pcsclite/files/pcscd/run
+++ b/srcpkgs/pcsclite/files/pcscd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec pcscd -f
diff --git a/srcpkgs/pd-mapper/files/pd-mapper/run b/srcpkgs/pd-mapper/files/pd-mapper/run
index b641f486507f..a0999e86c354 100644
--- a/srcpkgs/pd-mapper/files/pd-mapper/run
+++ b/srcpkgs/pd-mapper/files/pd-mapper/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec pd-mapper $OPTS
diff --git a/srcpkgs/php/files/php-fpm/run b/srcpkgs/php/files/php-fpm/run
index c9c75b0498aa..98c6bdd9411d 100755
--- a/srcpkgs/php/files/php-fpm/run
+++ b/srcpkgs/php/files/php-fpm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec php-fpm --nodaemonize
diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run
index f1c712335ab8..9d61e0035983 100755
--- a/srcpkgs/php8.0/files/php-fpm8.0/run
+++ b/srcpkgs/php8.0/files/php-fpm8.0/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec php-fpm8.0 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run
index 5928ea5103ef..ddc4298cece4 100755
--- a/srcpkgs/php8.1/files/php-fpm8.1/run
+++ b/srcpkgs/php8.1/files/php-fpm8.1/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec php-fpm8.1 --nodaemonize ${OPTS}
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
index ea0520e44cd2..6eb172b8b19f 100644
--- a/srcpkgs/pipewire/files/pipewire-pulse/run
+++ b/srcpkgs/pipewire/files/pipewire-pulse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# this service is experimental and most setups should start pipewire as a user,
# for further information, please refer to the handbook
! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
index 9cd2c21f53d0..a201626e464d 100644
--- a/srcpkgs/pipewire/files/pipewire/run
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# this service is experimental and most setups should start pipewire as a user,
# for further information, please refer to the handbook
! [ -d /run/pipewire ] && install -m 755 -g _pipewire -o _pipewire -d /run/pipewire
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
index 3125a4f89ed9..8a3a5623b5eb 100755
--- a/srcpkgs/podman/files/podman-docker/run
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ln -sf /run/podman/podman.sock /run/docker.sock
exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
index 8eb8f41752e4..6e0ba966badb 100755
--- a/srcpkgs/podman/files/podman/run
+++ b/srcpkgs/podman/files/podman/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/polipo/files/polipo/run b/srcpkgs/polipo/files/polipo/run
index 2380d40ebf14..64ce07ee6083 100755
--- a/srcpkgs/polipo/files/polipo/run
+++ b/srcpkgs/polipo/files/polipo/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u nobody polipo
diff --git a/srcpkgs/polkit/files/polkitd/run b/srcpkgs/polkit/files/polkitd/run
index c175cba6f95b..9d69121096eb 100644
--- a/srcpkgs/polkit/files/polkitd/run
+++ b/srcpkgs/polkit/files/polkitd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/lib/polkit-1/polkitd --no-debug
diff --git a/srcpkgs/postfix/files/postfix/run b/srcpkgs/postfix/files/postfix/run
index 38688bb5f46b..a0f0db57742d 100755
--- a/srcpkgs/postfix/files/postfix/run
+++ b/srcpkgs/postfix/files/postfix/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
postfix check || exit 1
exec /usr/libexec/postfix/master -d
diff --git a/srcpkgs/postgresql14/files/postgresql14/run b/srcpkgs/postgresql14/files/postgresql14/run
index 3aee9440e847..1da79920625d 100755
--- a/srcpkgs/postgresql14/files/postgresql14/run
+++ b/srcpkgs/postgresql14/files/postgresql14/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/psql@VERSION@/default/postgresql
: ${PGDATA:="$PGROOT/data"}
diff --git a/srcpkgs/postgresql15/files/postgresql15/run b/srcpkgs/postgresql15/files/postgresql15/run
index 3aee9440e847..1da79920625d 100755
--- a/srcpkgs/postgresql15/files/postgresql15/run
+++ b/srcpkgs/postgresql15/files/postgresql15/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/psql@VERSION@/default/postgresql
: ${PGDATA:="$PGROOT/data"}
diff --git a/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
index d34cc6b20a29..c5dc3f90c28a 100644
--- a/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
+++ b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/power-profiles-daemon
diff --git a/srcpkgs/privoxy/files/privoxy/run b/srcpkgs/privoxy/files/privoxy/run
index 120ca2ad62b6..e656efaaec5a 100755
--- a/srcpkgs/privoxy/files/privoxy/run
+++ b/srcpkgs/privoxy/files/privoxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u privoxy:privoxy privoxy --no-daemon /etc/privoxy/config 2>&1
diff --git a/srcpkgs/prometheus/files/prometheus/run b/srcpkgs/prometheus/files/prometheus/run
index 8311d78552f1..1d72db840ff3 100755
--- a/srcpkgs/prometheus/files/prometheus/run
+++ b/srcpkgs/prometheus/files/prometheus/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/prosody/files/prosody/run b/srcpkgs/prosody/files/prosody/run
index 2173db0113a4..e302e315d867 100644
--- a/srcpkgs/prosody/files/prosody/run
+++ b/srcpkgs/prosody/files/prosody/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /run/prosody
chown prosody:prosody /run/prosody
exec chpst -u prosody:prosody prosody
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
index afbf4517ecb2..16cbde6922a4 100644
--- a/srcpkgs/pulseaudio/files/pulseaudio/run
+++ b/srcpkgs/pulseaudio/files/pulseaudio/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec pulseaudio --system
diff --git a/srcpkgs/qemu/files/qemu-ga/run b/srcpkgs/qemu/files/qemu-ga/run
index 4db20bf91c10..8ba5ef665e62 100755
--- a/srcpkgs/qemu/files/qemu-ga/run
+++ b/srcpkgs/qemu/files/qemu-ga/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec qemu-ga ${OPTS}
diff --git a/srcpkgs/qrtr-ns/files/qrtr-ns/run b/srcpkgs/qrtr-ns/files/qrtr-ns/run
index 7ce1340960cf..adb7ecb718c5 100644
--- a/srcpkgs/qrtr-ns/files/qrtr-ns/run
+++ b/srcpkgs/qrtr-ns/files/qrtr-ns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${OPTS:=-f 1}
exec qrtr-ns $OPTS
diff --git a/srcpkgs/quassel/files/quasselcore/run b/srcpkgs/quassel/files/quasselcore/run
index f30e57eef930..b467f3e7f3b9 100644
--- a/srcpkgs/quassel/files/quasselcore/run
+++ b/srcpkgs/quassel/files/quasselcore/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u quassel quasselcore \
${OPTS:=--require-ssl --configdir=/var/lib/quassel --logfile=/var/log/quassel/quasselcore.log}
diff --git a/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run b/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
index 893de235871e..1a278cdfa603 100755
--- a/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
+++ b/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec radeon-profile-daemon
diff --git a/srcpkgs/radvd/files/radvd/run b/srcpkgs/radvd/files/radvd/run
index 6ab3d099cfcb..d8d528b96bb8 100755
--- a/srcpkgs/radvd/files/radvd/run
+++ b/srcpkgs/radvd/files/radvd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec radvd --nodaemon --logmethod=syslog
diff --git a/srcpkgs/redis/files/redis/run b/srcpkgs/redis/files/redis/run
index 9ce7366eb70f..71811fafe274 100644
--- a/srcpkgs/redis/files/redis/run
+++ b/srcpkgs/redis/files/redis/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o redis -g redis /run/redis
exec chpst -u redis:redis redis-server /etc/redis/redis.conf > /dev/null
diff --git a/srcpkgs/rest-server/files/rest-server/run b/srcpkgs/rest-server/files/rest-server/run
index 2a78f5b0bcd1..251a52fde62b 100644
--- a/srcpkgs/rest-server/files/rest-server/run
+++ b/srcpkgs/rest-server/files/rest-server/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
. /etc/default/rest-server
exec chpst -u _restserver:_restserver rest-server --path $DATA_DIRECTORY $OPTIONS
diff --git a/srcpkgs/rmilter/files/rmilter/run b/srcpkgs/rmilter/files/rmilter/run
index 0cc86694d91a..ca901effb2e5 100755
--- a/srcpkgs/rmilter/files/rmilter/run
+++ b/srcpkgs/rmilter/files/rmilter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${RMILTERUSER:=rmilter}
: ${RMILTERGROUP:=rmilter}
diff --git a/srcpkgs/rmtfs/files/rmtfs/run b/srcpkgs/rmtfs/files/rmtfs/run
index b3e939935e36..a84d5097a23c 100644
--- a/srcpkgs/rmtfs/files/rmtfs/run
+++ b/srcpkgs/rmtfs/files/rmtfs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${OPTS:=-r -P -s}
exec rmtfs $OPTS
diff --git a/srcpkgs/rng-tools/files/rngd/run b/srcpkgs/rng-tools/files/rngd/run
index dbccf991524a..9595d0341815 100644
--- a/srcpkgs/rng-tools/files/rngd/run
+++ b/srcpkgs/rng-tools/files/rngd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
RNGD_OPTS=""
[ -r conf ] && . ./conf
diff --git a/srcpkgs/routinator/files/routinator/run b/srcpkgs/routinator/files/routinator/run
index bbc2c493935e..6b0a70ea20cb 100755
--- a/srcpkgs/routinator/files/routinator/run
+++ b/srcpkgs/routinator/files/routinator/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec routinator --config ${CONF_FILE:-/etc/routinator/routinator.conf} server --user=_routinator --group=_routinator $OPTS 2>&1
diff --git a/srcpkgs/rpcbind/files/rpcbind/run b/srcpkgs/rpcbind/files/rpcbind/run
index 65fab4dec968..81a0b3546fba 100755
--- a/srcpkgs/rpcbind/files/rpcbind/run
+++ b/srcpkgs/rpcbind/files/rpcbind/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec rpcbind -f
diff --git a/srcpkgs/rspamd/files/rspamd/run b/srcpkgs/rspamd/files/rspamd/run
index eba167ab713a..592faf0e1b55 100755
--- a/srcpkgs/rspamd/files/rspamd/run
+++ b/srcpkgs/rspamd/files/rspamd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${RSPAMDUSER:=rspamd}
: ${RSPAMDGROUP:=rspamd}
diff --git a/srcpkgs/rsync/files/rsyncd/run b/srcpkgs/rsync/files/rsyncd/run
index 5a7d49576d54..69a101f2346c 100644
--- a/srcpkgs/rsync/files/rsyncd/run
+++ b/srcpkgs/rsync/files/rsyncd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/rsyncd.conf ] && exit 1
exec rsync --daemon --no-detach
diff --git a/srcpkgs/rsyslog/files/rsyslogd/run b/srcpkgs/rsyslog/files/rsyslogd/run
index 30d94a83f174..b94722eaed81 100755
--- a/srcpkgs/rsyslog/files/rsyslogd/run
+++ b/srcpkgs/rsyslog/files/rsyslogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec rsyslogd -n
diff --git a/srcpkgs/rtkit/files/rtkit/run b/srcpkgs/rtkit/files/rtkit/run
index 1fe14134187f..b5418e9c563f 100644
--- a/srcpkgs/rtkit/files/rtkit/run
+++ b/srcpkgs/rtkit/files/rtkit/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/rtkit-daemon
diff --git a/srcpkgs/salt/files/salt-api/run b/srcpkgs/salt/files/salt-api/run
index 0748970d6a48..0a8ced51bb2b 100755
--- a/srcpkgs/salt/files/salt-api/run
+++ b/srcpkgs/salt/files/salt-api/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-api
diff --git a/srcpkgs/salt/files/salt-master/run b/srcpkgs/salt/files/salt-master/run
index 928cc01797c3..64411f2c330a 100755
--- a/srcpkgs/salt/files/salt-master/run
+++ b/srcpkgs/salt/files/salt-master/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-master
diff --git a/srcpkgs/salt/files/salt-minion/run b/srcpkgs/salt/files/salt-minion/run
index e9b71afc37d3..fd923cb2be0c 100755
--- a/srcpkgs/salt/files/salt-minion/run
+++ b/srcpkgs/salt/files/salt-minion/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-minion
diff --git a/srcpkgs/salt/files/salt-syndic/run b/srcpkgs/salt/files/salt-syndic/run
index 80950effa664..6c2dc7be432a 100755
--- a/srcpkgs/salt/files/salt-syndic/run
+++ b/srcpkgs/salt/files/salt-syndic/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-syndic
diff --git a/srcpkgs/samba/files/ctdbd/run b/srcpkgs/samba/files/ctdbd/run
index f93d43eb8625..2f57f789c5b3 100644
--- a/srcpkgs/samba/files/ctdbd/run
+++ b/srcpkgs/samba/files/ctdbd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ctdbd -i
diff --git a/srcpkgs/sane/files/saned/run b/srcpkgs/sane/files/saned/run
index 18016ad066c4..61d1060f02c1 100644
--- a/srcpkgs/sane/files/saned/run
+++ b/srcpkgs/sane/files/saned/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec saned -l -u _saned ${OPTS}
diff --git a/srcpkgs/scron/files/scron/run b/srcpkgs/scron/files/scron/run
index cbfe72951a8e..428d84713de8 100755
--- a/srcpkgs/scron/files/scron/run
+++ b/srcpkgs/scron/files/scron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec scrond -n 2>&1
diff --git a/srcpkgs/sddm/files/sddm/run b/srcpkgs/sddm/files/sddm/run
index 0ac2a2a4545e..3a5dc6ca58cc 100644
--- a/srcpkgs/sddm/files/sddm/run
+++ b/srcpkgs/sddm/files/sddm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
sv check dbus >/dev/null || exit 1
diff --git a/srcpkgs/seatd/files/seatd/run b/srcpkgs/seatd/files/seatd/run
index a7cf1b48a364..0b82b4c3d90a 100644
--- a/srcpkgs/seatd/files/seatd/run
+++ b/srcpkgs/seatd/files/seatd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/seatd -g _seatd
diff --git a/srcpkgs/sftpgo/files/sftpgo/run b/srcpkgs/sftpgo/files/sftpgo/run
index f35ca0281a55..d63f66a22082 100755
--- a/srcpkgs/sftpgo/files/sftpgo/run
+++ b/srcpkgs/sftpgo/files/sftpgo/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export SFTPGO_HTTPD__TEMPLATES_PATH=/usr/share/sftpgo/templates
export SFTPGO_HTTPD__STATIC_FILES_PATH=/usr/share/sftpgo/static
diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
index 846ca47cf976..598b92a2da69 100755
--- a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
+++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u shadowsocks:shadowsocks ss-local -c /etc/shadowsocks-libev/config.json 1>/dev/null
diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
index 0fd1074671c1..671538434cc8 100755
--- a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
+++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u shadowsocks:shadowsocks ss-server -c /etc/shadowsocks-libev/config.json 1>/dev/null
diff --git a/srcpkgs/shinit/files/shinit/run b/srcpkgs/shinit/files/shinit/run
index f51d6a9e2caf..457a241c2397 100644
--- a/srcpkgs/shinit/files/shinit/run
+++ b/srcpkgs/shinit/files/shinit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export SHINIT_USER=void
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
index 0cd56601f58d..5178f99d65c4 100644
--- a/srcpkgs/shiori/files/shiori/run
+++ b/srcpkgs/shiori/files/shiori/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shorewall/files/shorewall/run b/srcpkgs/shorewall/files/shorewall/run
index 751bf5b76b8c..99473fc38a0d 100755
--- a/srcpkgs/shorewall/files/shorewall/run
+++ b/srcpkgs/shorewall/files/shorewall/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
shorewall start
exec chpst -b shorewall pause
diff --git a/srcpkgs/shorewall/files/shorewall6/run b/srcpkgs/shorewall/files/shorewall6/run
index 8c44bbb49db2..254cba9520b5 100755
--- a/srcpkgs/shorewall/files/shorewall6/run
+++ b/srcpkgs/shorewall/files/shorewall6/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
shorewall6 start
exec chpst -b shorewall6 pause
diff --git a/srcpkgs/slim/files/slim/run b/srcpkgs/slim/files/slim/run
index 765580b17635..ba62756fcc75 100755
--- a/srcpkgs/slim/files/slim/run
+++ b/srcpkgs/slim/files/slim/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec slim -nodaemon
diff --git a/srcpkgs/smartmontools/files/smartd/run b/srcpkgs/smartmontools/files/smartd/run
index 1dc3cc9966a9..e4f00accbd77 100755
--- a/srcpkgs/smartmontools/files/smartd/run
+++ b/srcpkgs/smartmontools/files/smartd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec smartd -n
diff --git a/srcpkgs/smcroute/files/smcrouted/run b/srcpkgs/smcroute/files/smcrouted/run
index 4fdbc56773ff..7a8a6f993cab 100755
--- a/srcpkgs/smcroute/files/smcrouted/run
+++ b/srcpkgs/smcroute/files/smcrouted/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/snapcast/files/snapclient/run b/srcpkgs/snapcast/files/snapclient/run
index d39016efd43b..c5b48ce2f399 100644
--- a/srcpkgs/snapcast/files/snapclient/run
+++ b/srcpkgs/snapcast/files/snapclient/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _snapclient:audio snapclient ${OPTS} 2>&1
diff --git a/srcpkgs/snapcast/files/snapserver/run b/srcpkgs/snapcast/files/snapserver/run
index 638817b15397..cf492f7f9bda 100644
--- a/srcpkgs/snapcast/files/snapserver/run
+++ b/srcpkgs/snapcast/files/snapserver/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _snapserver snapserver ${OPTS} 2>&1
diff --git a/srcpkgs/snapper/files/snapperd/run b/srcpkgs/snapper/files/snapperd/run
index 34e9216df98b..4a1e86638e55 100755
--- a/srcpkgs/snapper/files/snapperd/run
+++ b/srcpkgs/snapper/files/snapperd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec snapperd
diff --git a/srcpkgs/sndio/files/sndiod/run b/srcpkgs/sndio/files/sndiod/run
index 8b4bb8dc0047..622d532a2a57 100755
--- a/srcpkgs/sndio/files/sndiod/run
+++ b/srcpkgs/sndio/files/sndiod/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec sndiod ${OPTS} -d 2>&1
diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
index fd750fe9a45e..5c7329f4b967 100644
--- a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
+++ b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/spamassassin/files/spamd/run b/srcpkgs/spamassassin/files/spamd/run
index 35bc03d30f68..1c3521bdb24a 100755
--- a/srcpkgs/spamassassin/files/spamd/run
+++ b/srcpkgs/spamassassin/files/spamd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -d /var/lib/spamassassin ] || sa-update
exec spamd ${OPTS}
diff --git a/srcpkgs/spampd/files/spampd/run b/srcpkgs/spampd/files/spampd/run
index 7c19ace4ea96..35cc5a0fb626 100755
--- a/srcpkgs/spampd/files/spampd/run
+++ b/srcpkgs/spampd/files/spampd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec spampd --nodetach ${OPTS:=--host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --a --rh --u=_spampd --g=_spampd --maxsize=512}
diff --git a/srcpkgs/spice-vdagent/files/spice-vdagentd/run b/srcpkgs/spice-vdagent/files/spice-vdagentd/run
index 97f1150565dd..6139df344260 100755
--- a/srcpkgs/spice-vdagent/files/spice-vdagentd/run
+++ b/srcpkgs/spice-vdagent/files/spice-vdagentd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/spice-vdagentd
exec /usr/bin/spice-vdagentd -x
diff --git a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
index aac85d39a505..5617a2444486 100755
--- a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
+++ b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _spreed_webrtc:_spreed_webrtc spreed-webrtc-server -c /etc/spreed/webrtc.conf
diff --git a/srcpkgs/sqmail/files/qmail-send/run b/srcpkgs/sqmail/files/qmail-send/run
index c3124c7a1890..18622e236aac 100755
--- a/srcpkgs/sqmail/files/qmail-send/run
+++ b/srcpkgs/sqmail/files/qmail-send/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -f /var/qmail/control/defaultdelivery ]; then
defaultdelivery=$(cat /var/qmail/control/defaultdelivery)
else
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/run b/srcpkgs/sqmail/files/qmail-smtpd/run
index c9993a14f4e0..f90ac49d17e1 100755
--- a/srcpkgs/sqmail/files/qmail-smtpd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/run b/srcpkgs/sqmail/files/qmail-smtpsd/run
index 8138490e142e..19aa95bfbf33 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/run b/srcpkgs/sqmail/files/qmail-smtpsub/run
index 7c01b0a444a2..8377944c8c32 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsub/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsub/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/squid/files/squid/run b/srcpkgs/squid/files/squid/run
index f926f8ffcb8f..fc9ebd7241fd 100644
--- a/srcpkgs/squid/files/squid/run
+++ b/srcpkgs/squid/files/squid/run
@@ -1,4 +1,5 @@
#!/bin/sh -e
+exec 2>&1
install -o squid -g squid -m 0755 -d /var/run/squid
squid -N -s -z
exec squid -N -s
diff --git a/srcpkgs/sshguard/files/sshguard-socklog/run b/srcpkgs/sshguard/files/sshguard-socklog/run
index 746df4822ce6..4fcd23a169ac 100755
--- a/srcpkgs/sshguard/files/sshguard-socklog/run
+++ b/srcpkgs/sshguard/files/sshguard-socklog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Defaults that mabe be overridden (or erased entirely) by configuration
LOGFILE="${LOGFILE:-/var/log/socklog/secure/current}"
diff --git a/srcpkgs/ssl_exporter/files/ssl_exporter/run b/srcpkgs/ssl_exporter/files/ssl_exporter/run
index 0c2bda6a4dab..038148e06bec 100644
--- a/srcpkgs/ssl_exporter/files/ssl_exporter/run
+++ b/srcpkgs/ssl_exporter/files/ssl_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u nobody ssl_exporter $OPTS
diff --git a/srcpkgs/sslh/files/sslh/run b/srcpkgs/sslh/files/sslh/run
index 18710d4f96ad..247f31341787 100644
--- a/srcpkgs/sslh/files/sslh/run
+++ b/srcpkgs/sslh/files/sslh/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec sslh -f -u nobody -F/etc/sslh.cfg
diff --git a/srcpkgs/sssd/files/sssd/run b/srcpkgs/sssd/files/sssd/run
index 61a87edc699c..8203ac628a6d 100755
--- a/srcpkgs/sssd/files/sssd/run
+++ b/srcpkgs/sssd/files/sssd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec sssd -i
diff --git a/srcpkgs/strongswan/files/strongswan/run b/srcpkgs/strongswan/files/strongswan/run
index 16b6a9311424..5963bb28e664 100755
--- a/srcpkgs/strongswan/files/strongswan/run
+++ b/srcpkgs/strongswan/files/strongswan/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ipsec start --nofork
diff --git a/srcpkgs/stubby/files/stubby/run b/srcpkgs/stubby/files/stubby/run
index 2e12b92f0c34..3b819aaedc8d 100644
--- a/srcpkgs/stubby/files/stubby/run
+++ b/srcpkgs/stubby/files/stubby/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _stubby:_stubby /usr/bin/stubby 2>&1
diff --git a/srcpkgs/subversion/files/svnserve/run b/srcpkgs/subversion/files/svnserve/run
index 7f512e085141..aa7a1bebe59a 100755
--- a/srcpkgs/subversion/files/svnserve/run
+++ b/srcpkgs/subversion/files/svnserve/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec svnserve -d --foreground $OPTS
diff --git a/srcpkgs/sv-netmount/files/netmount/run b/srcpkgs/sv-netmount/files/netmount/run
index 9b0f4d72f9b4..d88dd8c9a2b0 100755
--- a/srcpkgs/sv-netmount/files/netmount/run
+++ b/srcpkgs/sv-netmount/files/netmount/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Load user defined variables
[ -r conf ] && . ./conf
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 0778d6317328..7c3277a788ec 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
diff --git a/srcpkgs/synergy/files/synergyc/run b/srcpkgs/synergy/files/synergyc/run
index eed442178d7c..ee9b27041843 100755
--- a/srcpkgs/synergy/files/synergyc/run
+++ b/srcpkgs/synergy/files/synergyc/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SERVER_ADDR ] && exit 0
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
diff --git a/srcpkgs/synergy/files/synergys/run b/srcpkgs/synergy/files/synergys/run
index 65bc0a52d76d..b1b2b5cc3f9a 100755
--- a/srcpkgs/synergy/files/synergys/run
+++ b/srcpkgs/synergy/files/synergys/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
exec synergys --no-daemon ${OPTS:=--restart}
diff --git a/srcpkgs/telegraf/files/telegraf/run b/srcpkgs/telegraf/files/telegraf/run
index bd88810c3977..2104b55469d6 100644
--- a/srcpkgs/telegraf/files/telegraf/run
+++ b/srcpkgs/telegraf/files/telegraf/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _telegraf:_telegraf telegraf "$TELEGRAF_CONF_LINE" "$TELEGRAF_CONFDIR_LINE" 2>&1
diff --git a/srcpkgs/tftp-hpa/files/tftpd-hpa/run b/srcpkgs/tftp-hpa/files/tftpd-hpa/run
index d11fba58fd66..44bef33434b8 100644
--- a/srcpkgs/tftp-hpa/files/tftpd-hpa/run
+++ b/srcpkgs/tftp-hpa/files/tftpd-hpa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/thermald/files/thermald/run b/srcpkgs/thermald/files/thermald/run
index de5b6d5c3e1e..0df85a0b8af9 100644
--- a/srcpkgs/thermald/files/thermald/run
+++ b/srcpkgs/thermald/files/thermald/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec thermald --no-daemon --dbus-enable 2>&1
diff --git a/srcpkgs/thttpd/files/thttpd/run b/srcpkgs/thttpd/files/thttpd/run
index 95a629aabe29..cfcb6561cfbe 100755
--- a/srcpkgs/thttpd/files/thttpd/run
+++ b/srcpkgs/thttpd/files/thttpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec thttpd -D
diff --git a/srcpkgs/tinc/files/tincd/run b/srcpkgs/tinc/files/tincd/run
index 21f48699717d..41650420858c 100755
--- a/srcpkgs/tinc/files/tincd/run
+++ b/srcpkgs/tinc/files/tincd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec tincd -D
diff --git a/srcpkgs/tinyproxy/files/tinyproxy/run b/srcpkgs/tinyproxy/files/tinyproxy/run
index a065b7f4f6d8..f85cefeef110 100755
--- a/srcpkgs/tinyproxy/files/tinyproxy/run
+++ b/srcpkgs/tinyproxy/files/tinyproxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m 0755 -o _tinyproxy -g _tinyproxy /run/tinyproxy
exec chpst -1 tinyproxy -d $OPTS
diff --git a/srcpkgs/tinyssh/files/tinysshd/run b/srcpkgs/tinyssh/files/tinysshd/run
index 2e382737cc31..1069860e00ff 100644
--- a/srcpkgs/tinyssh/files/tinysshd/run
+++ b/srcpkgs/tinyssh/files/tinysshd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
# Override OPTS in conf. Suggested:
# OPTS='-x sftp=/usr/libexec/sftp-server -l -v'
diff --git a/srcpkgs/tlp/files/tlp/run b/srcpkgs/tlp/files/tlp/run
index 552c2e721154..04cdebc1a3b7 100755
--- a/srcpkgs/tlp/files/tlp/run
+++ b/srcpkgs/tlp/files/tlp/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
tlp init start || exit 1
exec chpst -b tlp pause
diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index 3b6f9953376d..315befc9b063 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-65536}
exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/touchegg/files/touchegg/run b/srcpkgs/touchegg/files/touchegg/run
index abe9b2319e3b..d85b174340b1 100755
--- a/srcpkgs/touchegg/files/touchegg/run
+++ b/srcpkgs/touchegg/files/touchegg/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _touchegg:input touchegg --daemon
diff --git a/srcpkgs/toxcore/files/tox-bootstrapd/run b/srcpkgs/toxcore/files/tox-bootstrapd/run
index e9acbdd6ee95..08f9d0f0d2d6 100755
--- a/srcpkgs/toxcore/files/tox-bootstrapd/run
+++ b/srcpkgs/toxcore/files/tox-bootstrapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _tox_bootstrapd tox-bootstrapd --foreground ${OPTS:-"--config=/etc/tox-bootstrapd.conf"}
diff --git a/srcpkgs/transmission/files/transmission-daemon/run b/srcpkgs/transmission/files/transmission-daemon/run
index 07e3935f805a..ed988af16556 100755
--- a/srcpkgs/transmission/files/transmission-daemon/run
+++ b/srcpkgs/transmission/files/transmission-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u transmission:transmission transmission-daemon -f --log-error
diff --git a/srcpkgs/twoftpd/files/twoftpd-anon/run b/srcpkgs/twoftpd/files/twoftpd-anon/run
index 5618bd69b9a9..5e3dd2d7df6c 100755
--- a/srcpkgs/twoftpd/files/twoftpd-anon/run
+++ b/srcpkgs/twoftpd/files/twoftpd-anon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
UID=$(id -u ftp)
GID=$(id -g ftp)
echo $UID > ./env/UID
diff --git a/srcpkgs/ufw/files/ufw/run b/srcpkgs/ufw/files/ufw/run
index 41b6523de68c..174bb3fd0cb7 100755
--- a/srcpkgs/ufw/files/ufw/run
+++ b/srcpkgs/ufw/files/ufw/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
/usr/lib/ufw/ufw-init start quiet
exec chpst -b ufw pause
diff --git a/srcpkgs/ulogd/files/ulogd/run b/srcpkgs/ulogd/files/ulogd/run
index 0f7e286e6e3c..737516c9e598 100644
--- a/srcpkgs/ulogd/files/ulogd/run
+++ b/srcpkgs/ulogd/files/ulogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ulogd -u _ulogd
diff --git a/srcpkgs/unbound/files/unbound/run b/srcpkgs/unbound/files/unbound/run
index 378933e6f592..8eea12be139b 100755
--- a/srcpkgs/unbound/files/unbound/run
+++ b/srcpkgs/unbound/files/unbound/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec unbound -dp
diff --git a/srcpkgs/upmpdcli/files/upmpdcli/run b/srcpkgs/upmpdcli/files/upmpdcli/run
index 1a6b2018657d..0a728f192656 100644
--- a/srcpkgs/upmpdcli/files/upmpdcli/run
+++ b/srcpkgs/upmpdcli/files/upmpdcli/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _upmpdcli upmpdcli ${OPTS:- -c /etc/upmpdcli.conf} 2>&1
diff --git a/srcpkgs/uptimed/files/uptimed/run b/srcpkgs/uptimed/files/uptimed/run
index 716df87a4aa2..89c40aed17f6 100755
--- a/srcpkgs/uptimed/files/uptimed/run
+++ b/srcpkgs/uptimed/files/uptimed/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec uptimed -f $OPTS
diff --git a/srcpkgs/usbguard/files/usbguard/run b/srcpkgs/usbguard/files/usbguard/run
index 9c33365a71e5..d5aa8b89ca66 100644
--- a/srcpkgs/usbguard/files/usbguard/run
+++ b/srcpkgs/usbguard/files/usbguard/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec usbguard-daemon
diff --git a/srcpkgs/usbmuxd/files/usbmuxd/run b/srcpkgs/usbmuxd/files/usbmuxd/run
index 0a064839de33..4314e9e2761d 100644
--- a/srcpkgs/usbmuxd/files/usbmuxd/run
+++ b/srcpkgs/usbmuxd/files/usbmuxd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec usbmuxd -f -u
diff --git a/srcpkgs/util-linux/files/uuidd/run b/srcpkgs/util-linux/files/uuidd/run
index bfbaa5492b34..78b1a6609d58 100755
--- a/srcpkgs/util-linux/files/uuidd/run
+++ b/srcpkgs/util-linux/files/uuidd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/uuidd ] && mkdir -p /run/uuidd
chown _uuidd:_uuidd /run/uuidd
exec chpst -u _uuidd:_uuidd uuidd -F -P
diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index cae39437dd15..2910b070fb90 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _v2ray v2ray run -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run
index 1f4805733942..06eb3e51e6f2 100755
--- a/srcpkgs/varnish/files/varnishd/run
+++ b/srcpkgs/varnish/files/varnishd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Default options
VARNISH_ADDR=0.0.0.0:80
diff --git a/srcpkgs/vault/files/vault/run b/srcpkgs/vault/files/vault/run
index 840cc2836921..6b08c00f5c2e 100644
--- a/srcpkgs/vault/files/vault/run
+++ b/srcpkgs/vault/files/vault/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _vault vault server -config=/etc/vault/
diff --git a/srcpkgs/vaultwarden/files/vaultwarden/run b/srcpkgs/vaultwarden/files/vaultwarden/run
index ff5d0c6af46d..2c4beb06ee76 100644
--- a/srcpkgs/vaultwarden/files/vaultwarden/run
+++ b/srcpkgs/vaultwarden/files/vaultwarden/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
ENV_FILE=${ENV_FILE:-/etc/vaultwarden.conf}
export ENV_FILE
diff --git a/srcpkgs/virtualbox-ose/files/vboxservice/run b/srcpkgs/virtualbox-ose/files/vboxservice/run
index c3c0d94d034d..984493784030 100755
--- a/srcpkgs/virtualbox-ose/files/vboxservice/run
+++ b/srcpkgs/virtualbox-ose/files/vboxservice/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
# Note: requires dbus service
exec VBoxService -f
diff --git a/srcpkgs/virtualbox-ose/files/vboxwebsrv/run b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
index c28a700747b7..328216e4457d 100755
--- a/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
+++ b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check vboxservice >/dev/null || exit 1
sv check dbus >/dev/null || exit 1
exec vboxwebsrv
diff --git a/srcpkgs/vnstat/files/vnstatd/run b/srcpkgs/vnstat/files/vnstatd/run
index ea3a9ba02bd7..fb1228b7471c 100755
--- a/srcpkgs/vnstat/files/vnstatd/run
+++ b/srcpkgs/vnstat/files/vnstatd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec vnstatd -n
diff --git a/srcpkgs/vpnd/files/vpnd/run b/srcpkgs/vpnd/files/vpnd/run
index 9f023775841d..9c2b90f2d193 100644
--- a/srcpkgs/vpnd/files/vpnd/run
+++ b/srcpkgs/vpnd/files/vpnd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/vpnd
diff --git a/srcpkgs/vsftpd/files/vsftpd-ipv6/run b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
index f0ca4b4d6099..b8c553af7728 100644
--- a/srcpkgs/vsftpd/files/vsftpd-ipv6/run
+++ b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec vsftpd -obackground=no -olisten=no -olisten_ipv6=yes ${OPTS}
diff --git a/srcpkgs/vsftpd/files/vsftpd/run b/srcpkgs/vsftpd/files/vsftpd/run
index 0b237d7d8c74..02e1063dc0cd 100644
--- a/srcpkgs/vsftpd/files/vsftpd/run
+++ b/srcpkgs/vsftpd/files/vsftpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec vsftpd -obackground=no ${OPTS}
diff --git a/srcpkgs/watchdog/files/watchdog/run b/srcpkgs/watchdog/files/watchdog/run
index a7bb2abd33c6..896685808b02 100755
--- a/srcpkgs/watchdog/files/watchdog/run
+++ b/srcpkgs/watchdog/files/watchdog/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec watchdog -F ${OPTS}
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index b926f6c70305..3e44af632958 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec waydroid -w container start
diff --git a/srcpkgs/wesnoth/files/wesnothd/run b/srcpkgs/wesnoth/files/wesnothd/run
index e32ddd006a46..b9bfeec8c3ab 100644
--- a/srcpkgs/wesnoth/files/wesnothd/run
+++ b/srcpkgs/wesnoth/files/wesnothd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -m0700 -p /run/wesnoth
exec wesnothd
diff --git a/srcpkgs/wicd/files/wicd/run b/srcpkgs/wicd/files/wicd/run
index 5adacd074701..c88a989263cf 100755
--- a/srcpkgs/wicd/files/wicd/run
+++ b/srcpkgs/wicd/files/wicd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec chpst -1 wicd --no-daemon
diff --git a/srcpkgs/wireguard-tools/files/wireguard/run b/srcpkgs/wireguard-tools/files/wireguard/run
index d669d955aafa..f18d25ee1227 100755
--- a/srcpkgs/wireguard-tools/files/wireguard/run
+++ b/srcpkgs/wireguard-tools/files/wireguard/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
for conf in /etc/wireguard/*.conf; do
diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run
index 7ba16434072e..4ee380ac48ba 100644
--- a/srcpkgs/wireproxy/files/wireproxy/run
+++ b/srcpkgs/wireproxy/files/wireproxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/run b/srcpkgs/x2goserver/files/x2gocleansessions/run
index f40d8b1f2b35..81041208a29d 100644
--- a/srcpkgs/x2goserver/files/x2gocleansessions/run
+++ b/srcpkgs/x2goserver/files/x2gocleansessions/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/x2gocleansessions --nofork
diff --git a/srcpkgs/xdm/files/xdm/run b/srcpkgs/xdm/files/xdm/run
index 49f1608c8b91..0dd30414122d 100755
--- a/srcpkgs/xdm/files/xdm/run
+++ b/srcpkgs/xdm/files/xdm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec xdm -error /dev/stdout -nodaemon 2>&1
diff --git a/srcpkgs/xen/files/xen/run b/srcpkgs/xen/files/xen/run
index b35a945d1bec..5aff5c94a62a 100755
--- a/srcpkgs/xen/files/xen/run
+++ b/srcpkgs/xen/files/xen/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check xenconsoled >/dev/null || exit 1
xenstore-write "/local/domain/0/domid" 0 || exit 1
xenstore-write "/local/domain/0/name" "Domain-0" || exit 1
diff --git a/srcpkgs/xen/files/xenconsoled/run b/srcpkgs/xen/files/xenconsoled/run
index bf13989cdb95..d5dedb6c5f8c 100755
--- a/srcpkgs/xen/files/xenconsoled/run
+++ b/srcpkgs/xen/files/xenconsoled/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check xenstored >/dev/null || exit 1
mkdir -p /var/log/xen/console
exec xenconsoled -i --log=all
diff --git a/srcpkgs/xen/files/xenstored/run b/srcpkgs/xen/files/xenstored/run
index f30d9adefaa4..6f0744726428 100755
--- a/srcpkgs/xen/files/xenstored/run
+++ b/srcpkgs/xen/files/xenstored/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/xen ] && mkdir -p /run/xen
modprobe -q xen-evtchn xen-gnttalloc || exit 1
mountpoint -q /proc/xen || mount -t xenfs xenfs /proc/xen
diff --git a/srcpkgs/xinetd/files/xinetd/run b/srcpkgs/xinetd/files/xinetd/run
index 08bab8849c20..999a1283fece 100755
--- a/srcpkgs/xinetd/files/xinetd/run
+++ b/srcpkgs/xinetd/files/xinetd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec xinetd -dontfork -syslog daemon
diff --git a/srcpkgs/xl2tpd/files/xl2tpd/run b/srcpkgs/xl2tpd/files/xl2tpd/run
index 343575eb5988..ccdadd6a2c3f 100644
--- a/srcpkgs/xl2tpd/files/xl2tpd/run
+++ b/srcpkgs/xl2tpd/files/xl2tpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -d /var/run/xl2tpd ] || mkdir /var/run/xl2tpd
exec xl2tpd -D ${OPTS:=-c /etc/xl2tpd/xl2tpd.conf}
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 0c5e259b3ae5..1189f9cc02ed 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe tun
caps='-all,+NET_ADMIN,+NET_RAW'
drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
diff --git a/srcpkgs/zabbix/files/zabbix-agent/run b/srcpkgs/zabbix/files/zabbix-agent/run
index badcd16daa56..0fa78920beb0 100755
--- a/srcpkgs/zabbix/files/zabbix-agent/run
+++ b/srcpkgs/zabbix/files/zabbix-agent/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o _zabbix_agent -g _zabbix_agent /run/zabbix-agentd
chpst -u _zabbix_agent:_zabbix_agent zabbix_agentd -f -c /etc/zabbix_agentd.conf
diff --git a/srcpkgs/zabbix/files/zabbix-proxy/run b/srcpkgs/zabbix/files/zabbix-proxy/run
index 5b6685de0efe..a5a3351cf5a1 100755
--- a/srcpkgs/zabbix/files/zabbix-proxy/run
+++ b/srcpkgs/zabbix/files/zabbix-proxy/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o _zabbix_proxy -g _zabbix_proxy /run/zabbix-proxy
chpst -u _zabbix_proxy:_zabbix_proxy zabbix_proxy -f -c /etc/zabbix_proxy.conf
diff --git a/srcpkgs/zabbix/files/zabbix-server/run b/srcpkgs/zabbix/files/zabbix-server/run
index 09c7bfaa92bd..bbeb61e94660 100755
--- a/srcpkgs/zabbix/files/zabbix-server/run
+++ b/srcpkgs/zabbix/files/zabbix-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv start mysqld >/dev/null || exit 1
install -d -m0750 -o _zabbix_server -g _zabbix_server /run/zabbix-server
diff --git a/srcpkgs/zeek/files/bro/run b/srcpkgs/zeek/files/bro/run
index 90eb6a59c0ce..3daf99573a9e 100644
--- a/srcpkgs/zeek/files/bro/run
+++ b/srcpkgs/zeek/files/bro/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
BROLOGDIR="/var/log/bro"
diff --git a/srcpkgs/zeek/files/zeek/run b/srcpkgs/zeek/files/zeek/run
index 8d3fd5e36f21..9401eefa57ab 100644
--- a/srcpkgs/zeek/files/zeek/run
+++ b/srcpkgs/zeek/files/zeek/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ZEEKLOGDIR="/var/log/zeek"
diff --git a/srcpkgs/zfs/files/zed/run b/srcpkgs/zfs/files/zed/run
index 0e3c1a4f53da..63deda22b506 100755
--- a/srcpkgs/zfs/files/zed/run
+++ b/srcpkgs/zfs/files/zed/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . conf
exec zed -F $OPTS
diff --git a/srcpkgs/znc/files/znc/run b/srcpkgs/znc/files/znc/run
index 7f69a9a382f8..6888186ac4fd 100644
--- a/srcpkgs/znc/files/znc/run
+++ b/srcpkgs/znc/files/znc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u znc:znc znc -f -n 2>&1
diff --git a/srcpkgs/zrepl/files/zrepl/run b/srcpkgs/zrepl/files/zrepl/run
index 6641430b37e9..f783e265f774 100644
--- a/srcpkgs/zrepl/files/zrepl/run
+++ b/srcpkgs/zrepl/files/zrepl/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0700 /var/run/zrepl
exec zrepl --config /etc/zrepl/zrepl.yml daemon
From b9890b6efa38d4880eaeae1d150f29ad8fb3b35d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:04:23 -0500
Subject: [PATCH 324/356] dnscrypt-proxy: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/dnscrypt-proxy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e06702e89b92..8a5a16f2d0cf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
version=2.1.4
-revision=1
+revision=2
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
go_package="${go_import_path}/dnscrypt-proxy"
From fe97bb1579a9d94069e631a7da2f6a2dcb3eeee8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:43 -0500
Subject: [PATCH 325/356] dq: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/dq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template
index e0d84abd1b7f..418b0d89e35d 100644
--- a/srcpkgs/dq/template
+++ b/srcpkgs/dq/template
@@ -1,7 +1,7 @@
# Template file for 'dq'
pkgname=dq
version=0.0.20230101
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="
/etc/dqcache/env 0755 root root
From 8e91c18d1c3ac6fbf4a485bd13ab02b20d92e037 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:47 -0500
Subject: [PATCH 326/356] radicale: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/radicale/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 62e0125da827..a6fabe065463 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
# Template file for 'radicale'
pkgname=radicale
version=3.1.8
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt
From 2e3727e098b2c1c329b58c849fb0ec2e4055adda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:53 -0500
Subject: [PATCH 327/356] syncthing: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/syncthing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d0e8b48205c1..1c4a6f9e9224 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
# Template file for 'syncthing'
pkgname=syncthing
version=1.23.1
-revision=1
+revision=2
build_style=go
go_import_path="github.com/syncthing/syncthing"
go_package="
From d780f88213a8dc4f62519b8273dff756e12022c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:11:20 -0500
Subject: [PATCH 328/356] preload: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/preload/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/preload/template b/srcpkgs/preload/template
index e3ee614470f5..9623aed0e6eb 100644
--- a/srcpkgs/preload/template
+++ b/srcpkgs/preload/template
@@ -1,13 +1,13 @@
# Template file for 'preload'
pkgname=preload
version=0.6.4
-revision=10
+revision=11
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel"
short_desc="Adaptive readahead daemon"
maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://sourceforge.net/projects/preload"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=d0a558e83cb29a51d9d96736ef39f4b4e55e43a589ad1aec594a048ca22f816b
From 03995348e583b48485789548a68ca3232108d627 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 7 Feb 2023 14:48:45 -0600
Subject: [PATCH 329/356] QMPlay2: update to 23.02.05.
---
srcpkgs/QMPlay2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 5697957c80d5..ad73cbb01bae 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=22.10.23
+version=23.02.05
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=31e53121e517b45d4317a298df9aed447f880383bea96ae28bfcec0b3a19483f
+checksum=b5347b6840e6f60496f7ca043d423ec52afc7a8b34274379a50c7e7bcd75414c
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 26ddf3f024eed98ee020b3f0f8c193e340778a1a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 9 Feb 2023 21:11:16 -0600
Subject: [PATCH 330/356] nvidia: update to 525.89.02.
---
srcpkgs/nvidia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 5ab1d1b7c8f1..09e40d23482c 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
-version=525.85.05
+version=525.89.02
revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=ea63b4253403b224bb7313a8977a920dfe9d203d661dd5f6fc26585a70179140
+checksum=0e412c88c5bd98f842a839a6f64614f20e4c0950ef7cffb12b158a71633593e9
# subpackages need to be processed in this specific order
subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision}
From 21fff929db40441a449da5cea74f368b6c078d22 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 9 Feb 2023 21:35:22 -0600
Subject: [PATCH 331/356] ghidra: update to 10.2.3.
---
srcpkgs/ghidra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index fca254e4a6bc..aa59daf783a6 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,6 +1,6 @@
# Template file for 'ghidra'
pkgname=ghidra
-version=10.2.2
+version=10.2.3
revision=1
# commit id of 'ghidra-data' repo:
_commit=939210dab2570714944ac35a4daef9633fd842b3
@@ -29,7 +29,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
-checksum="63645c44039b87b65c20bd64b9bd1d2fe4749704220da0b0756a18061cf0f543
+checksum="b200db34e7dae42914fafc45075e84cebf2c635ea47d4422a10b399913f0312e
7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
From e7fa54b0ff1a8cdda5e43aa515a3d08e9388cc64 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 8 Feb 2023 10:27:41 +0100
Subject: [PATCH 332/356] github-cli: update to 2.23.0
---
srcpkgs/github-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 510a07a6b4cd..c767c300014a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
# Template file for 'github-cli'
pkgname=github-cli
-version=2.22.1
+version=2.23.0
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://cli.github.com"
changelog="https://github.com/cli/cli/releases"
distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=09cdd1c435d453a0c610f407979ecf8d314aec41d7b8004794f136f05b0fe688
+checksum=1e9f92a47caa92efedc06b22cfe9c951c5163c4a9bc60a45d477fd5d9b592e54
pre_build() {
local _date
From b80bcf9b0d8780004fc3569216018821b712d7bd Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 10 Feb 2023 00:57:18 -0500
Subject: [PATCH 333/356] vault: update to 1.12.3.
---
srcpkgs/vault/files/vault/run | 5 ++++-
srcpkgs/vault/template | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vault/files/vault/run b/srcpkgs/vault/files/vault/run
index 6b08c00f5c2e..43742a8ee0a0 100644
--- a/srcpkgs/vault/files/vault/run
+++ b/srcpkgs/vault/files/vault/run
@@ -1,4 +1,7 @@
#!/bin/sh
exec 2>&1
-exec chpst -u _vault vault server -config=/etc/vault/
+[ -r ./conf ] && . ./conf
+: ${OPTS:=server -config=/etc/vault/}
+
+exec chpst -u _vault vault ${OPTS}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index b8cc146ca579..194ddcc2270f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
# Template file for 'vault'
pkgname=vault
-version=1.12.1
+version=1.12.3
revision=1
build_style=go
go_import_path="github.com/hashicorp/vault"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.vaultproject.io/"
distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=32dc19ca35496ecaeaf906f8670d3acf569f0c7a43531cbdc9ab69f69f7c4a68
+checksum=be65f2fcc2e5ed0e01978c72a5ee8142470e7115088c96d8c0d1a66e0b5ec17a
system_accounts="_vault"
make_dirs="/var/lib/vault 0700 _vault _vault
/etc/vault 0750 root _vault"
From a9289a40b2c74a73b2bbf852dcca35bb3e0f4a11 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Feb 2023 15:14:57 +0100
Subject: [PATCH 334/356] paps: update to 0.8.0.
---
srcpkgs/paps/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 36de5edaa2d3..460daaaae548 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,6 +1,6 @@
# Template file for 'paps'
pkgname=paps
-version=0.7.9
+version=0.8.0
revision=1
build_style=meson
hostmakedepends="pkg-config cmake"
@@ -10,4 +10,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/dov/paps"
distfiles="https://github.com/dov/paps/archive/v${version}.tar.gz"
-checksum=5f0198a011533d915fbf9f5e47438148d1f3a056bcd90bc21d6ae6476b6f3abc
+checksum=8fd8db04e6f8c5c164806d2c1b5fea6096daf583f83f06d1e4813ea61edc291f
+python_version=3
From 14a9db095e0c02b9e466de9515dbdcabbf3d8b73 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Feb 2023 11:30:02 -0500
Subject: [PATCH 335/356] nzbget: patch for openssl3
---
srcpkgs/nzbget/patches/openssl3.patch | 29 +++++++++++++++++++++++++++
srcpkgs/nzbget/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nzbget/patches/openssl3.patch
diff --git a/srcpkgs/nzbget/patches/openssl3.patch b/srcpkgs/nzbget/patches/openssl3.patch
new file mode 100644
index 000000000000..75287bce9f70
--- /dev/null
+++ b/srcpkgs/nzbget/patches/openssl3.patch
@@ -0,0 +1,29 @@
+From f76e8555504e3af4cf8dd4a8c8e374b3ca025099 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Tue, 7 Dec 2021 13:23:21 +0100
+Subject: [PATCH] daemon:connect: don't use FIPS_mode_set with OpenSSL 3
+
+This function has been removed in OpenSSL 3, replaced by
+EVP_default_properties_enable_fips. See
+https://www.openssl.org/docs/man3.0/man7/migration_guide.html
+---
+ daemon/connect/TlsSocket.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/daemon/connect/TlsSocket.cpp b/daemon/connect/TlsSocket.cpp
+index 544bf6850..831da0dc0 100644
+--- a/daemon/connect/TlsSocket.cpp
++++ b/daemon/connect/TlsSocket.cpp
+@@ -189,7 +189,11 @@ void TlsSocket::Final()
+
+ #ifdef HAVE_OPENSSL
+ #ifndef LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ FIPS_mode_set(0);
++#else
++ EVP_default_properties_enable_fips(NULL, 0);
++#endif
+ #endif
+ #ifdef NEED_CRYPTO_LOCKING
+ CRYPTO_set_locking_callback(nullptr);
+
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 3d4306834839..8631192b5d0f 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
# Template file for 'nzbget'
pkgname=nzbget
version=21.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tlslib=OpenSSL
--with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
From c2a15f417369f06fcf6f2155e7212ea55b878058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 10 Feb 2023 22:58:16 +0700
Subject: [PATCH 336/356] python3-readability-lxml: remove python 2 file
Fix: #42178
---
srcpkgs/python3-readability-lxml/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 499692571812..4872e4b2addc 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,7 +1,7 @@
# Template file for 'python3-readability-lxml'
pkgname=python3-readability-lxml
version=0.8.1
-revision=6
+revision=7
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-lxml python3-chardet python3-cssselect"
@@ -12,3 +12,7 @@ homepage="https://github.com/buriy/python-readability"
distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
make_check=no # needs unpackaged timeout_decorator
+
+post_extract() {
+ rm -f readability/compat/two.py
+}
From c99b1c502496970aa1055a8ab942ae95bb6bce85 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 26 Nov 2022 02:20:26 +0100
Subject: [PATCH 337/356] portage: update to 3.0.44.
with help by
https://github.com/void-linux/void-packages/pull/38353#issuecomment-1405626057
@liarimu
---
srcpkgs/portage/template | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 8e20cd92b638..bb6c1ae41fe2 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,21 +1,24 @@
# Template file for 'portage'
pkgname=portage
-version=3.0.32
-revision=2
+version=3.0.44
+revision=1
build_style=python3-module
make_install_args="--sbindir=/usr/bin"
hostmakedepends="python3"
depends="python3 rsync xmlto eselect tar zstd"
-checkdepends="tar zstd"
+checkdepends="tar zstd gnupg"
short_desc="Gentoo's package management system"
maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://wiki.gentoo.org/wiki/Portage"
-changelog="https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES"
-distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=442c028fb8c8926491bc92f0d4d25a5ffabb1750d10f9c056471c1768a9202a2
+changelog="https://gitweb.gentoo.org/proj/portage.git/plain/NEWS"
+distfiles="https://github.com/gentoo/portage/archive/portage-${version}.tar.gz"
+checksum=c7171aae7a6d6228b3ecc37819ce4d5c7652a9f47dde4db21d5ce4437d0ae19a
+# unshare cannot be used in CI
+# https://bugs.gentoo.org/show_bug.cgi?id=680456
+# https://forums.gentoo.org/viewtopic-t-1113256-start-0.html
+make_check=ci-skip
-conf_files="
- /etc/dispatch-conf.conf
- /etc/etc-update.conf
- /etc/logrotate.d/elog-save-summary"
+conf_files="/etc/dispatch-conf.conf
+ /etc/etc-update.conf
+ /etc/logrotate.d/elog-save-summary"
From 4db58d2ba9c2d315f35c5507ed48f538218e56df Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Wed, 21 Dec 2022 19:07:24 -0600
Subject: [PATCH 338/356] glm: fix license, copy cmake config files
closes #36213
---
srcpkgs/glm/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 7ccca2b74ebf..5f076e7a3d5c 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -1,7 +1,7 @@
# Template file for 'glm'
pkgname=glm
version=0.9.9.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="dos2unix unzip"
short_desc="C++ mathematics library for graphics programming"
@@ -16,9 +16,9 @@ checksum=37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c
do_install() {
local i
vmkdir usr/include
- for i in glm ; do
- vcopy $i usr/include
- done
+ vcopy glm usr/include
+ vmkdir usr/lib/cmake
+ vcopy cmake/glm usr/lib/cmake
vmkdir usr/share/pkgconfig
vinstall ${FILESDIR}/glm.pc 644 usr/share/pkgconfig
}
@@ -28,7 +28,6 @@ post_install() {
for f in $(find ${DESTDIR}/usr/include -type f); do
dos2unix "$f"
done
- rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- sed -n '88,110p' manual.md > LICENSE
- vlicense LICENSE
+ rm "${DESTDIR}/usr/include/glm/CMakeLists.txt"
+ vlicense copying.txt LICENSE
}
From af6c90f710e98c4678e916e021ae1df2bff1fcfc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 10 Feb 2023 19:43:29 +0100
Subject: [PATCH 339/356] xa: update to 2.3.14.
---
srcpkgs/xa/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index b6df10d76645..f421d2824b8d 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,8 +1,9 @@
# Template file for 'xa'
pkgname=xa
-version=2.3.13
+version=2.3.14
revision=1
build_style=gnu-makefile
+make_check_args="-j1"
make_check_target="test"
checkdepends="perl"
short_desc="6502/R65C02/65816 cross-assembler"
@@ -10,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.floodgap.com/retrotech/xa/"
distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86
+checksum=1b9bbabddbd8d3b9410b852e50a128eea41e681339e6f76c3e8076fa5420f02e
post_extract() {
vsed -i 's/${LD}/${CC}/' src/Makefile
From 4fea2742607d4e61b6d8acfdebc1aae8bc2a246c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 29 Jan 2023 18:39:18 -0500
Subject: [PATCH 340/356] New package: xmirror-0.1
---
srcpkgs/xmirror/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xmirror/template
diff --git a/srcpkgs/xmirror/template b/srcpkgs/xmirror/template
new file mode 100644
index 000000000000..2768924411b1
--- /dev/null
+++ b/srcpkgs/xmirror/template
@@ -0,0 +1,17 @@
+# Template file for 'xmirror'
+pkgname=xmirror
+version=0.1
+revision=1
+build_style=gnu-makefile
+depends="bash dialog"
+short_desc="Interactive script for changing XBPS mirrors"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-2-Clause"
+homepage="https://github.com/void-linux/xmirror"
+distfiles="https://github.com/void-linux/xmirror/archive/refs/tags/v${version}.tar.gz"
+checksum=0792cc7425bfe46353568de99233d24d7456e0081e0f7947540018f1f831d360
+mutable_files="/usr/share/xmirror/mirrors.lst"
+
+post_install() {
+ vlicense LICENSE
+}
From 08bc4cbf8ca9c66f15a7ee867a11d1b178ed987c Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 9 Feb 2023 23:00:30 -0600
Subject: [PATCH 341/356] Signal-Desktop: update to 6.5.1.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index c7389f4ed0e2..baf639ca1bfa 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=6.4.1
+version=6.5.1
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension
@@ -13,7 +13,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=899af104afe358413ebba2971ddb273ee788f7ffad9fdf96ece30e527eda3475
+checksum=553902fc571a0965538b6ade8e0bdd4056540c91165f49b5e7b826e0545302d8
nostrip_files="signal-desktop"
post_extract() {
From 93be0d31efdbf960c5061f29dbce6b3973962c46 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Fri, 10 Feb 2023 20:22:26 +0100
Subject: [PATCH 342/356] Thunar: update to 4.18.3
---
srcpkgs/Thunar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index abb46eb9a794..f41c1d34cd88 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
# Template file for 'Thunar'
pkgname=Thunar
-version=4.18.2
+version=4.18.3
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/thunar/Start"
changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=adfedd9d25428ddb750088f81d24c853ef4699230911994c8dfb90c5c5daa2be
+checksum=f402ea38519f3f803b8f06933c05ddbf8c0c61d2e8ef93fcbe1fc7f6525e3297
Thunar-devel_package() {
depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From 56793ef6caf042e3f01d50caf49dae3630a43e00 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 30 Jan 2023 11:18:33 +0000
Subject: [PATCH 343/356] cloudflared: update to 2023.2.1
---
srcpkgs/cloudflared/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index 8219fbe0f0af..c16c4ad65be7 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,6 +1,6 @@
# Template file for 'cloudflared'
pkgname=cloudflared
-version=2022.10.3
+version=2023.2.1
revision=1
build_style=go
go_import_path=github.com/cloudflare/cloudflared
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=e49db875da7513d8ae950b20c636225016022866850ff3df2484c0f56cdc4bc4
+checksum=468b0953eca6ab189859073067857062c91ed9adb18e12a43527e0dba3aa6409
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
From 1dc7865e3def8799d43384e0028957fc81bfb6aa Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 10 Feb 2023 13:48:59 +0100
Subject: [PATCH 344/356] drone-cli: update to 1.7.0.
---
srcpkgs/drone-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index d6d78631c001..2d835921b02b 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
# Template file for 'drone-cli'
pkgname=drone-cli
-version=1.6.2
+version=1.7.0
revision=1
build_style=go
go_import_path=github.com/drone/drone-cli
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/drone/drone-cli"
changelog="https://raw.githubusercontent.com/drone/drone-cli/master/CHANGELOG.md"
distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=7f0fc4c884eda352511c6d39e1ff0e3ebe97242c60f9f5fd983376b607b83148
+checksum=75f06372feb6aea6c52f06b09ade5a569a3c289346b0fe31a55df041bce576dc
From 6369894ad2d9623836f71cebf01e68cf9b67e47f Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 9 Feb 2023 23:05:49 +0100
Subject: [PATCH 345/356] gdu: update to 5.22.0.
---
srcpkgs/gdu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 5ef4a36a2661..f38a76403169 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
# Template file for 'gdu'
pkgname=gdu
-version=5.21.1
+version=5.22.0
revision=1
build_style=go
go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/dundee/gdu"
distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=b28fa52e7cae22ed1aa505718168408567ed74844ea68ca4339b18dceb2ea40b
+checksum=cb655d2c609925fb137357704dcbebf7d80796d9011ed43df8c79c18cfa893d7
post_install() {
vman gdu.1
From 723f56e5a17e83eaacea8368aedadfcddba10360 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 9 Feb 2023 23:11:19 +0100
Subject: [PATCH 346/356] vscode: update to 1.75.1
---
srcpkgs/vscode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ac5a91cb37bf..991d7c522c6a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.75.0
+version=1.75.1
revision=1
_electronver=19.0.8
_npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=719c1efeca10a163b18618b5b689d4843247d3e86a27a6e898113219274cb99c
+checksum=97500f244eacd66556c2bcf2d9a63b2509e363f9bc8d587c6fc2feb6bb1a5e31
nocross=yes # x64 build does not cut it, it contains native code
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From 12ad66c855dff2c3693cba0818ed4e078145571d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 30 Jan 2023 02:12:05 +0100
Subject: [PATCH 347/356] labwc: update to 0.6.1
---
srcpkgs/labwc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template
index 2b898a51bfb6..833963dc0512 100644
--- a/srcpkgs/labwc/template
+++ b/srcpkgs/labwc/template
@@ -1,6 +1,6 @@
# Template file for 'labwc'
pkgname=labwc
-version=0.6.0
+version=0.6.1
revision=1
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://labwc.github.io/"
changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md"
distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz"
-checksum=3a4ee960b4f764f276d581f83c95692c74c6a685e55438fb37ca6dd92e02f069
+checksum=c951050d4a2c2afc71d52d8138f8f4ef7ed2a2c9a337dc9de146c8b1e97cf952
post_install() {
local _example
From 9f526b707a37ee744cdc9dbcdb6cba3b31355509 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 8 Feb 2023 00:45:53 +0530
Subject: [PATCH 348/356] glab: update to 1.25.3.
---
srcpkgs/glab/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 840e13d8f160..3fe7ad7833a0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
# Template file for 'glab'
pkgname=glab
-version=1.24.1
+version=1.25.3
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://gitlab.com/gitlab-org/cli"
distfiles="https://gitlab.com/gitlab-org/cli/-/archive/v$version/cli-v$version.tar.gz"
-checksum=dc942f7806aa417714483bd5323bfcde9eceadd7ed33154f7a77038b416bdd95
+checksum=4cc090b9ad7ee6608d70e3a7fb5ca91a505eff12cf967a944bd0581cb6a83972
post_install() {
for shell in bash fish zsh; do
From f0a692e4af3700431fea227a9e65d70899c68ef4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 21:58:14 -0500
Subject: [PATCH 349/356] bemenu: update to 0.6.14
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 902198005c7a..d20d63c45d12 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.13
+version=0.6.14
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config wayland-devel scdoc"
@@ -12,7 +12,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=6032fae0253363a48171367c20982ef080ba5c163462732f0354dc8b606850f9
+checksum=bc945776f94901d0898d19725d3a4c3e1f5bc90712a5bae9ec98d89d24603a9d
bemenu-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 305e36a525bc0c2ead8fc73ea36f5d94086d4905 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 22:08:38 -0500
Subject: [PATCH 350/356] python3-lsp-server: update to 1.7.1
---
srcpkgs/python3-lsp-server/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
index 42f8b7703a33..a1ccc1e317bf 100644
--- a/srcpkgs/python3-lsp-server/template
+++ b/srcpkgs/python3-lsp-server/template
@@ -1,6 +1,6 @@
# Template file for 'python3-lsp-server'
pkgname=python3-lsp-server
-version=1.6.0
+version=1.7.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
@@ -16,14 +16,15 @@ license="MIT"
homepage="https://github.com/python-lsp/python-lsp-server"
changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-server/develop/CHANGELOG.md"
distfiles="${PYPI_SITE}/p/python-lsp-server/python-lsp-server-${version}.tar.gz"
-checksum=d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b
+checksum=67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6
do_check() {
python3 -m pytest \
--ignore=test/plugins/test_completion.py \
--ignore=test/plugins/test_pydocstyle_lint.py \
--ignore=test/plugins/test_rope_rename.py \
- --ignore=test/plugins/test_yapf_format.py
+ --ignore=test/plugins/test_yapf_format.py \
+ --ignore=test/plugins/test_autoimport.py
}
post_install() {
From dcb8b38b7199594c6dcf6815b316e696ce42cd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 26 Jan 2023 15:13:23 +0100
Subject: [PATCH 351/356] comrak: update to 0.16.0.
---
srcpkgs/comrak/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 82bf9b884fb9..de5c8679d4bd 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,24 +1,21 @@
# Template file for 'comrak'
pkgname=comrak
-version=0.15.0
+version=0.16.0
revision=1
build_style=cargo
short_desc="CommonMark + GFM compatible Markdown parser and renderer"
maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="BSD-2-Clause"
homepage="https://github.com/kivikakk/comrak"
+changelog="https://github.com/kivikakk/comrak/raw/main/changelog.txt"
distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=ffac6192d71733f0fa9a1097b98e80c8ad0bb34ce8bec6afc2502b58aa1012b7
+checksum=72f7ecbef6df715f14a61242fea0cbb450bbf1d10eb38acd99502daed04f8c07
case "$XBPS_TARGET_MACHINE" in
# Tests don't compile on i686: ran out of registers during register allocation
i686*) make_check=no ;;
esac
-post_patch() {
- cargo update -p autocfg:1.0.1 --precise 1.1.0
-}
-
post_install() {
vlicense COPYING
}
From d3a6c22db363568e57e86742379367b9e80f5ceb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 21:49:15 +0100
Subject: [PATCH 352/356] hyperrogue: update to 12.1i
---
srcpkgs/hyperrogue/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index 536d420d319f..6a08eb8fba8c 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,6 +1,6 @@
# Template file for 'hyperrogue'
pkgname=hyperrogue
-version=12.1h
+version=12.1i
revision=1
build_style=gnu-makefile
makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
homepage="https://www.roguetemple.com/z/hyper/"
changelog="https://raw.githubusercontent.com/zenorogue/hyperrogue/master/changelog.txt"
distfiles="https://github.com/zenorogue/hyperrogue/archive/refs/tags/v${version}.tar.gz"
-checksum=e13cd2a898f8cb216e30bafc2701d6d7a61ddde3fa2ccfe9ddf120436da72bc7
+checksum=8373264a1bbb9a77a1a71b6e2a544199ef3014f1fa7a661aab2bc6d8ba689817
nocross="Generates code from build output that must run on host"
# SDL_gfx-devel headers require that SDL.h be under the header search paths,
From ca5819d0ddd615853a6f7e7444300a75daad8d94 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 5 Feb 2023 15:44:48 -0500
Subject: [PATCH 353/356] kanshi: update to 1.3.1
---
srcpkgs/kanshi/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index b3a242a9df4b..e1dac36fc238 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,7 +1,7 @@
# Template file for 'kanshi'
pkgname=kanshi
-version=1.3.0
-revision=2
+version=1.3.1
+revision=1
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
makedepends="wayland-devel libvarlink-devel"
@@ -9,8 +9,9 @@ short_desc="Output profiles automatically enabled/disabled on hotplug"
maintainer="Stacy Harper <contact@stacyharper.net>"
license="MIT"
homepage="https://wayland.emersion.fr/kanshi/"
+changelog="https://git.sr.ht/~emersion/kanshi/refs"
distfiles="https://git.sr.ht/~emersion/kanshi/archive/v${version}.tar.gz"
-checksum=67a4fe896d97b7fbd3fcc51aab0fae550b4130b2df2b1df2a4d0e8d3221fe604
+checksum=733b2bdc8e57d0040f6f0ad91097548ced0188e8ae23b64fae96638a2be74375
post_install() {
vlicense LICENSE
From 4adb6b30ce3e3efa1f0c70b6d733cbd0b8901285 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 5 Feb 2023 13:22:07 +0100
Subject: [PATCH 354/356] chroma: update to 2.5.0.
---
srcpkgs/chroma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index a898b4192e70..94993e4d7afc 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
# Template file for 'chroma'
pkgname=chroma
-version=2.4.0
+version=2.5.0
revision=1
build_wrksrc="cmd/chroma"
build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/alecthomas/chroma"
distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=15289ce536e734767e06816c6bb33537121c3b70c2ecbc3431afe95942bb0fce
+checksum=ad0bce3d6ba4397a866e5c8728c146fb370a2b0adb1d35fccdf7d515a9c7f553
do_check() {
go test -v
From 34725bc9e6ecf5a93a899f4ad80529cccca2cd7a Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 10 Feb 2023 21:37:20 +0100
Subject: [PATCH 355/356] litterbox: update to 1.9.
---
srcpkgs/litterbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 5017f7d5a6cf..5031c4fbc4ee 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,7 +1,7 @@
# Template file for 'litterbox'
pkgname=litterbox
-version=1.8
-revision=4
+version=1.9
+revision=1
build_style=gnu-configure
make_build_target="all"
hostmakedepends="pkg-config"
@@ -10,5 +10,6 @@ short_desc="IRC logger"
maintainer="Allen Sobot <chilledfrogs@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://git.causal.agency/litterbox/"
+changelog="https://git.causal.agency/litterbox/tag/?h=${version}"
distfiles="https://git.causal.agency/litterbox/snapshot/litterbox-$version.tar.gz"
-checksum=54bebc3750f390813a3720eb0301ac4d852b30cb7b7605b178ed59aa51688552
+checksum=ffb02ca75c743ce88593e30236b9ffbf808c1bcfc194459c52b2df70e0e9e5a9
From 01844cf348dc3d7618a3e431dc8e702bb3ef185d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:46:48 +0530
Subject: [PATCH 356/356] Manual.md: add AGPL & X11 to list of licenses which
needs to be included
---
Manual.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index 31494036d5e2..0b6b5ab645fc 100644
--- a/Manual.md
+++ b/Manual.md
@@ -422,7 +422,7 @@ Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, cus
and thus have and require no license should use
`Public Domain`.
- Note: `MIT`, `BSD`, `ISC` and custom licenses
+ Note: `AGPL`, `MIT`, `BSD`, `ISC`, `X11`, and custom licenses
require the license file to be supplied with the binary package.
- `maintainer` A string in the form of `name <user@domain>`. The email for this field
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (3 preceding siblings ...)
2023-02-11 0:12 ` TrueTechie
@ 2023-02-11 0:12 ` TrueTechie
2023-02-11 0:27 ` [PR PATCH] [Closed]: " TrueTechie
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-11 0:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 853299 bytes --]
From 2226302c32a8917ea2645499751631b523b3ee40 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Sun, 29 Jan 2023 14:06:02 -0500
Subject: [PATCH 001/356] budgie-desktop: update to 10.7.
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
From 81a123eb3db87af2447d90f94089489b2600edc8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 27 Jan 2023 10:29:00 -0500
Subject: [PATCH 002/356] python3-ipython: update to 8.9.0.
---
srcpkgs/python3-ipython/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 6bf0006d2f2d..de43a28fb600 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython'
pkgname=python3-ipython
-version=8.8.0
+version=8.9.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://ipython.org/"
distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b
+checksum=71618e82e6d59487bea059626e7c79fb4a5b760d1510d02fab1160db6fdfa1f7
conflicts="python-ipython<=5.8.0_2"
do_check() {
From 532e959353da3baa93940d79d3d6c11c3f8c094c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 29 Jan 2023 20:53:23 +0100
Subject: [PATCH 003/356] cppcheck: update to 2.10.
---
srcpkgs/cppcheck/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 404080560200..05d5f921679b 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
# Template file for 'cppcheck'
pkgname=cppcheck
-version=2.9.3
+version=2.10
revision=1
build_style=gnu-makefile
make_build_args="
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
homepage="http://cppcheck.sourceforge.net"
changelog="https://sourceforge.net/p/cppcheck/news/"
distfiles="https://github.com/danmar/cppcheck/archive/${version}.tar.gz"
-checksum=46319ca73e33e4b2bd91981a76a0d4f184cd3f86b62dc18e8938eabacd3ad2e3
+checksum=785dcbf711048dfe43ae920b6eff2eeebb4a096e88188a40e173ca4c030f57c3
export CXXFLAGS="-DNDEBUG"
export LDFLAGS="-pthread"
From 4d0f5e920f02f59fa28773e4b41e14f61a4b06ab Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 29 Jan 2023 20:57:28 +0100
Subject: [PATCH 004/356] plocate: update to 1.1.18.
---
srcpkgs/plocate/patches/fix-missing-include.patch | 10 ++++++++++
srcpkgs/plocate/template | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/plocate/patches/fix-missing-include.patch
diff --git a/srcpkgs/plocate/patches/fix-missing-include.patch b/srcpkgs/plocate/patches/fix-missing-include.patch
new file mode 100644
index 000000000000..bbbc58d01beb
--- /dev/null
+++ b/srcpkgs/plocate/patches/fix-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/updatedb.cpp
++++ b/updatedb.cpp
+@@ -35,6 +35,7 @@
+ #include <arpa/inet.h>
+ #include <assert.h>
+ #include <chrono>
++#include <cinttypes>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <getopt.h>
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 04fd073d1036..f288bcf8dd32 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
# Template file for 'plocate'
pkgname=plocate
-version=1.1.17
+version=1.1.18
revision=1
build_style=meson
configure_args="
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
homepage="https://plocate.sesse.net/"
changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=5a622d8839de8f70aff74adca67336749cdc42a826575995b6b33a582bbf270b
+checksum=939657050b70719b01ce04fc1c8b64270062a0d53da2c72eafbe036a1964e12c
system_accounts="_plocate"
From a430239689f76edfb166e69954c1502edb129a99 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Fri, 27 Jan 2023 12:26:38 +0100
Subject: [PATCH 005/356] soju: update to 0.5.2.
---
srcpkgs/soju/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 9367a02139e5..1ed6735e63af 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,6 +1,6 @@
# Template file for 'soju'
pkgname=soju
-version=0.5.1
+version=0.5.2
revision=1
build_style=go
go_import_path="git.sr.ht/~emersion/soju"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
homepage="https://soju.im"
changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=52a8e3f832b0d897024ffcc85e2f4f4a07bb807be106cdc7090e220baba9f2d5
+checksum=243e97e89d1ab9db0757b4d9e2181bf9602bf1ca277aba665417ea788ef82d9b
conf_files="/etc/soju/config"
system_accounts="_soju"
make_dirs="/var/db/soju 0750 _soju _soju
From 16722d5958f2f013588f7907e9fe9c0b1d3148ce Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Fri, 27 Jan 2023 16:01:29 -0300
Subject: [PATCH 006/356] oil: update to 0.14.0
---
srcpkgs/oil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index c80e742d66aa..657a801d1aca 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
# Template file for 'oil'
pkgname=oil
-version=0.13.1
+version=0.14.0
revision=1
build_style=configure
configure_args="--prefix=/usr"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
license="Apache-2.0"
homepage="https://www.oilshell.org"
distfiles="https://www.oilshell.org/download/oil-${version}.tar.xz"
-checksum=2732a7af26d569774e54c97f3817b416a05389091cc526404f1ef73b6b39db89
+checksum=66b4f6bc77db7344bd43d7bd9438b2a6d7d20b7088890b3c0a8f453838a5ee86
register_shell="/usr/bin/osh /usr/bin/oil"
nocross="Build systems gets confused with host and cross toolchains/headers"
nostrip=yes
From e7457fca29b5a2febcff36445d74b3488aa1e7f4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 27 Jan 2023 00:38:44 +0530
Subject: [PATCH 007/356] puzzles: update to 20230123.1f72a1a.
---
srcpkgs/puzzles/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 49f13196e4e7..de21b52261c2 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,6 +1,6 @@
# Template file for 'puzzles'
pkgname=puzzles
-version=20210427.8ff394d
+version=20230123.1f72a1a
revision=1
build_style=cmake
configure_args="-DNAME_PREFIX=puzzles-"
@@ -9,9 +9,9 @@ makedepends="gtk+3-devel"
short_desc="Simon Tatham's Portable Puzzle Collection"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
-homepage="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=8ff394d1cc42efc3509135bbdd6ce92498eafcf3;sf=tgz>${pkgname}-${version#*.}.tgz"
-checksum=54c507b3e6607344e9c4d6ab7beb29369ffeaacf3bbd258c6e76432d35f0ad60
+homepage="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=1f72a1a2ecc89ba789a0b665a5e39da5febe27d2;sf=tgz>${pkgname}-${version#*.}.tgz"
+checksum=2a372deda982aff951bda19cb49dcf7fc56c14b63a7969763d95f1ebbc238906
post_install() {
vlicense LICENCE LICENSE
From 9512af70b84eed60433d708ee12768f13513d352 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 29 Jan 2023 01:21:32 +0530
Subject: [PATCH 008/356] usql: update to 0.13.6.
---
srcpkgs/usql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f9df1cc58716..15b1e8c0dcd9 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
# Template file for 'usql'
pkgname=usql
-version=0.13.5
+version=0.13.6
revision=1
build_style=go
go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=c6feec52395a93b705e00f2fb613d1dd581031bbabb6c39c9125ac000cc733e9
+checksum=1a640c65f8fd34dea8aed5ca4ebac93b3d4fe814d3613c88195515da77c98812
post_install() {
vlicense LICENSE
From d8afbf00fa7b42f711e5334124fdcbab3581a063 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 28 Jan 2023 17:56:23 -0300
Subject: [PATCH 009/356] icewm: update to 3.3.1.
---
srcpkgs/icewm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 11cf51a5ce47..4c09fa790838 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
# Template file for 'icewm'
pkgname=icewm
-version=3.3.0
+version=3.3.1
revision=1
build_style=cmake
make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
homepage="https://ice-wm.org/"
changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=b981f22bf02793b2e78cc455234cf7120454e75f9a3375fd0aa18cf372f39302
+checksum=988113f89d6f72272bc404cda0493be5118b43a1fe696792349cdf6d069f9817
# broken tests
make_check=no
From bed16aad170e2eaf49aeda57e646340f024d8863 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 28 Jan 2023 18:00:26 -0500
Subject: [PATCH 010/356] iwgtk: update to 0.9
---
srcpkgs/iwgtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwgtk/template b/srcpkgs/iwgtk/template
index 7a0a9e2bbde1..b8ecf896e259 100644
--- a/srcpkgs/iwgtk/template
+++ b/srcpkgs/iwgtk/template
@@ -1,6 +1,6 @@
# Template file for 'iwgtk'
pkgname=iwgtk
-version=0.8
+version=0.9
revision=1
build_style=meson
hostmakedepends="scdoc pkg-config gettext"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
homepage="https://github.com/J-Lentz/iwgtk"
changelog="https://raw.githubusercontent.com/J-Lentz/iwgtk/master/CHANGELOG"
distfiles="https://github.com/J-Lentz/iwgtk/archive/refs/tags/v${version}.tar.gz"
-checksum=38e81e67004bbd246b6551ffc812b6ab019f84a7329f134bb8031eb61d9d732c
+checksum=84a82dc730fe536034a65d148840e975c1353f4114db527439170ff410583d31
From 43927090f143c3ac0048048e2c2de6e153aa339f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 10:25:56 +0200
Subject: [PATCH 011/356] rssguard: update to 4.3.1.
---
srcpkgs/rssguard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index ff595110d429..4659b399ad89 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
# Template file for 'rssguard'
pkgname=rssguard
-version=4.2.7
+version=4.3.1
revision=1
build_style=cmake
configure_args="-DUSE_WEBENGINE=false"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-only"
homepage="https://github.com/martinrotter/rssguard"
distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=b3256bc2152683235b9b6f46ab195a3f7fb6c3c3c1e177525dd0523923f2e8d2
+checksum=a7eafa6a7b7a8cda801c0cf7a421bdb3e33ff1b6b3cdb69748052b4abe6dd7d0
post_install() {
# Install rssguard icon manually
From d10c59b19e053420c1c730035e51d1f49866de1c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 10:44:44 +0200
Subject: [PATCH 012/356] arc-theme: update to 20221218, adopt.
---
srcpkgs/arc-theme/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 86b487ffa9aa..e64b74a27b6b 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,14 +1,14 @@
# Template file for 'arc-theme'
pkgname=arc-theme
-version=20220405
+version=20221218
revision=1
build_style=meson
hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
makedepends="gtk+3-devel gtk4-devel"
depends="gnome-themes-extra gtk-engine-murrine"
short_desc="Flat theme with transparent elements for GTK and GNOME Shell"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="mobinmob <mobinmob@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/jnsh/arc-theme"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e
+distfiles="https://github.com/jnsh/arc-theme/archive/${version}.tar.gz"
+checksum=aa32825da7e2329fdaac64d35f0afab85e2e2f3c71cc41547bafafa379444ccf
From a8fba9946d243c4288ddc5233c593ea7bb8ee790 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:03:26 +0200
Subject: [PATCH 013/356] audacious: update to 4.2.
---
srcpkgs/audacious/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template
index ebeca48a6171..7df759a2f29a 100644
--- a/srcpkgs/audacious/template
+++ b/srcpkgs/audacious/template
@@ -1,7 +1,7 @@
# Template file for 'audacious'
#Keep in sync with audacious-plugins!
pkgname=audacious
-version=4.1
+version=4.2
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gtk) $(vopt_enable qt) --enable-libarchive"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://distfiles.${pkgname}-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=1f58858f9789e867c513b5272987f13bdfb09332b03c2814ad4c6e29f525e35c
+checksum=feb304e470a481fe2b3c4ca1c9cb3b23ec262540c12d0d1e6c22a5eb625e04b3
build_options="gtk qt"
build_options_default="qt"
From 38a0bfadf0a7155b1bf13287040837f7346d4116 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:03:31 +0200
Subject: [PATCH 014/356] audacious-plugins: update to 4.2.
---
srcpkgs/audacious-plugins/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index d0724c54b0ad..910ec0d1891f 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -1,8 +1,8 @@
# Template file for 'audacious-plugins'
#Keep in sync with audacious!
pkgname=audacious-plugins
-version=4.1
-revision=4
+version=4.2
+revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
hostmakedepends="gettext pkg-config glib-devel"
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://audacious-media-player.org/"
distfiles="https://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2"
-checksum=dad6fc625055349d589e36e8e5c8ae7dfafcddfe96894806509696d82bb61d4c
+checksum=6fa0f69c3a1041eb877c37109513ab4a2a0a56a77d9e8c13a1581cf1439a417f
build_options="gtk qt"
build_options_default="qt"
From 119efc596b6993ca93b6d13043a7636855180ba0 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 26 Jan 2023 15:59:20 +0000
Subject: [PATCH 015/356] rofi-rbw: update to 1.1.0.
---
srcpkgs/rofi-rbw/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template
index 7c4f3a7ce36f..0f84ee7f19d7 100644
--- a/srcpkgs/rofi-rbw/template
+++ b/srcpkgs/rofi-rbw/template
@@ -1,10 +1,10 @@
# Template file for 'rofi-rbw'
pkgname=rofi-rbw
-version=1.0.1
-revision=2
+version=1.1.0
+revision=1
build_style=python3-pep517
make_install_target="dist/rofi_rbw-${version}-py3-none-any.whl"
-hostmakedepends="python3-setuptools python3-wheel"
+hostmakedepends="python3-poetry-core"
depends="python3 python3-ConfigArgParse rbw"
short_desc="Rofi frontend for Bitwarden"
maintainer="Omar Zeghouani <omarzeghouanii@gmail.com>"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/fdw/rofi-rbw"
changelog="https://raw.githubusercontent.com/fdw/rofi-rbw/HEAD/CHANGELOG.md"
distfiles="https://github.com/fdw/rofi-rbw/archive/${version}.tar.gz"
-checksum=37f14462a7a918df2ac9350db8e3822fc7bf9af490dddb60299ea73c976f6c97
+checksum=eff1adac15b80532c1092bbdad89e586913da3a2336272c18f38475ea6f2dd3b
post_install() {
vman src/rofi_rbw/docs/rofi-rbw.1
From 61fdd8d0e715dc1e5a63042b62f09f72922424f6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 27 Jan 2023 00:20:55 +0530
Subject: [PATCH 016/356] gdown: update to 4.6.0.
---
srcpkgs/gdown/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template
index 6420b1c87e78..48c0ff75de40 100644
--- a/srcpkgs/gdown/template
+++ b/srcpkgs/gdown/template
@@ -1,9 +1,9 @@
# Template file for 'gdown'
pkgname=gdown
-version=4.2.0
-revision=2
+version=4.6.0
+revision=1
build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
+hostmakedepends="python3-setuptools"
depends="python3-filelock python3-requests python3-six python3-tqdm
python3-pysocks python3-BeautifulSoup4"
checkdepends="${depends} python3-pytest"
@@ -11,9 +11,8 @@ short_desc="Download a large file from Google Drive"
maintainer="travankor <travankor@tuta.io>"
license="MIT"
homepage="https://github.com/wkentaro/gdown"
-distfiles="https://github.com/wkentaro/gdown/archive/v${version}.tar.gz"
-checksum=24d159c7f9448bc864fef2dcc3d77c6b7b805654c5b2cf61bb05722fdef50049
-make_check=no # doesn't create egg-info during build
+distfiles="https://github.com/wkentaro/gdown/archive/refs/tags/v${version}.tar.gz"
+checksum=06862dc5ffae994a9cb11eb3015182c192bf80b8ed10d00d891c5560c4884128
post_install() {
vlicense LICENSE
From 85dc3ff85c77841a1c4cf1b154945e1889446bb8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 26 Jan 2023 00:44:50 +0530
Subject: [PATCH 017/356] glances: update to 3.3.1.1.
Adopt.
---
srcpkgs/glances/patches/no-check-update.patch | 52 +++++++++++--------
srcpkgs/glances/template | 8 +--
2 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/glances/patches/no-check-update.patch b/srcpkgs/glances/patches/no-check-update.patch
index 7b334f1551ff..1487ab0b3bdc 100644
--- a/srcpkgs/glances/patches/no-check-update.patch
+++ b/srcpkgs/glances/patches/no-check-update.patch
@@ -1,24 +1,30 @@
---- a/glances/main.py
-+++ b/glances/main.py
-@@ -97,6 +97,7 @@
- """Manage the command line arguments."""
- # Read the command line arguments
- self.args = self.parse_args()
-+ self.args.disable_check_update = False
+Description: Disable nagging suggestion to upgrade using pip
+Author: Sebastien Badia <sbadia@debian.org>
+Bug-Debian: https://bugs.debian.org/877127
+
+--- a/glances/standalone.py
++++ b/glances/standalone.py
+@@ -103,9 +103,6 @@
+ # Init screen
+ self.screen = GlancesCursesStandalone(config=config, args=args)
- def init_args(self):
- """Init all the command line arguments."""
-@@ -514,13 +515,6 @@
- )
- # Globals options
- parser.add_argument(
-- '--disable-check-update',
-- action='store_true',
-- default=False,
-- dest='disable_check_update',
-- help='disable online Glances version ckeck',
-- )
-- parser.add_argument(
- '--strftime',
- dest='strftime_format',
- default='',
+- # Check the latest Glances version
+- self.outdated = Outdated(config=config, args=args)
+-
+ @property
+ def quiet(self):
+ return self._quiet
+@@ -184,12 +181,3 @@
+
+ # Exit from export modules
+ self.stats.end()
+-
+- # Check Glances version versus PyPI one
+- if self.outdated.is_outdated():
+- print(
+- "You are using Glances version {}, however version {} is available.".format(
+- self.outdated.installed_version(), self.outdated.latest_version()
+- )
+- )
+- print("You should consider upgrading using: pip install --upgrade glances")
+
diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template
index d9ad47ccd85e..ace5c3b674ad 100644
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@@ -1,18 +1,18 @@
# Template file for 'glances'
pkgname=glances
-version=3.3.0.4
+version=3.3.1.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-future python3-psutil python3-defusedxml python3-packaging"
+depends="python3-psutil python3-defusedxml python3-packaging python3-ultrajson"
checkdepends="$depends"
short_desc="Cross-platform curses-based monitoring tool"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="LGPL-3.0-or-later"
homepage="https://nicolargo.github.io/glances/"
changelog="https://raw.githubusercontent.com/nicolargo/glances/develop/NEWS.rst"
distfiles="https://github.com/nicolargo/glances/archive/refs/tags/v${version}.tar.gz"
-checksum=464905c9b4806b80782eb8e43552ccbfa346d6f905f8a2d28de48613ccba0e53
+checksum=450c604ddfe05398ec88bd237648c7d851ad3c537b5f785eccafab4e9789c235
post_install() {
vsconf conf/glances.conf
From c04bcd29f8f534fa3f24430392c38b234fcbaf39 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 26 Jan 2023 21:15:14 +0000
Subject: [PATCH 018/356] xmlsec1: update to 1.2.37.
---
srcpkgs/xmlsec1/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 5e924fb02e6f..d57bd4b9f645 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,6 +1,6 @@
# Template file for 'xmlsec1'
pkgname=xmlsec1
-version=1.2.33
+version=1.2.37
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gnutls-devel"
@@ -10,8 +10,9 @@ short_desc="XML Security Library is a C library based on LibXML2"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://www.aleksey.com/xmlsec/"
+changelog="https://www.aleksey.com/xmlsec/news.html"
distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931
+checksum=5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c
pre_configure() {
autoreconf -if
From 03e0311d8a06118b7a55c516058e95b12d287451 Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Sat, 28 Jan 2023 11:36:44 -0300
Subject: [PATCH 019/356] chafa: update to 1.12.4
---
srcpkgs/chafa/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template
index 4eabb143fcf9..59b1fe14ee13 100644
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@@ -1,6 +1,6 @@
# Template file for 'chafa'
pkgname=chafa
-version=1.12.3
+version=1.12.4
revision=1
build_style=gnu-configure
configure_args="--enable-man"
@@ -10,8 +10,9 @@ short_desc="Versatile and fast Unicode/ASCII/ANSI graphics renderer"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
license="LGPL-3.0-or-later"
homepage="https://hpjansson.org/chafa/"
+changelog="https://raw.githubusercontent.com/hpjansson/chafa/master/NEWS"
distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
-checksum=2456a0b6c1150e25b64cd6a92810d59bed3f061f8b86f91aba5a77bc7cc76cfa
+checksum=9774bd1a7076ea3124f7fea811e371d0e1da2e76b7ac06260d63a86c7b1a573f
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*) ;;
From ed7fdead2fc79adf3e6000b0c135b600a9f835a5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 15:23:48 +0530
Subject: [PATCH 020/356] cargo-outdated: update to 0.11.2.
---
srcpkgs/cargo-outdated/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 2f4832fa7bd4..fc5ea5a43561 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,7 +1,7 @@
# Template file for 'cargo-outdated'
pkgname=cargo-outdated
-version=0.11.1
-revision=2
+version=0.11.2
+revision=1
build_style=cargo
hostmakedepends="pkg-config zlib-devel"
makedepends="libcurl-devel libgit2-devel openssl-devel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/kbknapp/cargo-outdated"
changelog="https://raw.githubusercontent.com/kbknapp/cargo-outdated/master/CHANGELOG.md"
distfiles="https://github.com/kbknapp/cargo-outdated/archive/refs/tags/v${version}.tar.gz"
-checksum=2d80f0243d70a3563c48644dd3567519c32a733fb5d20f1161fd5d9f8e6e9146
+checksum=7e82d1507594d86cb1c2007d58e329a9780a22bdb0f38d5e71d2692a7f1727d9
post_install() {
vlicense LICENSE-MIT
From f7668ff8e71a9e03c44aeecded0d2d0c60afd7e6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 12:17:53 +0530
Subject: [PATCH 021/356] glow: update to 1.5.0.
---
srcpkgs/glow/template | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index 6b283d3d6ab7..ce2cff4a3f0c 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,16 +1,22 @@
# Template file for 'glow'
pkgname=glow
-version=1.4.1
+version=1.5.0
revision=1
build_style=go
go_import_path=github.com/charmbracelet/glow
+go_ldflags="-X main.Version=${version}"
short_desc="Render markdown on the CLI, with pizzazz"
maintainer="klardotsh <josh@klar.sh>"
license="MIT"
homepage="https://github.com/charmbracelet/glow"
-distfiles="https://github.com/charmbracelet/glow/archive/v${version}.tar.gz"
-checksum=ff6dfd7568f0bac5144ffa3a429ed956dcbdb531487ef6e38ac61365322c9601
+distfiles="https://github.com/charmbracelet/glow/archive/refs/tags/v${version}.tar.gz"
+checksum=66f2a876eba15d71cfd08b56667fb07e1d49d383aa17d31696a39e794e23ba92
post_install() {
+ for shell in bash fish zsh; do
+ CGO_ENABLED=0 GOARCH= go run . completion ${shell} > glow.${shell}
+ vcompletion glow.${shell} ${shell}
+ done
+
vlicense LICENSE
}
From a7b5e7ab70d3ca151b0ee96dab5be6b874115c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 23:31:43 +0000
Subject: [PATCH 022/356] amiri-font: update to 1.000.
---
srcpkgs/amiri-font/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template
index e18346b4c78c..8b07c0a52284 100644
--- a/srcpkgs/amiri-font/template
+++ b/srcpkgs/amiri-font/template
@@ -1,6 +1,6 @@
# Template file for 'amiri-font'
pkgname=amiri-font
-version=0.117
+version=1.000
revision=1
hostmakedepends="unzip"
depends="font-util"
@@ -8,9 +8,9 @@ short_desc="Classical Arabic typeface in Naskh style"
maintainer="John <me@johnnynator.dev>"
license="OFL-1.1"
homepage="https://github.com/alif-type/amiri/"
-changelog="https://github.com/alif-type/amiri/blob/master/NEWS.md"
+changelog="https://raw.githubusercontent.com/aliftype/amiri/main/NEWS.md"
distfiles="https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"
-checksum=9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7
+checksum=926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30
font_dirs="/usr/share/fonts/TTF"
do_install() {
From 4d614ff83a7fb10d5b398a30800d4ae9dae81562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 28 Jan 2023 12:58:45 +0100
Subject: [PATCH 023/356] git-cliff: update to 1.1.2.
---
srcpkgs/git-cliff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 908616fbe398..9596ab6b7436 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,6 +1,6 @@
# Template file for 'git-cliff'
pkgname=git-cliff
-version=1.1.1
+version=1.1.2
revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
homepage="https://github.com/orhun/git-cliff"
changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=b77b0c0d999b6d5fe6a175ef603c373a72e0f197b45833213c1b97758b1b7a3f
+checksum=26f05e4cfea07768d06ae92cd4b34bae786ed354089d9b5b1659d6408bf583c6
post_install() {
vdoc README.md
From 7efa755fbd6ffb58e1539613976c19946f5af599 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 30 Jan 2023 02:29:06 +0100
Subject: [PATCH 024/356] topgrade: update to 10.3.0
---
srcpkgs/topgrade/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index d75994b394d7..429c0382e66b 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
# Template file for 'topgrade'
pkgname=topgrade
-version=10.2.4
+version=10.3.0
revision=1
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/topgrade-rs/topgrade"
distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
-checksum=b7390d609259a4fa4b4c2db6fdc685e12e65d2f9bc98d442d713bf1c9bce7677
+checksum=6ed1fa0ca3c2031e183ad8852de41be77e216076508e896fc38b7ad1cce15d0d
post_install() {
local topgrade="${DESTDIR}/usr/bin/topgrade"
From ab34749ae6e813b07c4b4307f0fe13aeccb25e4e Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Sun, 29 Jan 2023 20:59:52 -0300
Subject: [PATCH 025/356] anydesk: update to 6.2.1.
---
srcpkgs/anydesk/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 90c4c112d45c..eaec4b93ad60 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,7 +1,7 @@
# Template file for 'anydesk'
pkgname=anydesk
-version=6.2.0
-revision=2
+version=6.2.1
+revision=1
archs="x86_64"
create_wrksrc=yes
hostmakedepends="patchelf"
@@ -16,8 +16,8 @@ restricted=yes
distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
-checksum="49ffb7e2a0ac1f44319cbf221606e25171cc2a6925b5b31aad484b290740d48e
- 93ce67407d855b21170e007e3dde324ad7cd0a3922206136bc0fd84d72da2b8a"
+checksum="68f8395a0c84f2560ffa425497fbf9846a61bb2dbc4b1010a8ffca7856514ab2
+ 96a7ded2144ecdaff381c34e49eee3275caaaac00847e91abf5e7783706c989c"
do_build() {
From f42e18966805e9d21bfdbcf4912c8c5bdff0a7e8 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sat, 28 Jan 2023 15:00:30 +0100
Subject: [PATCH 026/356] bird: update to 2.0.12
---
srcpkgs/bird/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template
index ba6462287da6..715f961da8a2 100644
--- a/srcpkgs/bird/template
+++ b/srcpkgs/bird/template
@@ -1,6 +1,6 @@
# Template file for 'bird'
pkgname=bird
-version=2.0.11
+version=2.0.12
revision=1
build_style=gnu-configure
hostmakedepends="flex"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://bird.network.cz"
changelog="https://gitlab.nic.cz/labs/bird/-/raw/master/NEWS"
distfiles="https://bird.network.cz/download/bird-${version}.tar.gz"
-checksum=60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6
+checksum=3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53
conf_files="/etc/bird.conf"
system_accounts="_bird"
From 3bb0cb735a4db81de2ff82e5b5fbbcdda16a28ca Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 29 Jan 2023 20:03:37 +0100
Subject: [PATCH 027/356] monitoring-plugins: update to 2.3.2
---
srcpkgs/monitoring-plugins/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 1000998c221f..9fec5562a9cc 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,6 +1,6 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
-version=2.3.1
+version=2.3.2
revision=1
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.monitoring-plugins.org/"
changelog="https://www.monitoring-plugins.org/news/index.html"
distfiles="${homepage}/download/${pkgname}-${version}.tar.gz"
-checksum=f56eb84871983fd719247249e3532228b37e2efaae657a3979bd14ac1f84a35b
+checksum=8d9405baf113a9f25e4fb961d56f9f231da02e3ada0f41dbb0fa4654534f717b
do_configure() {
./configure ${configure_args} --with-ping-command='/usr/bin/iputils-ping -n -U -w %d -c %d %s' --with-ping6-command='/usr/bin/iputils-ping6 -n -U -w %d -c %d %s'
From 476486d2a0c08d331054f63c37aa1e6dc8f99d52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 28 Jan 2023 06:46:52 -0500
Subject: [PATCH 028/356] .github/workflows: use treeless-checkout-action
---
.github/workflows/build.yaml | 34 ++--------------------------------
.github/workflows/cycles.yml | 17 +----------------
2 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2a89fd11cd0e..22cbaa0a1ffe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,22 +27,7 @@ jobs:
steps:
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- run: common/travis/changed_templates.sh
- run: common/travis/fetch-xbps.sh
- run: common/travis/fetch-xtools.sh
@@ -87,22 +72,7 @@ jobs:
xbps-install -yu
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
ln -s "$(pwd)" /hostrepo &&
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index be631da5f274..4c3aeb42cc2b 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -27,22 +27,7 @@ jobs:
xbps-install -y python3-networkx github-cli
- name: Clone and checkout
- run: |
- REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;')
- /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m'
- git clone --progress --no-checkout --filter=tree:0 \
- "${{ github.server_url }}/${{ github.repository }}" "$PWD"
- git config --global --add gc.auto 0
- git config --global --add safe.directory "$PWD"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m'
- git fetch --prune --progress --filter=tree:0 origin \
- +refs/heads/*:refs/remotes/origin/* \
- +${{ github.ref }}:"${REMOTE_REF}"
- echo "::endgroup::"
- /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m'
- git checkout --progress --force "${REMOTE_REF}"
- echo "::endgroup::"
+ uses: classabbyamp/treeless-checkout-action@v1
- name: Create hostrepo and prepare masterdir
run: |
From e1ee89728ab65dff938ba68ff45338a89ba2f91c Mon Sep 17 00:00:00 2001
From: Vinfall <neptuniahuai0tc@riseup.net>
Date: Fri, 27 Jan 2023 17:53:54 +0800
Subject: [PATCH 029/356] retroarch: update to 1.4.0
---
srcpkgs/retroarch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 9033ba001ca6..240d3df9db00 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.13.0
+version=1.14.0
revision=1
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
@@ -24,7 +24,7 @@ license="GPL-3.0-or-later"
homepage="https://www.retroarch.com/"
changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=7f33bfb821440b2e30eb6c9d63eb4e2da1d2910ae90b43f691e3c28759739710
+checksum=aa4d579bfceb43450725171f594f69877f007a8892cb46678f8b62935c4de635
build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"
From 53be0a8afe63bf3c90259c8906f039bd957fc46b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 29 Jan 2023 21:25:34 -0600
Subject: [PATCH 030/356] python3-rich: update to 13.3.1.
---
srcpkgs/python3-rich/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 616979d4b4b5..2ad4dac03927 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
# Template file for 'python3-rich'
pkgname=python3-rich
-version=13.2.0
+version=13.3.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/willmcgugan/rich"
distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=f1a00cdd3eebf999a15d85ec498bfe0b1a77efe9b34f645768a54132ef444ac5
+checksum=125d96d20c92b946b983d0d392b84ff945461e5a06d3867e9f9e575f8697b67f
make_check=extended # some checks only work on windows
post_install() {
From 98d6538d7e6f1409dfc8bf1b991055327679c778 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 30 Jan 2023 16:33:00 +0100
Subject: [PATCH 031/356] kubernetes: update to 1.26.1.
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index bcd183b132a7..d0f32fb71150 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.26.0
+version=1.26.1
revision=1
archs="x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=a0de781db6d09d91f39306740420f150c5912606f52e4c9a859649f4313fe508
+checksum=0e19d477b5123c74d12bb46bc72e5b6f4c407473af3772ef31cfff3a1d64d311
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 010e436d2d408a0902ec5f572a10b853c3230d8e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 15:04:49 +0530
Subject: [PATCH 032/356] python3-tabulate: update to 0.9.0.
---
srcpkgs/python3-tabulate/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template
index 742c83364fe6..dd8e240dc6ee 100644
--- a/srcpkgs/python3-tabulate/template
+++ b/srcpkgs/python3-tabulate/template
@@ -1,17 +1,18 @@
# Template file for 'python3-tabulate'
pkgname=python3-tabulate
-version=0.8.10
-revision=2
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+version=0.9.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-wcwidth"
checkdepends="python3-pytest $depends"
short_desc="Pretty-print tabular data (Python3)"
maintainer="Ishaan Bhimwal <ishaanbhimwal@protonmail.com>"
license="MIT"
-homepage="https://github.com/astanin/python-tabulate"
+homepage="https://pypi.org/project/tabulate/"
+changelog="https://raw.githubusercontent.com/astanin/python-tabulate/master/CHANGELOG"
distfiles="${PYPI_SITE}/t/tabulate/tabulate-${version}.tar.gz"
-checksum=6c57f3f3dd7ac2782770155f3adb2db0b1a269637e42f27599925e64b114f519
+checksum=0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c
post_install() {
vlicense LICENSE
From f259a83666ce54c17073afb655e5987e9ba479da Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 15:00:15 +0530
Subject: [PATCH 033/356] python3-cli_helpers: update to 2.3.0.
---
srcpkgs/python3-cli_helpers/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index ed7c0d535b4a..84ac83a5b14c 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,18 +1,18 @@
# Template file for 'python3-cli_helpers'
pkgname=python3-cli_helpers
-version=2.2.1
-revision=2
+version=2.3.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-configobj python3-tabulate"
+depends="python3-configobj python3-tabulate python3-Pygments"
checkdepends="python3-pytest ${depends}"
short_desc="Python helpers for building command-line apps"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
license="BSD-3-Clause"
-homepage="https://github.com/dbcli/cli_helpers"
+homepage="https://cli-helpers.rtfd.io/"
changelog="https://raw.githubusercontent.com/dbcli/cli_helpers/main/CHANGELOG"
distfiles="${PYPI_SITE}/c/cli_helpers/cli_helpers-${version}.tar.gz"
-checksum=0ccc1cfcda1ac64dc7ed83d7013055cf19e5979d29e56c21f3b692de01555aae
+checksum=e7174d003a2b58fd3e31a73fbbc45d5aa513de62cbd42d437f78b9658bd5f967
post_install() {
vlicense LICENSE
From 4cb08448f73fe2ab97a3ce12560746c50508e705 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 14:54:10 +0530
Subject: [PATCH 034/356] litecli: update to 1.9.0.
---
srcpkgs/litecli/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/litecli/template b/srcpkgs/litecli/template
index 2d94d3422c73..a00ddd531865 100644
--- a/srcpkgs/litecli/template
+++ b/srcpkgs/litecli/template
@@ -1,7 +1,7 @@
# Template file for 'litecli'
pkgname=litecli
-version=1.8.0
-revision=2
+version=1.9.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-click python3-Pygments python3-prompt_toolkit python3-sqlparse python3-configobj python3-cli_helpers"
@@ -10,9 +10,9 @@ short_desc="CLI for SQLite Databases with auto-completion and syntax highlightin
maintainer="Kye Shi <shi.kye@gmail.com>"
license="BSD-3-Clause"
homepage="https://litecli.com"
-distfiles="https://github.com/dbcli/litecli/archive/refs/tags/v${version}.tar.gz"
-checksum=83d55a741aa9d11ff853662e424d205b9f919bfe3ef7233a1f74a7f92075b802
-
+changelog="https://raw.githubusercontent.com/dbcli/litecli/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/litecli/litecli-${version}.tar.gz"
+checksum=21af2cfa083dd4df1e3ccaa2a2117129b5f17212756f596ea090e296776c27a1
post_install() {
vlicense LICENSE
From ac271e5f6c992e30a46b1ee8b1a69fb0c5a1a9c9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:09:36 +0100
Subject: [PATCH 035/356] sysstat: update to 12.6.2.
---
srcpkgs/sysstat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template
index 05f8822126b8..2d60e5ef8446 100644
--- a/srcpkgs/sysstat/template
+++ b/srcpkgs/sysstat/template
@@ -1,6 +1,6 @@
# Template file for 'sysstat'
pkgname=sysstat
-version=12.6.1
+version=12.6.2
revision=1
build_style=gnu-configure
configure_args="--enable-copy-only --disable-file-attr
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="http://pagesperso-orange.fr/sebastien.godard/"
distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.xz"
-checksum=18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342
+checksum=3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48
post_extract() {
vsed -i 's/lib64/lib/' configure
From 8207be9f2b1ad420cdaaaad21b56276d2077a27b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:16:07 +0100
Subject: [PATCH 036/356] sbcl: update to 2.3.1.
---
srcpkgs/sbcl/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 96168debc0bf..f6c5616be56c 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
# Template file for 'sbcl'
pkgname=sbcl
-version=2.3.0
+version=2.3.1
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
@@ -15,7 +15,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
-checksum=bf743949712ae02cb7493f3b8b57ce241948bf61131e36860ddb334da1439c97
+checksum=0ad5b600ea3389afe361672a54dc0d17dc519166da501b136b3013b237da049d
nocross=yes
nopie=yes
@@ -23,7 +23,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
- checksum+=" fb3047c7a1c391b80a169197cc9fd6fe5fa97aff409a9814581852430ee39921"
+ checksum+=" 76e7c33c2f4886979bc462ab1ac04ad20ebe87165890af9aab14c902c3cdcaae"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
From 7bf396fd46eee8f09af844bd1ae648aff7262974 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:19:00 +0100
Subject: [PATCH 037/356] libimagequant: update to 2.18.0.
---
srcpkgs/libimagequant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libimagequant/template b/srcpkgs/libimagequant/template
index 0d4bcf6a0b89..7d2c74b7629d 100644
--- a/srcpkgs/libimagequant/template
+++ b/srcpkgs/libimagequant/template
@@ -1,6 +1,6 @@
# Template file for 'libimagequant'
pkgname=libimagequant
-version=2.17.0
+version=2.18.0
revision=1
build_style=configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/lib/"
distfiles="https://github.com/ImageOptim/libimagequant/archive/${version}.tar.gz"
-checksum=9f6cc50182be4d2ece75118aa0b0fd3e9bbad06e94fd6b9eb3a4c08129c2dd26
+checksum=790d2593a587f9a27cec6245ee7a212b34b0aa63cac6383e550eda01236be636
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --enable-sse";;
From 0937a9ed3d5134c6f7ba532bb80a5a6bde8c648f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 15:19:06 +0100
Subject: [PATCH 038/356] pngquant: update to 2.18.0.
---
srcpkgs/pngquant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pngquant/template b/srcpkgs/pngquant/template
index 8d72b2c6a6dc..3e93e4cdf81b 100644
--- a/srcpkgs/pngquant/template
+++ b/srcpkgs/pngquant/template
@@ -1,6 +1,6 @@
# Template file for 'pngquant'
pkgname=pngquant
-version=2.17.0
+version=2.18.0
revision=1
build_style=gnu-configure
configure_args="--with-openmp"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pngquant.org/"
distfiles="https://github.com/kornelski/pngquant/archive/${version}.tar.gz"
-checksum=bc1baa43c814b4416bb63d7b2168d4e5395cfc69a00f8997a595361caa507887
+checksum=424ff432e51dfc3cf5ff8001ad1b64198850686c5e3c26ecd477e4b69ef4fade
make_check_target=test
case "$XBPS_TARGET_MACHINE" in
From 96438cf23eba7eb3161df495ad7cfc7a436999f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 30 Jan 2023 17:37:37 +0100
Subject: [PATCH 039/356] linux5.10: update to 5.10.165.
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index ebc8063333e7..96fc6990aefa 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.10'
pkgname=linux5.10
-version=5.10.162
+version=5.10.165
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
- be4e77135f82a8990906bfdfaddd36eb679e82dfcb11f11377385a788a0a5b44"
+ 1933007150bf07d610f8cac61d25f2e650532a8f81781e6d542fd2fde4c40147"
python_version=3
skip_extraction="patch-${version}.xz"
From 295edb6043367c72b807bdaaaeb56d674b2e1e8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 24 Jan 2023 07:52:18 -0500
Subject: [PATCH 040/356] dkms: update to 3.0.10.
---
srcpkgs/dkms/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index 61afd2bbf085..5da51b101a8c 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -1,7 +1,7 @@
# Template file for 'dkms'
pkgname=dkms
-version=3.0.6
-revision=2
+version=3.0.10
+revision=1
conf_files="/etc/dkms/framework.conf"
depends="bash kmod gcc make coreutils xbps-triggers>=0.123_1"
short_desc="Dynamic Kernel Module Support"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/dell/dkms"
distfiles="https://github.com/dell/dkms/archive/v${version}.tar.gz"
-checksum=1e1ae273d2a72e3a89b829f3c72f482fb903f12cf766c054d11612e1d70795b4
+checksum=1eba13bf3a2c140c21e9ba31c1db9e9b8eac55658291340b0e50b965565f9ef7
# dkms does not create this directory, but needs it
# https://github.com/void-linux/void-packages/issues/39066
make_dirs="/var/lib/dkms 0755 root root"
From d3db6fd9a82f4ffaddabba6031aba1a679763d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 30 Jan 2023 20:20:44 +0100
Subject: [PATCH 041/356] glmark2: update to 2023.01.
---
...3f53c96dc8a4048b17dc16147a8fac782d4a.patch | 24 -------------------
srcpkgs/glmark2/template | 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
diff --git a/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch b/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
deleted file mode 100644
index 3e60a442d1b4..000000000000
--- a/srcpkgs/glmark2/patches/d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001
-From: Alexandros Frantzis <alexandros.frantzis@collabora.com>
-Date: Mon, 14 Feb 2022 13:54:09 +0200
-Subject: [PATCH] libmatrix: Add missing <utility> include
-
-Fixes compilation with GCC 12.
-
-Fixes #169
----
- src/libmatrix/program.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
-index f95b470..1c9de08 100644
---- a/src/libmatrix/program.h
-+++ b/src/libmatrix/program.h
-@@ -15,6 +15,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <utility>
- #include "mat.h"
-
- // Simple shader container. Abstracts all of the OpenGL bits, but leaves
diff --git a/srcpkgs/glmark2/template b/srcpkgs/glmark2/template
index 91f4ed55a00c..8d4aa5f503c1 100644
--- a/srcpkgs/glmark2/template
+++ b/srcpkgs/glmark2/template
@@ -1,6 +1,6 @@
# Template file for 'glmark2'
pkgname=glmark2
-version=2021.12
+version=2023.01
revision=1
build_style=meson
configure_args="-Dflavors=$(vopt_if wayland 'wayland-gl,wayland-glesv2,')$(vopt_if x11 'x11-gl,x11-glesv2,')drm-gl,drm-glesv2"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/glmark2/glmark2"
changelog="https://raw.githubusercontent.com/glmark2/glmark2/master/NEWS"
distfiles="https://github.com/glmark2/glmark2/archive/${version}.tar.gz"
-checksum=9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95
+checksum=5479ce8f90fabcfee3b3e8d929f2a68e9669ac223bb4df723963534b47d32dc3
build_options="wayland x11"
build_options_default="wayland x11"
From a3c60fd094217fd91ed4cc12610a34cce5d6aa68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 30 Jan 2023 21:30:19 +0100
Subject: [PATCH 042/356] adwaita-qt: update to 1.4.2.
---
srcpkgs/adwaita-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/adwaita-qt/template b/srcpkgs/adwaita-qt/template
index 806050a89f3a..0d50552ecd17 100644
--- a/srcpkgs/adwaita-qt/template
+++ b/srcpkgs/adwaita-qt/template
@@ -1,6 +1,6 @@
# Template file for 'adwaita-qt'
pkgname=adwaita-qt
-version=1.4.1
+version=1.4.2
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2.0-or-later"
homepage="https://github.com/FedoraQt/adwaita-qt"
distfiles="https://github.com/FedoraQt/adwaita-qt/archive/${version}.tar.gz"
-checksum=834f2caaf031306b63b31ad6fec489482feda35e9aa260f205cbb976cde97b1d
+checksum=481bcbb9c62f278aa7eb03420e1d6a265ddd5fc53502602f5fbae69ac8a868ef
post_install() {
vdoc README.md
From 058443ba82dd3841920d256c0b1c932a1c84100c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 31 Jan 2023 16:11:33 +0100
Subject: [PATCH 043/356] firefox: update to 109.0.1.
---
srcpkgs/firefox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3683502c99ce..784ad493d3dc 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=109.0
+version=109.0.1
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351
+checksum=5e43fdfb3923ee3a7ae7bc91ef3377a3fc6f8a0c1b87436c19b29458b0d731d9
lib32disabled=yes
From 2a3e1157774ad43cddc1847f916424eb25236c94 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 31 Jan 2023 16:11:41 +0100
Subject: [PATCH 044/356] firefox-i18n: update to 109.0.1.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9028fbe456a8..6037a395ef00 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=109.0
+version=109.0.1
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="ad1c07264af5102ece174f8e639c200420593ffaa83b31c8b8c3e7004e98aa6d
- 0a9e87d7b2e0ea06f82b8923dc165ff6a028d2be5fb70c9085f8b670422dfc60
- dbffb9aaa0df62f417e31a0c59c1a7cf7be8a2db6cd29832c92f843ef0f61777
- 790dcfec74f1f655dba60e849f3ed36c3a89532dedc7bbec989851ae37e633cd
- 2b116dee6b4bf3365f0ff73cb8d0ce497abcf37af922c0f0e07d5d0cd3e36d79
- 98e52b8cadafc173cc7eb575d65fd217789ab9a31bb10cbba2b2d8e48bbdcdcf
- 448029d13631fd06df67f72cd0a0085c0a4386a65b8d8065817d37f3defdd0fc
- 7d37a78a1d94634880b7ddb77c23de306176eb66fdbdac9273503fb95cf94ef4
- d4f999352230b596ac55ca4f9783a3226c5c108272372f4ea6bb2b7ca568b953
- 7e93c25c3fd345e2f5f552bba0843c8aa4af5fe1029ae443629b40295331e0d1
- e96b6083a78d8cbeb62e1f235b33e33db2ed15701b3a34b50079f77784b93747
- 18ab79f941c32b6ec6f0ace1088466dffdb9429f7a9ac30611e64f2ff10c8747
- 0d74a74b0b647c0d56aef85af469831b383d81ea997947bb303742afdff95cf5
- 253b49eb79f762fa9c1855fab6a3640d24e62ab3166a63d1ba25ccabd6d2472e
- e6f12f541fbf4c770538c712d7c435e0db9874c9dd64e609ccc84d65ce3e3c94
- dd8e343f30bd185483e2c0dcbbd51016e2b5879d3871145a04ba27e5c0c20772
- 1a9064365b03dd1aa6b04a60bf3cab2c8d5dc0ef60e8584c6927b1aeeef3b615
- b7ba8da5a61101299fa5329c9ccb3a52160a636e19dad3c8ac2a3933a0519429
- 92053a48f20325b59d2e9d7299cb428560720be6f8379f86f75fa0bb369da143
- 96ad98cad1062533e4e1c071a55b5a4195f7ee1182ff1626d2540f460a8ab939
- a22b1cb661049d8508727c1f4f22ecec9fe426932c16e3ce23d266ebc2d48f06
- 286ba6139da8f4cd0cd4e3cdea3f3cee6e0e7234082371c9090fe145009ab07a
- e4da3b03e1c710f0676b1af410ab1c7febd04fc92620ac62180abb6a61779b9a
- 72895cc614ae13f8ebc7d7f9dce21eed143db65f9903c2fbd53404ba1bbc00b2
- f4118a488a40c2f5732b1c3b0ba124cd21380f30bd4a3fe6c7280a259a3785dc
- 372442e330febcada243dc13d7d9da2df84f843b43fbf35f7150f5235eaa6b53
- 907257c5af58fab8369d53b6dbc853444ff31fd98e53fc6625a7472f80fed60c
- e731534e44144c9cc257ba877327b36dc68d485596e2a679fa08d85d976dd28f
- c53640e700d33b0116d4362eba98a414b7b74b544acccd78bb94820321332456
- 3cdbae880af63e763f3eeeb151973538acb668fd16c4a7e02d5aa9d81c431e5b
- 18b65d731b36af2abeddf8c81967dc12dcc24c28cf3f2af390777a2c3701ab0e
- 27041f682eb6c624f9efd3de6562fd5d35ab12588e759ef29d5a2dac9b46a36d
- 4d10b9d703ebf8dad7689d2f4908eccae269fe878b713bdb82e7ddf48f93d426
- 50d70a02d71409934f03308cafd06889dc3bfaffe5306fb0dace0e206dbdff39
- f3a166f0d4bad85a5d0b3a0d6766a90598cb90db2829b71cfa8fd49434580f23
- 466c4ab5152592bcc4d408304a6ab1768c3949407fc96eadd36363b0914c1c51
- 0e898583de196408db7d032228a7164c7370e0f83765ad7b201b6be0045e4f13
- ab332fbfba4cf7a8590ef74cf52040c9d1127c1d33c9366713b51c3315bca383
- 10309713093f05b30458df61df9752189067263aa1cbaec2b2f84e097d321e46
- ef81e086de88e40f4739369c308c8fbdea23e4ae986db0a2980351966ee24c00
- 1ba433ed2e487b2d1017991f9c53d1d7608c45bda30c1b872040a49f80c9b1ad
- 5c82f439876c6b96d584d7dc0cd67d1ed951e08ef16d94f0a26f54d963f9d893
- e33db77f3408a43f41f2dfc07eb4d1721bbd5b742e2867701732f48741c00ead
- 25e657fc58f8b6d90a2d1b1d61e19a04e69b27cf33911a8b076183fe6a7c0e33
- 57b798a9b539ac7830fad3087b37a4d16a3f0f12e635ff52cce0cebd7ca814be
- aa89da1272355ffe9fc045f0dc47c124f3cc52a6b732b015e12eefe87b382a94
- 26aecf208a7b19c36a88890deb49a9fdbe3df8a4fe513d4744957ad770465dd8
- a667ba25416d92a65684f3b039a24138895e092cb05bb2e831c9b40f969e1e7e
- 7c21214dcec3711a4e082780ff900528eb86bbe96569c2202c194afe558d49f6
- 661e9ca5715831c5e0ef59fb880f248d092b9be19dc94810a168d0c6af21f4fc
- 33705a6d8b31cabdd675e1aa952f7b2cbb9e3f0e726542dbf434a27c8fc2b19d
- 54b2ebf737f80bace727dcf8ef3c35bfd300c4bcc19d1780158d91645bcfcfa4
- 6b98c8a90fad1ca14c2c5fe16184b975c4e6a71073701ea0bab2669b52a40360
- ee4f64a55cca792cb500d0f969236f873030d8265f2ca427387c96b83d4fe8c7
- 1216752167975922c159a335d82e9ae2d57ece3e1cb362374c14e24cdc3130e1
- ae64421402cd98845885ef9827b83fb2e81116836afd1822a73f69bffff0efaa
- 62d1ae5129fd85d5d35d3a031dd9b021d56784d36a17a8c7a187de5dd524ca48
- 4f25d7aefc8db5dce6abb755df52fc778cb905aff041da82b8b48966b23627c0
- 25bcd72628b1f1eb9cde00390bc289061edec8d5e782bbeed61c0e8bcba95a4c
- f7c6a053db3b0ffdbbdd7d31b7a87ce17b606c9b34c9b6e2d7fa39fcd51c7abf
- 503a00c27d5fb455280026b6640a733532f34526dd3646dd90d251785deff3ab
- bbfb154a0a3f66ddf581250834b1a84ccc57e0bf31791126fc72bdf540fc53ab
- 2a3bd06b41ab5acc404c68ae79f350efae95dbb875959697b1fb073223f44bbf
- 6ce8fe5b269d130e721df5cc83b8d7751f509c722ac34c1cff65f2822c45588e
- 24f139e7026d65222877549d77a818f90227c4df1a4c55a77d8cf105196b4152
- f7134d2fcb4eae10f71d23a5cd913fa2e9f8144aec082b8bac1b6e90c5d5ccd8
- 937cbc6050fb49de1ee25ed40260cb1a2335dd3c45f36ef76c67c372abf31e2a
- 70752bf61cfb5aa796a66168a78fcdcc4b15eeae5fe833f0d7fa0f6a9a1d19bb
- b8c5de779cd49b1f3ff0aab7fdcfb3b0bc35febf0aedaf97931fc7c9929e4a30
- 8bd81860dac7b6c6ea23606a794c2e21c62e7d34e31a4b734b218a1f3087413d
- 9a83bc58005291560e4d41345b7bdde53a7d767f93800d354da50e02e9ae3d35
- e5ccdaf8da018b4e15fe9c22a3f08139530eed4fd63dbbb20c2af8d884c0ea51
- c591b6be0c4648332770ae9629dbd4218189e27fae15c7a20e50f934dd60ef04
- c6cdbaa051124cd1c5bfcc5625bb38929dccd73f45d8ede6e81e47b338165410
- 10e2fc8ad5963f4a2b6ccfa112cbbda613d599943e473ab12c832a829ee7f8c0
- f6eddf93b7f36560f2e8e48ee90d57ec7164d34f975edafd5dda138d134c56a4
- 4f64f238d148df1017a630418b9e310f3ad8c9556da38e05e714c2e3573b22ca
- 9ba2135bfcd1abcc425c0274cec8d75e131b58146149cf6c09cd0b6c32a98ba8
- 4aa78bb6c16188a46563bb915515a0594d9a35249a30f0a4146e88f17c8258ca
- 4629cd13b01ff4780f15e6910e2ab18acfecc959cf12ecc8ab4928873af4aaf6
- 6baf2ad82710e57624968ca19653ff19b807c6897108952e505bc047cc2681ba
- 90ccbec89eefe6c699c07d6c9ee4f9740ddfbcd9d5d42757f3bb04d29fdd6aa6
- 8cf650dd0fb52fba85099a79db507f9b673b73783af0dc4d4ab131b33a8c4865
- 18b480d7815a71c38afa700400986f91a329f37c5f120d5538d2800fc7287d0e
- da7a4d363c8140250f4748c6ef30e9bb758897a876b07ea9cecf837eb8c8801d
- 27a64ebb7c7ffeac4c180b8345f367d4d5a8f19f028bc7e7d3cce71387ada7a6
- 3b23c414022ec650ee1693d5afab1d3c7aead524a6a1d13a5a1aa2d89663656c
- 6629415d4104a095d51bd39d4c9c1b68bca2c8c74b4997bd58c86e38c29cb958
- 4b4628db7ef33b82489c7a0d284710ae66061ae7aa51905533a34325a963c12b
- ff6ac635724a3c7b8dbb4aa719ae08529472ed45f0548d0a114f47af35bd3cdf
- c99e343a501d33770e2d7f20c7bde511fd08513b193720311ba6be23c5cddbf9
- 88666d0e1c75df90439a0445f112b65b610ff88a533acfae8ec547923637e28d
- cb5089145a63e30c98ce5ecc4e7837dc6868ff17b7d69f8d29cf810be64c0866
- a55fa2143c1830c0c69242ec009791ad4782e89799a7c463e3011f46248377fe
- 1d7107de89100d505ce74d11668921bafec894268b14082361429ab504895db5
- b422c9d62e7f10786d897e91d97f07e17c50b6fba793590c6407bfdcf8e05be5"
+checksum="c90871f30511a1fd0239f111314df72d62bc97e0318b27b142a69061a690a433
+ 2ea425bb991cb7dcade08235bd6337541f428d81d47c6457c3e689fe2670187b
+ 391f11d828886b664313f396e9a2c37d9f84d870e44da4a20e6429f894993a3d
+ 0d16e860af4bf4469964a5e33e4b5955b279810c01f24b48a148caec33135999
+ f8169b1d0ea00a97f76170fd7fbf2f9c9410d5f5b7f76617898607afc8721659
+ f707aca4430030232dcb10db16b4e6f260eb1b190bf887c3e14f5a42f958f788
+ 8ca13bfee4ef7ecfbe56bddd39b380861a8917548ef40f845a10ef07f518b540
+ 7e92713edc65ff8220d225de0295e2e053b2ac109b9b5d1a62c4b2e6aef500b2
+ ac491c3d5762375af224ed8d3b7a3e87457d52dee8556a42984743f3664da47a
+ 43d5d15c31ff4469fb9623874fada0661e7d2d58778e83d6d387c2fbdaa62d4c
+ b7c27cedb4ad120bc7d96f4b780575a47774c104296dfb1044f087b0dfbb4cb8
+ db76502d94ae5428ce8649909d86b71af419e4d7911b60336b9336c0f336458b
+ a910a6b8fe220a3288405118cc58cf46072074beb338ed1de76ecea9b0b17483
+ e3039d85930fc2c3c91d433d910ffcf7d795a3c49a98c47a85fe7d492735cc8a
+ 62d29d77de557b0d5db21668c340ebb3126adf005e355c05efd688c45a9c9778
+ bf5435e2d4f30e7b2f2dfebbea72756ec0dd3d9c8d86e3ee783f9c5b0fbf5eab
+ de17150a12ef38ad96b413b4ea0adf6c22f9cc43acea864d147a52c343b6da48
+ 4d2f9ca150a09693860572ef3e506371eac9119380aa6fc69b4f8d765d19a47b
+ 0bdb31f365ed3faaa448655e9c84a7d45954967aeb3511dfb7ad9348e7ac8897
+ 529ab9871fd66b722500130acd4f443e04004e26af6047de6e90e48350d99a3a
+ efde26d2d7fb8f90d1d3b66ccd2d07d73aa1a68bb95982ca48af3d7e4b4ff59d
+ 563d588231f3cf0a2f2e8cfdb67f2d18cf10ab104c3c4cae158d3cb76f01a945
+ 1cecfc411164d5346221166fa6b97e61dbf049559e71a3f3b8bb4ed0168ae700
+ 2ae0ba26271ac4343eea9641676c1ca8938d580aa236266053535f4700daecef
+ edb82e33ce05e8d47f11e1ea183e6263e13bde4911494ea4df7330dcae72ca7d
+ aaf0a8b6b75e3b9b6ecb0910b00d6b331c850a0bb70dbf991150bffde4701cf9
+ af2e6bf160245b581afebaec182775ebef30a59bd0403bb1f6d40113d4e67c3c
+ ecb112af96e7a78281de6c2b8993fcf2e1a1ac553c858ec74b5071e6056c95e3
+ a2a2e3c75b493f76217374d285c39699b74199179c3147f15594655eddbeacac
+ 3cffa707743048855fab402484fd844deb82cd95a8798ecef12d2f1bcaf1b749
+ e512b0fe890cfeed3239d4ff6420dad4167f319e2a438c3518676b6b5af3a2ad
+ fb8fb5d905546e005085c060bb8a25f0a7bb6b7c32a5823276053119b95e6441
+ fbbf692126bfda1f640a66a3edd17accad2c62ef8cb9baf4f5722c910c4a5aca
+ e7efacde88f46fb5bae91751060e5af1279c8fac262a86100d22f5be9afac1a0
+ 92c701bb04ce94474ac2a00353f5fb7bba5420dd652364f5a62e2f2a939fe2e6
+ 043ac88c26986fe7c2086a87bd4e9399ad285025b313e5de1c80d5d401dde007
+ ba26a369aebcda2005ce250a2bd6ef7b420e482b604cfccb8c92b3492be7357f
+ 7c3209849d76f092c4cb506cbbf732659e36832e93638661b72b7df3038b10b1
+ f842a3b899296e7702449ebeef2aa145cd6bd19c11a3db3be44b1a1e735c297c
+ 740ab17e96fb20527965c68ec615fa9343b880caf992c48af78627ff53eac8ef
+ d6eb4f0c9fed7c5e20d7569562e812b0a93a978204e02133a86c615dc304740c
+ 1900d17b2c1fd0710a5bddd6a75e929a7a0fef1775c6392488648f09ec12a2f5
+ 84b06e36ead8be66b8b1f86e01ad97c3267111aa0167fca92dbecf3ab7196022
+ d6d2f95652d0245d475b6af4f638cb55140cc2a95a024000dd9428ea6981a06c
+ 1772f1f7a2ec0eaf19fa1beb9157d310d2ed8d18ea40faabcf84b27c377a90c2
+ 2471f410586f3e77827d3eb9d7f04e8d1965f6c2c2986f5fd500e62d1d2eb142
+ bda9f2307c199bf5073d087064feecf62cc536234f183b006bd472eb9894f508
+ a39834727af982049cafd5638cfd5b03ea562a9d4567a0c6daa70bd283304560
+ 850e06f39c51b3a41a766d431146baba25f903f3b375c57008d77910138861bb
+ 10fbc7cf3d74104601ae466b74be3925b94b54e42d37045d15a6a1ee219ccdfe
+ 02ec6d50bd6712bf3c34289d9352e0d95b934fdd835b7eb3957b1f058a93e2bc
+ ef3f2d5d7fa0c6edbc2ad039365cae0c284f3bbbc93bcba022d5ba66ccb8efb4
+ 9e9d43d3dc13a5d8086c3b967623fcd0ecc7cb40fb43206fbf108a21319398b9
+ 38a4f89f8acef81ca3971a12935e6eb099d7581ff9124db1424bb97482671e5b
+ 8eaeafc8260c983a8f34632f47ef47bca3d31aae8f06555f52268b6104426936
+ 7443367dc616d890912c2bde79524f9860017aacae895b7be11128ddf0466d39
+ 7cfe2388f3e207beafe83db99f5594d4e70fdbabeab6994f2e55b876bdab41bb
+ 5699823a1d0fa7670098db710d4e8e834234942f63890151b44c114c2871beaa
+ 08c85e71b090fc211add94883390d01899d0dcc592e9a6e9582b575cb875356e
+ b949c2430efd9ce30a198b0d02e33af14543e4f4785c2c17841eca572b5991db
+ 555d87901dc5c22eeb12b7a2704be3d8274556c387e88d46ee1cf3bf18a343c5
+ 4135f74736662a7bb40739d48cad652a478faf9a3971bc8a0748103d12ea0322
+ 93bc0c2b0bdd31c7e8e3563864721fd94ab01f6a4e7b36e339a925c865405836
+ 9bb9d2fda645d64503462731d0898216ca0f1a93e2e05b5b4ccc259462263637
+ da128795d8db727470ac1c4e7d283b6282a3cc40e35429b0ce5987ef6f4839f3
+ 02bbdb6c1951963e2210d2908c8ae654d1c72d73712306f4c9b17a5c481c2889
+ f3db9018d715ee0bc97c77467c688628a9286b164d011f61bdf2409181191a3c
+ 16101575d453cd58e2846c450d47589ccbe7a027fce8dc19006bdc98245ac80d
+ a77f8bec90e54255b15552fdea11d212c9763faed791149a30fa1715f46ff8a0
+ bfe4150c164c8aedab2246193616a4fe8417537214314b6a7c27f69e7064e0ef
+ 3ba92a02eeba86382200fa44e2e9fad0e4ab6783c2520ac4849123ed125afd28
+ 1936604c7c7dc78f2cd902a1f1ba9c575a5776f07121cada36d0db56105535ce
+ 89413f13098a132fcd9ab5230edcf03cd0f428c265f18d94567130319624faf6
+ d727e9851dd06d0e8396f5cc8b0b973ddb55d28b72666f8f1b2ae7fa91241190
+ 9890803e3b50de7ebcb88942086ba7d44c698b5019485f756203be7b071e045f
+ bfcc6b394403ccafedf0eb2194c8bd3634bdc9fba88ca7875605149df1d7cb95
+ d254fd7ec27d2a611f8e1cf39ee3b9b8d54b73bb7befc465e5e06f29c211fc1d
+ 25c6db9cea3fb8b23dfac272b1e6f980e0837ea923e7053f9ec50ad46b6ae388
+ 5acc2a35206fb82f7c11ffb44586c4eeb3bfda67bae9cd56b68c903c706867a1
+ 4eecaf6e949bc4db33bf9600c1728448d05ca57c241ec9bcf02bfa57416b22ff
+ e99e561e1540a2fd31581466c31495dfac606d85d25bab0ded5efc04f3937808
+ 936fd25b5980f7c074569c0870b872162188cf7bd542f2b2da7079a8e5c1e879
+ ebd12ebbb2acd170ed74f926815062fb869085721ebb80512f8b5b7fedb635d5
+ 38ae1ae06591304f88a2d894f7cdf1f67f18fe7cf6a9aa425df833b725990621
+ f0e83b35ffa3aa603e383a2846298a11d2dd4654b4566c8d3e5d49dd24a8e863
+ bfdb2af98916f2968a37c8755c7ba49fc1644ddd4c08f8d9615a0dcdd6b1a4d2
+ afd6b1d2f1ad6e0e4bcd206280950950e6a198694a0e6f741520be9cc286578f
+ 4d494351034b77005180260e2b1259f83f13ec8ffad12a1b64e151b8616f4acd
+ edb93b9dd44e96ac38d292f5d1a9112db152ed2495add62ac24b9a25132c9c2f
+ 864f9faef65d2afbc7955fbf96bdd55de7900865ca5b2e4870351b16d55f6327
+ 32205ee0538e995dff05036ab6d0958b16ac18ca850d952f32a1de2723196896
+ d34fe9233dde445e57b5d3a635c74a7404a4bfd58c15caf06983d4e90fc08016
+ 8876206a3affa3892ccf37d356a2bdaf13ef9c6e6b3b28fe9dae902aff77b3b7
+ c22dd129f70a222882fae0f8ce839a925b8102259f9c5a28399f8f6eb5b76b54
+ 0eb523bb0d18195e4db17560311450453f47e5d3ddb8df22dbba3328030a1d39
+ 4f6933bd681561a6c252549ac813bd9c28c25239e1899150289bf88c1109758f"
From f064b336c1ff796f076c437f9d72f216a379a336 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 31 Jan 2023 16:13:48 +0100
Subject: [PATCH 045/356] thermald: update to 2.5.2.
---
srcpkgs/thermald/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 53820690c8c1..b7947fbbddc0 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
# Template file for 'thermald'
pkgname=thermald
-version=2.5.1
+version=2.5.2
revision=1
archs="i686* x86_64*"
build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later"
homepage="https://github.com/intel/thermal_daemon"
distfiles="https://github.com/intel/thermal_daemon/archive/v${version}.tar.gz"
-checksum=75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5
+checksum=9c69588b94a98b4843cd46e3bae570f55020b5e2bf1b417a0c6990f6519070c9
conf_files='/etc/thermald/*'
if [ "$CROSS_BUILD" ]; then
From bb408e52d33bf9a90d2387baca9bc8c96b10d4c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 31 Jan 2023 09:28:27 -0500
Subject: [PATCH 046/356] libtpms: update to 0.9.5.
---
srcpkgs/libtpms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..81b940cdc823 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,6 +1,6 @@
# Template file for 'libtpms'
pkgname=libtpms
-version=0.9.4
+version=0.9.5
revision=1
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause, custom:IBM"
homepage="https://github.com/stefanberger/libtpms"
distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
-checksum=61d6f947a60686ec98e7cc5861f0999bd6cdaa1fc2b8901b8dc68d1a715b35cf
+checksum=9522c69001e46a3b0e1ccd646d36db611b2366c395099d29037f2b067bf1bc60
pre_configure() {
autoreconf -f -i
From a0029504ab2c1b4bdadf7328cbc7ed60058583c6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 31 Jan 2023 09:29:07 -0500
Subject: [PATCH 047/356] swtpm: update to 0.8.0.
---
srcpkgs/swtpm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..feb07c7bfb95 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,6 +1,6 @@
# Template file for 'swtpm'
pkgname=swtpm
-version=0.7.3
+version=0.8.0
revision=1
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/stefanberger/swtpm"
distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
-checksum=e856d1f5842fb3335164f02f2c545dd329efbc3416db20b7a327e991a4cd49c8
+checksum=ad433f9272fb794aafd550914d24cc0ca33d4652cfd087fa41b911fa9e54be3d
# check expects that root directory is setup fully for swtpm with e.g. tss user created
make_check=no
ignore_elf_files="/usr/share/swtpm/swtpm-localca"
From a425a12578990b6e36981294120d8864f90f095a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 5 Jan 2023 22:30:04 +0700
Subject: [PATCH 048/356] python3-Sphinx: update to 6.1.0.
---
srcpkgs/python3-Sphinx/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index d021cb7f9f29..7ff72dc54f3f 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,10 +1,10 @@
# Template file for 'python3-Sphinx'
pkgname=python3-Sphinx
-version=5.3.0
+version=6.1.0
revision=1
build_style=python3-pep517
make_install_target="dist/sphinx-$version-py3-none-any.whl"
-hostmakedepends="python3-flit_core"
+hostmakedepends="python3-flit_core python3-pyproject-hooks"
depends="python3-Jinja2 python3-docutils python3-Pygments
python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
python3-requests python3-packaging python3-sphinxcontrib-applehelp
@@ -12,13 +12,13 @@ depends="python3-Jinja2 python3-docutils python3-Pygments
python3-sphinxcontrib-jsmath python3-sphinxcontrib-qthelp
python3-sphinxcontrib-serializinghtml"
checkdepends="$depends python3-html5lib python3-mypy ImageMagick gettext
- python3-pytest"
+ python3-pytest python3-setuptools"
short_desc="Python 3 documentation generator"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="http://sphinx-doc.org"
distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5
+checksum=b0fd0a1993733492572bbd429b5ec081e17c082b5b5168ffae50524c3a90fd3c
conflicts="python-Sphinx>=0"
post_install() {
From 2b9380763db30ac366e436c1fd349441d78b5427 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 27 Jan 2023 10:45:20 -0500
Subject: [PATCH 049/356] poco: update to 1.12.4, orphan
---
common/shlibs | 26 +++++++++++++-------------
srcpkgs/poco/template | 11 ++++++-----
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..523fd15af734 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3006,19 +3006,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
libsigrokcxx.so.4 libsigrok-0.5.0_1
libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_3
-libPocoMongoDB.so.64 poco-1.9.4_3
-libPocoZip.so.64 poco-1.9.4_3
-libPocoData.so.64 poco-1.9.4_3
-libPocoNet.so.64 poco-1.9.4_3
-libPocoDataSQLite.so.64 poco-1.9.4_3
-libPocoFoundation.so.64 poco-1.9.4_3
-libPocoXML.so.64 poco-1.9.4_3
-libPocoUtil.so.64 poco-1.9.4_3
-libPocoRedis.so.64 poco-1.9.4_3
-libPocoEncodings.so.64 poco-1.9.4_3
-libPocoNetSSL.so.64 poco-1.9.4_3
-libPocoCrypto.so.64 poco-1.9.4_3
+libPocoJSON.so.94 poco-1.12.4_1
+libPocoMongoDB.so.94 poco-1.12.4_1
+libPocoZip.so.94 poco-1.12.4_1
+libPocoData.so.94 poco-1.12.4_1
+libPocoNet.so.94 poco-1.12.4_1
+libPocoDataSQLite.so.94 poco-1.12.4_1
+libPocoFoundation.so.94 poco-1.12.4_1
+libPocoXML.so.94 poco-1.12.4_1
+libPocoUtil.so.94 poco-1.12.4_1
+libPocoRedis.so.94 poco-1.12.4_1
+libPocoEncodings.so.94 poco-1.12.4_1
+libPocoNetSSL.so.94 poco-1.12.4_1
+libPocoCrypto.so.94 poco-1.12.4_1
libPtex.so ptex-2.3.2_1
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 008536b67121..6ca714b9e94f 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,16 +1,17 @@
# Template file for 'poco'
pkgname=poco
-version=1.9.4
-revision=3
+version=1.12.4
+revision=1
build_style=cmake
configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre2-devel expat-devel sqlite-devel"
short_desc="C++ class libraries for building network-based applications"
-maintainer="Julien Dehos <dehos@univ-littoral.fr>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSL-1.0"
homepage="https://pocoproject.org"
distfiles="https://pocoproject.org/releases/${pkgname}-${version}/${pkgname}-${version}-all.tar.gz"
-checksum=eb34f257b11240a711ee505f1d80c754a80a990aeb48d8d93407884df288fd77
+checksum=4c3584daa5b0e973f268654dbeb1171ec7621e358b2b64363cd1abd558a68777
+conflicts="archiver"
post_install() {
vlicense LICENSE
From 4c3bf3da2a55d9957549f86b0e7ca890d4d54be9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 27 Jan 2023 10:45:43 -0500
Subject: [PATCH 050/356] remwharead: bump for poco
---
srcpkgs/remwharead/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index e72ab06131e4..4af548c46743 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
@@ -9,7 +9,7 @@ short_desc="Saves URIs of things you want to remember in a database"
maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-only"
homepage="https://schlomp.space/tastytea/remwharead"
-distfiles="https://github.com/tastytea/remwharead/archive/${version}.tar.gz"
+distfiles="https://github.com/tastytea/remwharead/archive/refs/tags/${version}.tar.gz"
checksum=87f14a611e3ae9f9babe2dff8e4a6c4f5495fa2883393edb36e796af3f19fb30
remwharead-firefox-plugin_package() {
From 7dc0412dce16dc67a14aa0fa4b1d937c14d0a3bd Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 30 Jan 2023 10:45:04 -0500
Subject: [PATCH 051/356] mumble: bump for poco, patch for openssl3
---
srcpkgs/mumble/patches/openssl3.patch | 685 ++++++++++++++++++++++++++
srcpkgs/mumble/template | 2 +-
2 files changed, 686 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mumble/patches/openssl3.patch
diff --git a/srcpkgs/mumble/patches/openssl3.patch b/srcpkgs/mumble/patches/openssl3.patch
new file mode 100644
index 000000000000..906d1790444b
--- /dev/null
+++ b/srcpkgs/mumble/patches/openssl3.patch
@@ -0,0 +1,685 @@
+From f4cea62ed95e4967d8591f25e903f5e8fc2e2a30 Mon Sep 17 00:00:00 2001
+From: Terry Geng <terry@terriex.com>
+Date: Mon, 6 Dec 2021 10:45:11 -0500
+Subject: [PATCH] BUILD(crypto): Migrate to OpenSSL 3.0-compatible API
+
+OpenSSL 3.0 deprecated several low-level APIs and the usage of them
+caused errors/warnings that prevent the binary from being built against
+OpenSSL 3.0.
+Some primitive efforts have been made in #5317 but were incomplete.
+This commit follows https://www.openssl.org/docs/man3.0/man7/migration_guide.html,
+https://code.woboq.org/qt6/qtopcua/src/opcua/x509/qopcuakeypair_openssl.cpp.html,
+and clears all errors/warnings related to the usage of deprecated APIs.
+
+Fixes #5277
+Fixes #4266
+---
+ src/SelfSignedCertificate.cpp | 235 +++++++++++-----------------------
+ src/SelfSignedCertificate.h | 5 +
+ src/crypto/CryptStateOCB2.cpp | 53 +++++---
+ src/crypto/CryptStateOCB2.h | 9 +-
+ 4 files changed, 121 insertions(+), 181 deletions(-)
+
+diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp
+index a77e5fad91..ea0dec4cc7 100644
+--- a/src/SelfSignedCertificate.cpp
++++ b/src/SelfSignedCertificate.cpp
+@@ -5,8 +5,6 @@
+
+ #include "SelfSignedCertificate.h"
+
+-#include <openssl/x509v3.h>
+-
+ #define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()
+
+ static int add_ext(X509 *crt, int nid, char *value) {
+@@ -28,108 +26,86 @@ static int add_ext(X509 *crt, int nid, char *value) {
+ return 1;
+ }
+
+-bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
+- QSslCertificate &qscCert, QSslKey &qskKey) {
+- bool ok = true;
+- X509 *x509 = nullptr;
+- EVP_PKEY *pkey = nullptr;
+- RSA *rsa = nullptr;
+- BIGNUM *e = nullptr;
+- X509_NAME *name = nullptr;
+- ASN1_INTEGER *serialNumber = nullptr;
+- ASN1_TIME *notBefore = nullptr;
+- ASN1_TIME *notAfter = nullptr;
+- QString commonName;
+- bool isServerCert = certificateType == CertificateTypeServerCertificate;
+-
+- if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
+- ok = false;
+- goto out;
++EVP_PKEY *SelfSignedCertificate::generate_rsa_keypair() {
++ EVP_PKEY *pkey = EVP_PKEY_new();
++ if (!pkey) {
++ return nullptr;
+ }
+
+- x509 = X509_new();
+- if (!x509) {
+- ok = false;
+- goto out;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr);
++ if (!ctx) {
++ return nullptr;
+ }
+-
+- pkey = EVP_PKEY_new();
+- if (!pkey) {
+- ok = false;
+- goto out;
++ if (EVP_PKEY_keygen_init(ctx) <= 0) {
++ return nullptr;
+ }
+-
+- rsa = RSA_new();
++ if (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048) <= 0) {
++ return nullptr;
++ }
++ if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
++ return nullptr;
++ }
++ EVP_PKEY_CTX_free(ctx);
++#else
++ RSA *rsa = RSA_new();
++ BIGNUM *e = BN_new();
+ if (!rsa) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+- e = BN_new();
+ if (!e) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+ if (BN_set_word(e, 65537) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+ if (RSA_generate_key_ex(rsa, 2048, e, nullptr) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
+-
+ if (EVP_PKEY_assign_RSA(pkey, rsa) == 0) {
+- ok = false;
+- goto out;
++ return nullptr;
+ }
++ BN_free(e);
++ RSA_free(rsa);
++#endif
++ return pkey;
++}
+
+- if (X509_set_version(x509, 2) == 0) {
+- ok = false;
+- goto out;
++#define CHECK(statement) \
++ if (!(statement)) { \
++ ok = false; \
++ goto out; \
+ }
+
+- serialNumber = X509_get_serialNumber(x509);
+- if (!serialNumber) {
+- ok = false;
+- goto out;
+- }
+- if (ASN1_INTEGER_set(serialNumber, 1) == 0) {
+- ok = false;
+- goto out;
+- }
+
+- notBefore = X509_get_notBefore(x509);
+- if (!notBefore) {
+- ok = false;
+- goto out;
+- }
+- if (!X509_gmtime_adj(notBefore, 0)) {
+- ok = false;
+- goto out;
+- }
++bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
++ QSslCertificate &qscCert, QSslKey &qskKey) {
++ bool ok = true;
++ EVP_PKEY *pkey = nullptr;
++ X509 *x509 = nullptr;
++ X509_NAME *name = nullptr;
++ ASN1_INTEGER *serialNumber = nullptr;
++ ASN1_TIME *notBefore = nullptr;
++ ASN1_TIME *notAfter = nullptr;
++ QString commonName;
++ bool isServerCert = certificateType == CertificateTypeServerCertificate;
+
+- notAfter = X509_get_notAfter(x509);
+- if (!notAfter) {
+- ok = false;
+- goto out;
+- }
+- if (!X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20)) {
+- ok = false;
+- goto out;
+- }
++ // In Qt 5.15, a class was added to wrap up the procedures of generating a self-signed certificate.
++ // See https://doc.qt.io/qt-5/qopcuax509certificatesigningrequest.html.
++ // We should consider migrating to this class after switching to Qt 5.15.
+
+- if (X509_set_pubkey(x509, pkey) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(pkey = generate_rsa_keypair());
+
+- name = X509_get_subject_name(x509);
+- if (!name) {
+- ok = false;
+- goto out;
+- }
++ CHECK(x509 = X509_new());
++ CHECK(X509_set_version(x509, 2));
++ CHECK(serialNumber = X509_get_serialNumber(x509));
++ CHECK(ASN1_INTEGER_set(serialNumber, 1));
++ CHECK(notBefore = X509_get_notBefore(x509));
++ CHECK(X509_gmtime_adj(notBefore, 0));
++ CHECK(notAfter = X509_get_notAfter(x509));
++ CHECK(X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20))
++ CHECK(X509_set_pubkey(x509, pkey));
++ CHECK(name = X509_get_subject_name(x509));
+
+ if (isServerCert) {
+ commonName = QLatin1String("Murmur Autogenerated Certificate v2");
+@@ -141,120 +117,63 @@ bool SelfSignedCertificate::generate(CertificateType certificateType, QString cl
+ }
+ }
+
+- if (X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
+- reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0)
+- == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
++ reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0));
+
+- if (X509_set_issuer_name(x509, name) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_set_issuer_name(x509, name));
+
+- if (add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")));
+
+ if (isServerCert) {
+- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")))
+ } else {
+- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")));
+ }
+
+- if (add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")));
+
+ if (isServerCert) {
+- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")));
+ } else {
+- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")));
+ }
+
+ if (!isServerCert) {
+ if (!clientCertEmail.trimmed().isEmpty()) {
+- if (add_ext(x509, NID_subject_alt_name,
+- QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data())
+- == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(add_ext(x509, NID_subject_alt_name,
++ QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data()));
+ }
+ }
+
+- if (X509_sign(x509, pkey, EVP_sha1()) == 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(X509_sign(x509, pkey, EVP_sha1()));
+
+ {
+ QByteArray crt;
+ int len = i2d_X509(x509, nullptr);
+- if (len <= 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(len > 0);
+ crt.resize(len);
+
+ unsigned char *dptr = reinterpret_cast< unsigned char * >(crt.data());
+- if (i2d_X509(x509, &dptr) != len) {
+- ok = false;
+- goto out;
+- }
++ CHECK(i2d_X509(x509, &dptr) == len);
+
+ qscCert = QSslCertificate(crt, QSsl::Der);
+- if (qscCert.isNull()) {
+- ok = false;
+- goto out;
+- }
++ CHECK(!qscCert.isNull());
+ }
+
+ {
+ QByteArray key;
+ int len = i2d_PrivateKey(pkey, nullptr);
+- if (len <= 0) {
+- ok = false;
+- goto out;
+- }
++ CHECK(len > 0);
+ key.resize(len);
+
+ unsigned char *dptr = reinterpret_cast< unsigned char * >(key.data());
+- if (i2d_PrivateKey(pkey, &dptr) != len) {
+- ok = false;
+- goto out;
+- }
++ CHECK(i2d_PrivateKey(pkey, &dptr) == len);
+
+ qskKey = QSslKey(key, QSsl::Rsa, QSsl::Der);
+- if (qskKey.isNull()) {
+- ok = false;
+- goto out;
+- }
++ CHECK(!qskKey.isNull());
+ }
+
+ out:
+- if (e) {
+- BN_free(e);
+- }
+- // We only need to free the pkey pointer,
+- // not the RSA pointer. We have assigned
+- // our RSA key to pkey, and it will be freed
+- // once we free pkey.
+ if (pkey) {
+ EVP_PKEY_free(pkey);
+ }
+diff --git a/src/SelfSignedCertificate.h b/src/SelfSignedCertificate.h
+index b85a8752b8..7c5f59e9c5 100644
+--- a/src/SelfSignedCertificate.h
++++ b/src/SelfSignedCertificate.h
+@@ -6,6 +6,10 @@
+ #ifndef MUMBLE_SELFSIGNEDCERTIFICATE_H_
+ #define MUMBLE_SELFSIGNEDCERTIFICATE_H_
+
++#include <openssl/evp.h>
++#include <openssl/rsa.h>
++#include <openssl/x509v3.h>
++
+ #include <QtCore/QString>
+ #include <QtNetwork/QSslCertificate>
+ #include <QtNetwork/QSslKey>
+@@ -16,6 +20,7 @@ class SelfSignedCertificate {
+ private:
+ static bool generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
+ QSslCertificate &qscCert, QSslKey &qskKey);
++ static EVP_PKEY *generate_rsa_keypair();
+
+ public:
+ static bool generateMumbleCertificate(QString name, QString email, QSslCertificate &qscCert, QSslKey &qskKey);
+diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
+index 2176d64883..640fdedac8 100644
+--- a/src/crypto/CryptStateOCB2.cpp
++++ b/src/crypto/CryptStateOCB2.cpp
+@@ -30,7 +30,7 @@
+ #include <cstring>
+ #include <openssl/rand.h>
+
+-CryptStateOCB2::CryptStateOCB2() : CryptState() {
++CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
+ for (int i = 0; i < 0x100; i++)
+ decrypt_history[i] = 0;
+ memset(raw_key, 0, AES_KEY_SIZE_BYTES);
+@@ -38,6 +38,11 @@ CryptStateOCB2::CryptStateOCB2() : CryptState() {
+ memset(decrypt_iv, 0, AES_BLOCK_SIZE);
+ }
+
++CryptStateOCB2::~CryptStateOCB2() noexcept {
++ EVP_CIPHER_CTX_free(enc_ctx);
++ EVP_CIPHER_CTX_free(dec_ctx);
++}
++
+ bool CryptStateOCB2::isValid() const {
+ return bInit;
+ }
+@@ -46,8 +51,6 @@ void CryptStateOCB2::genKey() {
+ CryptographicRandom::fillBuffer(raw_key, AES_KEY_SIZE_BYTES);
+ CryptographicRandom::fillBuffer(encrypt_iv, AES_BLOCK_SIZE);
+ CryptographicRandom::fillBuffer(decrypt_iv, AES_BLOCK_SIZE);
+- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
+- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
+ bInit = true;
+ }
+
+@@ -56,8 +59,6 @@ bool CryptStateOCB2::setKey(const std::string &rkey, const std::string &eiv, con
+ memcpy(raw_key, rkey.data(), AES_KEY_SIZE_BYTES);
+ memcpy(encrypt_iv, eiv.data(), AES_BLOCK_SIZE);
+ memcpy(decrypt_iv, div.data(), AES_BLOCK_SIZE);
+- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
+- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
+ bInit = true;
+ return true;
+ }
+@@ -256,10 +257,24 @@ static void inline ZERO(keyblock &block) {
+ block[i] = 0;
+ }
+
+-#define AESencrypt(src, dst, key) \
+- AES_encrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
+-#define AESdecrypt(src, dst, key) \
+- AES_decrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
++#define AESencrypt(src, dst, key) \
++ { \
++ int outlen = 0; \
++ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
++ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++ }
++#define AESdecrypt(src, dst, key) \
++ { \
++ int outlen = 0; \
++ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
++ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++ }
+
+ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
+@@ -267,7 +282,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ bool success = true;
+
+ // Initialize
+- AESencrypt(nonce, delta, &encrypt_key);
++ AESencrypt(nonce, delta, raw_key);
+ ZERO(checksum);
+
+ while (len > AES_BLOCK_SIZE) {
+@@ -299,7 +314,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ if (flipABit) {
+ *reinterpret_cast< unsigned char * >(tmp) ^= 1;
+ }
+- AESencrypt(tmp, tmp, &encrypt_key);
++ AESencrypt(tmp, tmp, raw_key);
+ XOR(reinterpret_cast< subblock * >(encrypted), delta, tmp);
+ XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
+ if (flipABit) {
+@@ -315,7 +330,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ ZERO(tmp);
+ tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
+ XOR(tmp, tmp, delta);
+- AESencrypt(tmp, pad, &encrypt_key);
++ AESencrypt(tmp, pad, raw_key);
+ memcpy(tmp, plain, len);
+ memcpy(reinterpret_cast< unsigned char * >(tmp) + len, reinterpret_cast< const unsigned char * >(pad) + len,
+ AES_BLOCK_SIZE - len);
+@@ -325,7 +340,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+
+ S3(delta);
+ XOR(tmp, delta, checksum);
+- AESencrypt(tmp, tag, &encrypt_key);
++ AESencrypt(tmp, tag, raw_key);
+
+ return success;
+ }
+@@ -336,13 +351,13 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ bool success = true;
+
+ // Initialize
+- AESencrypt(nonce, delta, &encrypt_key);
++ AESencrypt(nonce, delta, raw_key);
+ ZERO(checksum);
+
+ while (len > AES_BLOCK_SIZE) {
+ S2(delta);
+ XOR(tmp, delta, reinterpret_cast< const subblock * >(encrypted));
+- AESdecrypt(tmp, tmp, &decrypt_key);
++ AESdecrypt(tmp, tmp, raw_key);
+ XOR(reinterpret_cast< subblock * >(plain), delta, tmp);
+ XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
+ len -= AES_BLOCK_SIZE;
+@@ -354,7 +369,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ ZERO(tmp);
+ tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
+ XOR(tmp, tmp, delta);
+- AESencrypt(tmp, pad, &encrypt_key);
++ AESencrypt(tmp, pad, raw_key);
+ memset(tmp, 0, AES_BLOCK_SIZE);
+ memcpy(tmp, encrypted, len);
+ XOR(tmp, tmp, pad);
+@@ -372,7 +387,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+
+ S3(delta);
+ XOR(tmp, delta, checksum);
+- AESencrypt(tmp, tag, &encrypt_key);
++ AESencrypt(tmp, tag, raw_key);
+
+ return success;
+ }
+@@ -381,5 +396,5 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ #undef SHIFTBITS
+ #undef SWAPPED
+ #undef HIGHBIT
+-#undef AES_encrypt
+-#undef AES_decrypt
++#undef AESencrypt
++#undef AESdecrypt
+diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
+index 53d4b4b6aa..cc3f1c0bc3 100644
+--- a/src/crypto/CryptStateOCB2.h
++++ b/src/crypto/CryptStateOCB2.h
+@@ -8,8 +8,9 @@
+
+ #include "CryptState.h"
+
+-#include <openssl/aes.h>
++#include <openssl/evp.h>
+
++#define AES_BLOCK_SIZE 16
+ #define AES_KEY_SIZE_BITS 128
+ #define AES_KEY_SIZE_BYTES (AES_KEY_SIZE_BITS / 8)
+
+@@ -17,7 +18,7 @@
+ class CryptStateOCB2 : public CryptState {
+ public:
+ CryptStateOCB2();
+- ~CryptStateOCB2(){};
++ ~CryptStateOCB2() noexcept override;
+
+ virtual bool isValid() const Q_DECL_OVERRIDE;
+ virtual void genKey() Q_DECL_OVERRIDE;
+@@ -43,8 +44,8 @@ class CryptStateOCB2 : public CryptState {
+ unsigned char decrypt_iv[AES_BLOCK_SIZE];
+ unsigned char decrypt_history[0x100];
+
+- AES_KEY encrypt_key;
+- AES_KEY decrypt_key;
++ EVP_CIPHER_CTX *enc_ctx;
++ EVP_CIPHER_CTX *dec_ctx;
+ };
+
+
+From f8d47db318f302f5a7d343f15c9936c7030c49c4 Mon Sep 17 00:00:00 2001
+From: Terry Geng <terry@terriex.com>
+Date: Sun, 12 Dec 2021 22:39:38 -0500
+Subject: [PATCH] FIX(crypto): Sharing EVP context between threads crushes
+ Mumble
+
+Functions ocb_encrypt and ocb_decrypt share the same set
+of encrypt and decrypt contexts. However, they are invoked
+in different threads (audio input thread and server
+handler thread).
+This may lead to conflicts that would crash Mumble.
+This patch separates contexts used in these two functions
+to avoid such conflicts.
+
+Fixes #5361
+---
+ src/crypto/CryptStateOCB2.cpp | 55 ++++++++++++++++++++++-------------
+ src/crypto/CryptStateOCB2.h | 6 ++--
+ 2 files changed, 38 insertions(+), 23 deletions(-)
+
+diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
+index 640fdedac8..3b3473ffec 100644
+--- a/src/crypto/CryptStateOCB2.cpp
++++ b/src/crypto/CryptStateOCB2.cpp
+@@ -30,7 +30,9 @@
+ #include <cstring>
+ #include <openssl/rand.h>
+
+-CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
++CryptStateOCB2::CryptStateOCB2()
++ : CryptState(), enc_ctx_ocb_enc(EVP_CIPHER_CTX_new()), dec_ctx_ocb_enc(EVP_CIPHER_CTX_new()),
++ enc_ctx_ocb_dec(EVP_CIPHER_CTX_new()), dec_ctx_ocb_dec(EVP_CIPHER_CTX_new()) {
+ for (int i = 0; i < 0x100; i++)
+ decrypt_history[i] = 0;
+ memset(raw_key, 0, AES_KEY_SIZE_BYTES);
+@@ -39,8 +41,10 @@ CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()),
+ }
+
+ CryptStateOCB2::~CryptStateOCB2() noexcept {
+- EVP_CIPHER_CTX_free(enc_ctx);
+- EVP_CIPHER_CTX_free(dec_ctx);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_enc);
++ EVP_CIPHER_CTX_free(enc_ctx_ocb_dec);
++ EVP_CIPHER_CTX_free(dec_ctx_ocb_dec);
+ }
+
+ bool CryptStateOCB2::isValid() const {
+@@ -257,25 +261,28 @@ static void inline ZERO(keyblock &block) {
+ block[i] = 0;
+ }
+
+-#define AESencrypt(src, dst, key) \
+- { \
+- int outlen = 0; \
+- EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+- EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
+- EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+- EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++#define AESencrypt_ctx(src, dst, key, enc_ctx) \
++ { \
++ int outlen = 0; \
++ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
++ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
+ }
+-#define AESdecrypt(src, dst, key) \
+- { \
+- int outlen = 0; \
+- EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+- EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
+- EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+- reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+- EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
++#define AESdecrypt_ctx(src, dst, key, dec_ctx) \
++ { \
++ int outlen = 0; \
++ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
++ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
++ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
++ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
++ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >((dst) + outlen), &outlen); \
+ }
+
++#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_enc)
++#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_enc)
++
+ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
+ keyblock checksum, delta, tmp, pad;
+@@ -345,6 +352,12 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
+ return success;
+ }
+
++#undef AESencrypt
++#undef AESdecrypt
++
++#define AESencrypt(src, dst, key) AESencrypt_ctx(src, dst, key, enc_ctx_ocb_dec)
++#define AESdecrypt(src, dst, key) AESdecrypt_ctx(src, dst, key, dec_ctx_ocb_dec)
++
+ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *plain, unsigned int len,
+ const unsigned char *nonce, unsigned char *tag) {
+ keyblock checksum, delta, tmp, pad;
+@@ -392,9 +405,9 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
+ return success;
+ }
+
++#undef AESencrypt
++#undef AESdecrypt
+ #undef BLOCKSIZE
+ #undef SHIFTBITS
+ #undef SWAPPED
+ #undef HIGHBIT
+-#undef AESencrypt
+-#undef AESdecrypt
+diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
+index cc3f1c0bc3..0fd3000ade 100644
+--- a/src/crypto/CryptStateOCB2.h
++++ b/src/crypto/CryptStateOCB2.h
+@@ -44,8 +44,10 @@ class CryptStateOCB2 : public CryptState {
+ unsigned char decrypt_iv[AES_BLOCK_SIZE];
+ unsigned char decrypt_history[0x100];
+
+- EVP_CIPHER_CTX *enc_ctx;
+- EVP_CIPHER_CTX *dec_ctx;
++ EVP_CIPHER_CTX *enc_ctx_ocb_enc;
++ EVP_CIPHER_CTX *dec_ctx_ocb_enc;
++ EVP_CIPHER_CTX *enc_ctx_ocb_dec;
++ EVP_CIPHER_CTX *dec_ctx_ocb_dec;
+ };
+
+
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 2e6f50da0140..acb6af454e0f 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.4.287
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF
From 04398ed2a6f779abd552635a0defc0edcba4e56b Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 23 Jan 2023 15:30:52 -0600
Subject: [PATCH 052/356] zfs: update to 2.1.9.
---
...3-dracut-fix-typo-in-mount-zfs.sh.in.patch | 36 -------------------
srcpkgs/zfs/template | 4 +--
2 files changed, 2 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
diff --git a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch b/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
deleted file mode 100644
index 9944a9a3b8a4..000000000000
--- a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 07f2793e869196fcbcd5057d9ada377674262fe3 Mon Sep 17 00:00:00 2001
-From: Brian Behlendorf <behlendorf1@llnl.gov>
-Date: Wed, 29 Jun 2022 15:33:38 -0700
-Subject: [PATCH] dracut: fix typo in mount-zfs.sh.in
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Format the `zpool get` command correctly. The -o option must
-be followed by "all" or the requested field name.
-
-Reviewed-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
-Reviewed-by: George Melikov <mail@gmelikov.ru>
-Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Closes #13602
-Signed-off-by: Alexis Ehret <git@08a.re>
----
- contrib/dracut/90zfs/mount-zfs.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in
-index fa9f1bb76..b0eb614a6 100755
---- a/contrib/dracut/90zfs/mount-zfs.sh.in
-+++ b/contrib/dracut/90zfs/mount-zfs.sh.in
-@@ -82,7 +82,7 @@ ZFS_DATASET="${ZFS_DATASET:-${root}}"
- ZFS_POOL="${ZFS_DATASET%%/*}"
-
-
--if ! zpool get -Ho name "${ZFS_POOL}" > /dev/null 2>&1; then
-+if ! zpool get -Ho value name "${ZFS_POOL}" > /dev/null 2>&1; then
- info "ZFS: Importing pool ${ZFS_POOL}..."
- # shellcheck disable=SC2086
- if ! zpool import -N ${ZPOOL_IMPORT_OPTS} "${ZFS_POOL}"; then
---
-2.37.3
-
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 910cf795319b..ae975caf9dd9 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
# Template file for 'zfs'
pkgname=zfs
-version=2.1.7
+version=2.1.9
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b
+checksum=6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
From c620021d4c8e1e5e4abe60f7c7be71459096505e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 Jan 2023 11:57:07 -0500
Subject: [PATCH 053/356] python3-phonenumbers: update to 8.13.5.
---
srcpkgs/python3-phonenumbers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 35bf51630192..40b5e4f5e8d3 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
# Template file for 'python3-phonenumbers'
pkgname=python3-phonenumbers
-version=8.13.4
+version=8.13.5
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ license="Apache-2.0"
homepage="https://github.com/daviddrysdale/python-phonenumbers"
changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=6d63455012fc9431105ffc7739befca61c3efc551b287dca58d2be2e745475a9
+checksum=6eb2faf29c19f946baf10f1c977a1f856cab90819fe7735b8e141d5407420c4a
From 1c2c90f873b252ea28178173f63fb76caee18559 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 31 Jan 2023 11:57:34 -0500
Subject: [PATCH 054/356] synapse: update to 1.76.0.
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index d23b55dedcd6..632c181aed96 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
# Template file for 'synapse'
pkgname=synapse
-version=1.75.0
+version=1.76.0
revision=1
build_style=python3-pep517
build_helper=rust
@@ -24,7 +24,7 @@ license="Apache-2.0"
homepage="https://github.com/matrix-org/synapse"
changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=8b66a6b36c9d9b9e952d6b0616925343de7d7313699984202cfe69287b985fb7
+checksum=c72320850455b554c0a091577bc12fe9cfe336dfd137d2cbf4342146fb6442b3
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From 85ed705a4b36af9469eb31d4bdea6ca155496e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 31 Jan 2023 15:00:36 +0000
Subject: [PATCH 055/356] ImageMagick: update to 7.1.0.60.
---
srcpkgs/ImageMagick/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 14ddd0784ed3..e98161479198 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,6 +1,6 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
-version=7.1.0.58
+version=7.1.0.60
revision=1
_upstream_version="${version/.${version##*.}/-${version##*.}}"
build_style=gnu-configure
@@ -19,7 +19,7 @@ license="ImageMagick"
homepage="https://www.imagemagick.org"
changelog="https://raw.githubusercontent.com/ImageMagick/Website/main/ChangeLog.md"
distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_upstream_version}.tar.gz"
-checksum=5767f49cf94bff82b558d79c8039f60c8ea4b51753c6e4b0f16a9442293cfa67
+checksum=94424cc13c5ba18e0e5d5badb834ce74eab11207b00ea32c1f533a5e34c85887
subpackages="libmagick libmagick-devel"
From afa63aaa7b75b914b8cc0231fc66639a4326f78f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 31 Jan 2023 13:41:33 +0100
Subject: [PATCH 056/356] topgrade: update to 10.3.1
---
srcpkgs/topgrade/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 429c0382e66b..dfcca5c8dd8a 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
# Template file for 'topgrade'
pkgname=topgrade
-version=10.3.0
+version=10.3.1
revision=1
build_style=cargo
build_helper=qemu
@@ -9,7 +9,7 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/topgrade-rs/topgrade"
distfiles="https://github.com/topgrade-rs/topgrade/archive/refs/tags/v${version}.tar.gz"
-checksum=6ed1fa0ca3c2031e183ad8852de41be77e216076508e896fc38b7ad1cce15d0d
+checksum=9b94eb5c0fbffcbcf7a4862bf239e31cb9700f517f909d17aa109ba030efe17e
post_install() {
local topgrade="${DESTDIR}/usr/bin/topgrade"
From 1841a8acd4235d0c58685714e81400567695c019 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 21:46:24 -0500
Subject: [PATCH 057/356] fragments: update to 2.1
---
srcpkgs/fragments/patches/no-git.patch | 14 ++++++++------
srcpkgs/fragments/template | 12 ++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/fragments/patches/no-git.patch b/srcpkgs/fragments/patches/no-git.patch
index 2fdc1521e03d..ecabe0e7804b 100644
--- a/srcpkgs/fragments/patches/no-git.patch
+++ b/srcpkgs/fragments/patches/no-git.patch
@@ -1,11 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 0cb46023cc..eec7e4f694 100644
--- a/meson.build
+++ b/meson.build
-@@ -17,7 +17,7 @@
- name = 'Fragments'
- app_id = 'de.haeckerfelix.Fragments'
- profile = get_option('profile')
+@@ -20,7 +20,7 @@ name = 'Fragments'
+ base_id = 'de.haeckerfelix.Fragments'
+ path_id = '/de/haeckerfelix/Fragments'
+ app_id = base_id
-vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+vcs_tag = 'none'
+ profile = get_option('profile')
+ datadir = join_paths(get_option('prefix'), get_option('datadir'))
localedir = join_paths(get_option('prefix'), get_option('localedir'))
- datadir = get_option('datadir')
- pkgdatadir = join_paths(get_option('prefix'), datadir, meson.project_name())
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index ec3a4f9bd315..f26e0aa4585e 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,10 +1,11 @@
# Template file for 'fragments'
pkgname=fragments
-version=2.0.2
+version=2.1
revision=1
build_style=meson
build_helper="rust"
-hostmakedepends="cargo pkg-config gettext glib-devel"
+hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
+ gtk4-update-icon-cache"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
short_desc="BitTorrent Client"
@@ -12,12 +13,11 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/Fragments"
distfiles="https://gitlab.gnome.org/World/Fragments/-/archive/$version/Fragments-$version.tar.gz"
-checksum=a3f32771e82aaac33ce1fbe40f83204fb6fade20d5cbffbd862b30ce9d8dedcf
+checksum=26e20d8cca8b7a2542b2d0e808d10dda082de52037dd8826ec6b00f0437f4564
post_patch() {
if [ "$CROSS_BUILD" ]; then
- vsed -i build-aux/cargo.sh \
- -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \
- -e '/CARGO_HOME/d'
+ vsed -i src/meson.build \
+ -e "s%rust_target /%'${RUST_TARGET}' / rust_target /%"
fi
}
From 62cf51e750e28dadad677338778b3732c2a79651 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 31 Jan 2023 17:40:00 -0600
Subject: [PATCH 058/356] qprompt: update to 1.1.4.
---
srcpkgs/qprompt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qprompt/template b/srcpkgs/qprompt/template
index 82027308fa01..40bb29c3a73c 100644
--- a/srcpkgs/qprompt/template
+++ b/srcpkgs/qprompt/template
@@ -1,6 +1,6 @@
# Template file for 'qprompt'
pkgname=qprompt
-version=1.1.3
+version=1.1.4
revision=1
build_style=cmake
hostmakedepends="qt5-host-tools qt5-devel kcoreaddons extra-cmake-modules
@@ -14,7 +14,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://qprompt.app/"
distfiles="https://github.com/Cuperino/QPrompt/archive/refs/tags/v${version}.tar.gz"
-checksum=532d135d7cf854eaa4cb97e9ff54cbd1dfde71c8b29e2aef17dac6936dc84faa
+checksum=71f5dc53e9dc65453cd6a503bd448bfd4d2078edd1d6a2c8bc751c5dc2939631
post_install() {
mv "${DESTDIR}/usr/doc" "${DESTDIR}/usr/share/doc"
From 163fb48a6def6b4eec2f268212b401c69f69c854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 1 Feb 2023 15:42:22 +0700
Subject: [PATCH 059/356] neovim: reduce log
Fix: #42010
---
.../patches/cmake-allow-build-type-none.patch | 13 +++++++++----
srcpkgs/neovim/template | 9 +++++++--
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
index d6d8c8f1b15f..d98563e00252 100644
--- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
+++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch
@@ -1,7 +1,14 @@
-diff --git a/cmake/Util.cmake b/cmake/Util.cmake
-index 343a729..d7d15e1 100644
--- a/cmake/Util.cmake
+++ b/cmake/Util.cmake
+@@ -162,7 +162,7 @@ endfunction()
+ # Passing CMAKE_BUILD_TYPE for multi-config generators will now not only
+ # not be used, but also generate a warning for the user.
+ function(set_default_buildtype)
+- set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo)
++ set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo None)
+
+ get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+ if(isMultiConfig)
@@ -177,7 +177,7 @@ function(set_default_buildtype)
message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'")
set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build" FORCE)
@@ -11,8 +18,6 @@ index 343a729..d7d15e1 100644
else()
message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
endif()
-diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim
-index be56658..46fdd0f 100644
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -135,7 +135,7 @@ function! s:check_performance() abort
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 95c1f0731068..2cd7bafd0dd3 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,10 +1,12 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
-configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
+# MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3
+configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)
+ -DMIN_LOG_LEVEL=3"
hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp
$(vopt_if luajit LuaJIT lua51)"
makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
@@ -31,6 +33,9 @@ alternatives="
vim:vim:/usr/bin/nvim
vim:vim.1:/usr/share/man/man1/nvim.1"
+# They want assertion
+CFLAGS=-UNDEBUG
+
pre_configure() {
vsed -i runtime/CMakeLists.txt \
-e "s|\".*/bin/nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"
From e91c5982b8b7b4efdf97aeba3226fad2fff44266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 5 Sep 2021 22:23:25 +0200
Subject: [PATCH 060/356] New package: openpgp-ca-0.11.2
---
srcpkgs/openpgp-ca/template | 16 ++++++++++++++++
srcpkgs/openpgp-ca/update | 2 ++
2 files changed, 18 insertions(+)
create mode 100644 srcpkgs/openpgp-ca/template
create mode 100644 srcpkgs/openpgp-ca/update
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
new file mode 100644
index 000000000000..ca62b5987975
--- /dev/null
+++ b/srcpkgs/openpgp-ca/template
@@ -0,0 +1,16 @@
+# Template file for 'openpgp-ca'
+pkgname=openpgp-ca
+version=0.11.2
+revision=1
+build_style=cargo
+make_install_args="--path openpgp-ca-bin"
+hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"
+makedepends="openssl-devel nettle-devel clang sqlite-devel"
+depends="gnupg"
+short_desc="Tool for handling OpenPGP keys in organizaations"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://openpgp-ca.org/"
+distfiles="https://gitlab.com/openpgp-ca/openpgp-ca/-/archive/openpgp-ca/v${version}/openpgp-ca-openpgp-ca-v${version}.tar.gz"
+checksum=162f60cdb937a9db897f699a35266da00adeb14c42a21f806d13bfbed03f921e
+make_check=no # Tests require gpg-agent being set up
diff --git a/srcpkgs/openpgp-ca/update b/srcpkgs/openpgp-ca/update
new file mode 100644
index 000000000000..0b887cabce9b
--- /dev/null
+++ b/srcpkgs/openpgp-ca/update
@@ -0,0 +1,2 @@
+site="https://gitlab.com/openpgp-ca/openpgp-ca/-/tags?format=atom"
+pattern="<title>(openpgp-ca/v)?\K[\d.]+(?=</title>)"
From 63c9389f24ee701d97b13836a334dd6e49ea78d0 Mon Sep 17 00:00:00 2001
From: Gavin Howard <gavin@yzena.com>
Date: Tue, 31 Jan 2023 20:06:51 -0700
Subject: [PATCH 061/356] bc-gh: update upstream address and use the GNU bc
predefined build
Signed-off-by: Gavin Howard <gavin@yzena.com>
Signed-off-by: Gavin D. Howard <gavin@yzena.com>
---
srcpkgs/bc-gh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index a8fa2b682baf..c589ca0f6e64 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,9 +1,9 @@
# Template file for 'bc-gh'
pkgname=bc-gh
version=6.2.2
-revision=1
+revision=2
short_desc="Implementation of POSIX bc with GNU extensions"
-maintainer="Gavin D. Howard <yzena.tech@gmail.com>"
+maintainer="Gavin D. Howard <gavin@gavinhoward.com>"
license="BSD-2-Clause"
homepage="https://git.yzena.com/gavin/bc"
changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
@@ -20,7 +20,7 @@ alternatives="
do_configure() {
PREFIX=/usr DESTDIR="${DESTDIR}" EXECSUFFIX=-gh CC="${CC}" CFLAGS="${CFLAGS}" \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="${CFLAGS_FOR_BUILD}" ./configure.sh -GM \
- -sbc.banner -sdc.tty_mode
+ -pGNU
}
do_build() {
make ${makejobs}
From 8de16a7f1aa40e6ece1c63032abc004d4a42f08c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 1 Feb 2023 13:49:34 +0100
Subject: [PATCH 062/356] typioca: update to 2.0.8.
---
srcpkgs/typioca/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/typioca/template b/srcpkgs/typioca/template
index 0248425270b3..57bf17f8dc83 100644
--- a/srcpkgs/typioca/template
+++ b/srcpkgs/typioca/template
@@ -1,6 +1,6 @@
# Template file for 'typioca'
pkgname=typioca
-version=2.0.6
+version=2.0.8
revision=1
build_style=go
go_import_path="github.com/bloznelis/typioca"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/bloznelis/typioca"
distfiles="https://github.com/bloznelis/typioca/archive/refs/tags/${version}.tar.gz"
-checksum=63b1a2411fbf3ee530dfe2d48cbd7bc01cb1d9d64e66f2739d9273408db99f5f
+checksum=6d40b65205af3707cf6da401fa4acee4bd86b173f82cb6ad334403e0e0117ba2
post_install() {
vlicense LICENSE
From c6766834b8b3918bf435cd6eb6a5d1dd6181a00d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:15:40 +0100
Subject: [PATCH 063/356] mpop: update to 1.4.18.
---
srcpkgs/mpop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mpop/template b/srcpkgs/mpop/template
index a718f7c06571..b909fd27a50d 100644
--- a/srcpkgs/mpop/template
+++ b/srcpkgs/mpop/template
@@ -1,6 +1,6 @@
# Template file for 'mpop'
pkgname=mpop
-version=1.4.17
+version=1.4.18
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/mpop/"
distfiles="https://marlam.de/mpop/releases/mpop-${version}.tar.xz"
-checksum=42ae494bad2941d9f647c48c3ed98c38ba9aa5cf3fe48fb0fe06e5b6dadf8bd5
+checksum=6099950184f7d094a782d1e7ab9833736f12308d34a544a59b46a8471d9f85b7
From 213fc194e19555e908dfc3e71498c9b1f9dce2d4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:16:34 +0100
Subject: [PATCH 064/356] msmtp: update to 1.8.23.
---
srcpkgs/msmtp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 7f72af900000..0310b6bf284e 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
# Template file for 'msmtp'
pkgname=msmtp
-version=1.8.22
+version=1.8.23
revision=1
build_style=gnu-configure
configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://marlam.de/msmtp/"
distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7
+checksum=cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8
build_options="idn sasl gnome msmtpd"
build_options_default="idn sasl msmtpd"
From f189eb3e073343157aec1ef917e2e9b025cedd66 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 31 Jan 2023 19:20:01 +0100
Subject: [PATCH 065/356] linux5.15: update to 5.15.90.
---
srcpkgs/linux5.15/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index ada56640b4a5..f7f24a4111be 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
# Template file for 'linux5.15'
pkgname=linux5.15
-version=5.15.85
+version=5.15.90
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- bcf81892e467380e79f54b7856cbcf9d0de5dc33ac32570e788b980d7027620c"
+ 19f841835ae4fada8c4f52a67dae051cd81e0415047c6535fd871fe68ff2ae81"
skip_extraction="patch-${version}.xz"
python_version=3
From 8a2fc2c6e6846b8dc7990de815b5af1bd68ec3a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:02:39 +0100
Subject: [PATCH 066/356] tgt: update to 1.0.86.
---
srcpkgs/tgt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index be369a9e693e..73995ee243c5 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
# Template file for 'tgt'
pkgname=tgt
-version=1.0.85
+version=1.0.86
revision=1
build_style=gnu-makefile
make_install_args="sbindir=/usr/bin"
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://github.com/fujita/tgt"
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=b8454e06eaf6f024c1fa39de976c167c1ba7f43535bea96c3c364bd138552d8c
+checksum=af84c16bf8893d65666afcc0424b46dafddd2d0e5dcf818b319ea9ed3c3315a7
post_extract() {
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
From 0d7d581af3b3b87d9168e572174f13f4d07eecde Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:03:51 +0100
Subject: [PATCH 067/356] ugrep: update to 3.9.7.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index f9f322c6128a..202ce7557dd2 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.9.6
+version=3.9.7
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=4ff066c4d6afb46df598f184069eb2d96134642dca1e97f1161eebaa1d97a455
+checksum=7f44e2198e2dc3ad1ed88759ece848364c4ba632aca60aefe9c53d5b0c584628
post_install() {
vlicense LICENSE.txt LICENSE
From 6bab1922ec14fd481560cd0ce3bf0b440d5d0053 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:05:12 +0100
Subject: [PATCH 068/356] xlbiff: update to 4.6.5.
---
srcpkgs/xlbiff/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index d93788c836e9..6a34a355129d 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
# Template file for 'xlbiff'
pkgname=xlbiff
-version=4.6.4
+version=4.6.5
revision=1
build_style=gnu-configure
configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://www.edsantiago.com/xlbiff/"
distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=42a24e1bb42a07fd870d78a5c296f6c1f7aa0f8992a57a553e47d8f3e6506780
+checksum=16f0ec3a6853a9f6abf0ce96e9fda553fb9f34c3f9348c5f87a8d69db035f1f8
pre_configure() {
autoreconf -fi
From 62c3d6ac07b09bc4725ec02f140caa359129d373 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:07:05 +0100
Subject: [PATCH 069/356] bmake: update to 20230127.
---
srcpkgs/bmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 8985bfd2d409..e382b2077151 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,13 +1,13 @@
# Template file for 'bmake'
pkgname=bmake
-version=20230123
+version=20230127
revision=1
short_desc="Portable version of the NetBSD make build tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.crufty.net/help/sjg/bmake.html"
distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=6557c48d144a6b531fa26c7273c090c656280ba7b43df376971a5b2cdbe01b2f
+checksum=6056866f69496699c815b2af7144701fce7f1ccb6a4743dac5d221ff157d8915
python_version=3
do_configure() {
From f980db941fc3cd8dc245bf67df054d8e58ca7e1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:15:32 +0100
Subject: [PATCH 070/356] cmark-gfm: update to 0.29.0.gfm.9.
---
srcpkgs/cmark-gfm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmark-gfm/template b/srcpkgs/cmark-gfm/template
index 231c86a6a49c..7239d59a4d43 100644
--- a/srcpkgs/cmark-gfm/template
+++ b/srcpkgs/cmark-gfm/template
@@ -1,6 +1,6 @@
# Template file for 'cmark-gfm'
pkgname=cmark-gfm
-version=0.29.0.gfm.8
+version=0.29.0.gfm.9
revision=1
build_style=cmake
short_desc="GitHub's fork of cmark, a CommonMark markdown renderer"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/github/cmark-gfm"
distfiles="https://github.com/github/cmark-gfm/archive/${version}.tar.gz"
-checksum=94a145b7bc18cd4e85edce0a65ac71f24cbafe8e4402c3213835517408a10118
+checksum=07cd91514c29f8d68bcd1bd159661bf92ac060fdb08f6b2e33ce01d3b3000f54
pre_configure() {
# Fix the SONAME version to use just the major number
From 7a71fdf911ee4dbd1d29dc4938003437b7219814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Tue, 24 Jan 2023 23:43:23 +0000
Subject: [PATCH 071/356] lynx: update to 2.9.0dev.12.
---
srcpkgs/lynx/patches/21_do_not_strip_-g.diff | 17 +++++++++++++++++
srcpkgs/lynx/template | 11 +++++++----
2 files changed, 24 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/lynx/patches/21_do_not_strip_-g.diff
diff --git a/srcpkgs/lynx/patches/21_do_not_strip_-g.diff b/srcpkgs/lynx/patches/21_do_not_strip_-g.diff
new file mode 100644
index 000000000000..851e303a6b58
--- /dev/null
+++ b/srcpkgs/lynx/patches/21_do_not_strip_-g.diff
@@ -0,0 +1,17 @@
+Description: Stop ./configure from stripping out -g from CFLAGS
+Author: Andreas Metzler <ametzler@debian.org>,
+ Simon Ruderich <simon@ruderich.org>
+Origin: vendor
+Last-Update: 2021-07-27
+
+--- a/configure
++++ b/configure
+@@ -4098,7 +4098,7 @@
+ test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
+ ;;
+ (*)
+- test -z "$ORIGINAL_CFLAGS" && CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'`
++ :
+ ;;
+ esac
+ fi
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 880266b18190..0aa406d830f8 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,16 +1,19 @@
# Template file for 'lynx'
pkgname=lynx
-version=2.9.0dev.10
+version=2.9.0dev.12
revision=1
build_style=gnu-configure
-configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
+configure_args="--with-screen=ncurses --enable-widec --with-zlib --with-bzlib
+ --with-ssl --enable-ipv6
+ cf_cv_header_path_ssl=${XBPS_CROSS_BASE}/usr/include/openssl"
makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
short_desc="Text browser for the World Wide Web"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://lynx.invisible-island.net/"
-distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912
+changelog="https://lynx.invisible-island.net/current/CHANGES"
+distfiles="http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
+checksum=a6455b159d00776d8ec1051285c972dc1f0c552d0571a0cff02a23ec146ee8e5
pre_configure() {
sed -i configure \
From 6091a485cbc4dbe070252702057e1302c29028f2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 31 Jan 2023 20:43:22 +0000
Subject: [PATCH 072/356] oniguruma: update to 6.9.8.
---
srcpkgs/oniguruma/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/oniguruma/template b/srcpkgs/oniguruma/template
index 60dc2a6cfd45..f31cd677b4eb 100644
--- a/srcpkgs/oniguruma/template
+++ b/srcpkgs/oniguruma/template
@@ -1,16 +1,16 @@
# Template file for 'oniguruma'
pkgname=oniguruma
-version=6.9.5.rev1
+version=6.9.8
revision=1
-_ver="${version%.*}_${version##*.}"
build_style=gnu-configure
configure_args="--enable-posix-api=yes"
short_desc="Multi-charset regular expressions library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/kkos/oniguruma"
-distfiles="${homepage}/releases/download/v${_ver}/onig-${_ver}.tar.gz"
-checksum=d33c849d1672af227944878cefe0a8fcf26fc62bedba32aa517f2f63c314a99e
+changelog="https://github.com/kkos/oniguruma/releases"
+distfiles="https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"
+checksum=28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e
post_install() {
vlicense COPYING
From 672a66ce54ee0e976f72fc1bd2322eafb38cbc0d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 13:54:35 -0500
Subject: [PATCH 073/356] stunnel: update to 5.67
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..63fd3676298e 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,6 +1,6 @@
# Template file for 'stunnel'
pkgname=stunnel
-version=5.66
+version=5.67
revision=1
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
-checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
+checksum=3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456
pre_check() {
# GitHub's CI doesn't support IPv6
From 212764432b55fc7ce3efc1f228610a28c40a87e4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 15:01:38 +0530
Subject: [PATCH 074/356] usql: update to 0.13.8.
---
srcpkgs/usql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 15b1e8c0dcd9..3e349f3ae783 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -1,6 +1,6 @@
# Template file for 'usql'
pkgname=usql
-version=0.13.6
+version=0.13.8
revision=1
build_style=go
go_import_path=github.com/xo/usql
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=1a640c65f8fd34dea8aed5ca4ebac93b3d4fe814d3613c88195515da77c98812
+checksum=1e6b48c7eacaf870e7cb1fe95835840b729e263e0d7cf489f05c73625a5cea7a
post_install() {
vlicense LICENSE
From 4463cc1ce14978a5dff08ef4162eaf135418c6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Jan 2023 14:32:56 -0300
Subject: [PATCH 075/356] rxvt-unicode: add changelog
---
srcpkgs/rxvt-unicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index 10a9be9ba29f..b0b9bf7a9009 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -23,6 +23,7 @@ short_desc="Terminal emulator supporting Xft fonts and Unicode"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="http://software.schmorp.de/pkg/rxvt-unicode.html"
+changelog="http://cvs.schmorp.de/rxvt-unicode/Changes"
distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=aaa13fcbc149fe0f3f391f933279580f74a96fd312d6ed06b8ff03c2d46672e8
From 39a86dbc1c8d45c7486cace1907c561f56eb3c60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 1 Feb 2023 15:50:05 +0100
Subject: [PATCH 076/356] usql: fix checksum.
---
srcpkgs/usql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index 3e349f3ae783..dfe140e8b129 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -10,7 +10,7 @@ maintainer="Alan Brown <adbrown@rocketmail.com>"
license="MIT"
homepage="https://github.com/xo/usql"
distfiles="https://github.com/xo/usql/archive/refs/tags/v${version}.tar.gz"
-checksum=1e6b48c7eacaf870e7cb1fe95835840b729e263e0d7cf489f05c73625a5cea7a
+checksum=b2736ddfc597bbfd57d900f63e7cc56976100677a39c02fb4b9a0cada029ac0a
post_install() {
vlicense LICENSE
From 256fa8da229cd88f32abbb72b5d45edc76a2d9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:03:52 +0100
Subject: [PATCH 077/356] New package: python3-mdurl-0.1.2
---
srcpkgs/python3-mdurl/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-mdurl/template
diff --git a/srcpkgs/python3-mdurl/template b/srcpkgs/python3-mdurl/template
new file mode 100644
index 000000000000..7ee46dbd91a8
--- /dev/null
+++ b/srcpkgs/python3-mdurl/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mdurl'
+pkgname=python3-mdurl
+version=0.1.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+short_desc="Python port of the JavaScript mdurl package"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/executablebooks/mdurl"
+distfiles="${PYPI_SITE}/m/mdurl/mdurl-${version}.tar.gz"
+checksum=bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
+# Tests not shipped in PYPI tarball
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 8ec94db7c82f47d90713928e0c9f8246196e3916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:04:00 +0100
Subject: [PATCH 078/356] New package: python3-markdown-it-2.1.0
---
srcpkgs/python3-markdown-it/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/python3-markdown-it/template
diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template
new file mode 100644
index 000000000000..40104b64dd37
--- /dev/null
+++ b/srcpkgs/python3-markdown-it/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-markdown-it'
+pkgname=python3-markdown-it
+version=2.1.0
+revision=1
+build_style=python3-pep517
+make_install_target="dist/markdown_it_py-${version}-*-*-*.whl"
+hostmakedepends="python3-flit_core"
+depends="python3-mdurl"
+short_desc="Python port of the JavaScript mardown-it package"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/executablebooks/markdown-it-py"
+changelog="https://raw.githubusercontent.com/executablebooks/markdown-it-py/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/m/markdown-it-py/markdown-it-py-${version}.tar.gz"
+checksum=cf7e59fed14b5ae17c0006eff14a2d9a00ed5f3a846148153899a0224e2c07da
+# Tests not shipped in PYPI tarball
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 85d1fa0222a2af515a16d15fe950b3a1764d0f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 13:04:07 +0100
Subject: [PATCH 079/356] python3-rich: update dependencies
---
srcpkgs/python3-rich/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 2ad4dac03927..b7cd3d84633d 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,11 +1,10 @@
# Template file for 'python3-rich'
pkgname=python3-rich
version=13.3.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions python3-Pygments python3-commonmark
- python3-colorama"
+depends="python3-Pygments python3-markdown-it"
checkdepends="python3-wheel $depends"
short_desc="Library for rich text and beautiful formatting in the terminal"
maintainer="Andrew Benson <abenson+void@gmail.com>"
From 62917d97a37d793fcc91d9505221ecc3c3d818fc Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Tue, 24 Jan 2023 15:42:30 +0100
Subject: [PATCH 080/356] gitea: update to 1.18.3
---
srcpkgs/gitea/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index c04a9bc94fe9..67413f5d9674 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
# Template file for 'gitea'
pkgname=gitea
-version=1.18.0
+version=1.18.3
revision=1
build_style=go
go_import_path=code.gitea.io/gitea
@@ -31,7 +31,7 @@ license="MIT"
homepage="https://gitea.io"
changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
-checksum=5f42af201d89bd2a21d8c47d15cc0a39b433a1dd86c6129e1aa20a53908a4c43
+checksum=8ea8e96c381c9b066873fa2f81bbab15e7ad6bd98024e9b3ef2aef994280c115
system_accounts="_gitea"
_gitea_homedir="/var/lib/gitea"
From 360051d068aa7e2637ef8465cbe48ebe328a12cb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 23 Jan 2023 17:45:50 -0500
Subject: [PATCH 081/356] sbsigntool: patch for openss3, add CFLAG
---
...84869c9590682ac3253d583bf59b890bb826.patch | 60 +++++++++++++++++++
srcpkgs/sbsigntool/patches/openssl3.patch | 35 +++++++++++
srcpkgs/sbsigntool/template | 4 +-
3 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
create mode 100644 srcpkgs/sbsigntool/patches/openssl3.patch
diff --git a/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch b/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
new file mode 100644
index 000000000000..82b3d139ade5
--- /dev/null
+++ b/srcpkgs/sbsigntool/patches/f12484869c9590682ac3253d583bf59b890bb826.patch
@@ -0,0 +1,60 @@
+From f12484869c9590682ac3253d583bf59b890bb826 Mon Sep 17 00:00:00 2001
+From: dann frazier <dann.frazier@canonical.com>
+Date: Wed, 12 Aug 2020 15:27:08 -0600
+Subject: sbkeysync: Don't ignore errors from insert_new_keys()
+
+If insert_new_keys() fails, say due to a full variable store, we currently
+still exit(0). This can make it difficult to know something is wrong.
+For example, Debian and Ubuntu implement a secureboot-db systemd service
+to update the DB and DBX, which calls:
+
+ ExecStart=/usr/bin/sbkeysync --no-default-keystores --keystore /usr/share/secureboot/updates --verbose
+
+But although this seemed to succeed on my system, looking at the logs shows
+a different story:
+
+Inserting key update /usr/share/secureboot/updates/dbx/dbxupdate_x64.bin into dbx
+Error writing key update: Invalid argument
+Error syncing keystore file /usr/share/secureboot/updates/dbx/dbxupdate_x64.bin
+
+Signed-off-by: dann frazier <dann.frazier@canonical.com>
+Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
+---
+ src/sbkeysync.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/sbkeysync.c b/src/sbkeysync.c
+index e51f177..7748990 100644
+--- a/src/sbkeysync.c
++++ b/src/sbkeysync.c
+@@ -889,10 +889,12 @@ int main(int argc, char **argv)
+ {
+ bool use_default_keystore_dirs;
+ struct sync_context *ctx;
++ int rc;
+
+ use_default_keystore_dirs = true;
+ ctx = talloc_zero(NULL, struct sync_context);
+ list_head_init(&ctx->new_keys);
++ rc = EXIT_SUCCESS;
+
+ for (;;) {
+ int idx, c;
+@@ -985,10 +987,10 @@ int main(int argc, char **argv)
+ if (ctx->verbose)
+ print_new_keys(ctx);
+
+- if (!ctx->dry_run)
+- insert_new_keys(ctx);
++ if (!ctx->dry_run && insert_new_keys(ctx))
++ rc = EXIT_FAILURE;
+
+ talloc_free(ctx);
+
+- return EXIT_SUCCESS;
++ return rc;
+ }
+--
+cgit 1.2.3-1.el7
+
+
diff --git a/srcpkgs/sbsigntool/patches/openssl3.patch b/srcpkgs/sbsigntool/patches/openssl3.patch
new file mode 100644
index 000000000000..cd0d025ada7b
--- /dev/null
+++ b/srcpkgs/sbsigntool/patches/openssl3.patch
@@ -0,0 +1,35 @@
+Subject: [PATCH] Fix openssl-3.0 issue involving ASN1 xxx_it
+From: Jeremi Piotrowski <jeremi.piotrowski@microsoft.com>
+Origin: https://groups.io/g/sbsigntools/message/54
+
+Use ASN1_ITEM_rptr() instead of taking the address of IDC_PEID_it.
+
+openssl-3.0 changed the type of TYPE_it from `const ASN1_ITEM TYPE_it` to
+`const ASN1_ITEM *TYPE_it(void)`. This was previously hidden behind
+OPENSSL_EXPORT_VAR_AS_FUNCTION but in 3.0 only the function version is
+available. This change should have been transparent to the application, but
+only if the `ASN1_ITEM_rptr()` macro is used.
+
+This change passes `make check` with both openssl 1.1 and 3.0.
+
+Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
+---
+ src/idc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idc.c b/src/idc.c
+index 6d87bd4..0a82218 100644
+--- a/src/idc.c
++++ b/src/idc.c
+@@ -189,7 +189,7 @@ int IDC_set(PKCS7 *p7, PKCS7_SIGNER_INFO *si, struct image *image)
+
+ idc->data->type = OBJ_nid2obj(peid_nid);
+ idc->data->value = ASN1_TYPE_new();
+- type_set_sequence(image, idc->data->value, peid, &IDC_PEID_it);
++ type_set_sequence(image, idc->data->value, peid, ASN1_ITEM_rptr(IDC_PEID));
+
+ idc->digest->alg->parameter = ASN1_TYPE_new();
+ idc->digest->alg->algorithm = OBJ_nid2obj(NID_sha256);
+--
+2.25.1
+
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 42b2545d23ef..1bdee8c5b784 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,7 +1,7 @@
# Template file for 'sbsigntool'
pkgname=sbsigntool
version=0.9.4
-revision=4
+revision=5
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config help2man"
@@ -20,6 +20,8 @@ checksum="eddb7d21263ee2b07be8f0ed93b6ba021c3f943964730b2d86f44736fa1924d5
1dc1e1de5f2dda50dbd2e6a83355fe7ae38ca0f79daeb404026421af70606653"
skip_extraction="sbsigntool_0.9.2.orig.tar.gz"
conf_files="/etc/default/sbsigntool-kernel-hook"
+# openssl3 fix
+CFLAGS+=" -Wno-error=deprecated-declarations"
post_extract() {
bsdtar -xzf $XBPS_SRCDISTDIR/$pkgname-$version/sbsigntool_0.9.2.orig.tar.gz
From 0b005fb837e480c5bcef0ea9747d28eb00734ab7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 25 Jan 2023 23:13:37 +0100
Subject: [PATCH 082/356] libgit2: update to 1.5.1
---
...lar-remove-ftrunacte-from-libgit2-tests.patch | 16 +++-------------
srcpkgs/libgit2/template | 6 +++---
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
index b084896b4e65..4fb8488f82bb 100644
--- a/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
+++ b/srcpkgs/libgit2/patches/0001-clar-remove-ftrunacte-from-libgit2-tests.patch
@@ -1,14 +1,7 @@
-From 12d73c418253a5c396465079c2808e07de17a1db Mon Sep 17 00:00:00 2001
-From: Peter Pettersson <boretrk@hotmail.com>
-Date: Thu, 14 Jul 2022 18:28:58 +0200
-Subject: [PATCH] clar: remove ftrunacte from libgit2 tests
-
----
- tests/libgit2/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Backported from:
+https://github.com/libgit2/libgit2/commit/12d73c418253a5c396465079c2808e07de17a1db
diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
-index 27f421ad6..7f6fafe77 100644
--- a/tests/libgit2/CMakeLists.txt
+++ b/tests/libgit2/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
@@ -17,9 +10,6 @@ index 27f421ad6..7f6fafe77 100644
add_clar_test(libgit2_tests offline -v -xonline)
-add_clar_test(libgit2_tests invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
+add_clar_test(libgit2_tests invasive -v -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root)
- add_clar_test(libgit2_tests online -v -sonline -xonline::customcert)
+ add_clar_test(libgit2_tests online -v -sonline -xonline::customcert -xonline::clone::ssh_auth_methods)
add_clar_test(libgit2_tests online_customcert -v -sonline::customcert)
add_clar_test(libgit2_tests gitdaemon -v -sonline::push)
---
-2.38.0
-
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 0253f5c9c727..d8040d3be1c5 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,6 +1,6 @@
# Template file for 'libgit2'
pkgname=libgit2
-version=1.5.0
+version=1.5.1
revision=1
build_style=cmake
configure_args="-DENABLE_REPRODUCIBLE_BUILDS=ON -DUSE_SSH=ON"
@@ -10,8 +10,8 @@ short_desc="Git linkable library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
homepage="https://libgit2.org"
-distfiles="https://github.com/libgit2/libgit2/archive/v${version}.tar.gz"
-checksum=8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e
+distfiles="https://github.com/libgit2/libgit2/archive/refs/tags/v${version}.tar.gz"
+checksum=7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From 1abb20fd6f300f355ccc5b844adf5e1baf10bad6 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 23 Jan 2023 00:45:05 +0530
Subject: [PATCH 083/356] iwd: update to 2.2.
---
srcpkgs/iwd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 8aba54594dbe..17c0799ce7be 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
# Template file for 'iwd'
pkgname=iwd
-version=2.0
+version=2.2
revision=1
build_style=gnu-configure
configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="https://iwd.wiki.kernel.org/"
changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=5a0bfbc567092476d60a8f9700f68a273e39fd46e7177ce2d69bbc74255a930c
+checksum=dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570
make_dirs="/var/lib/iwd 0600 root root
/var/lib/ead 0600 root root
/etc/iwd 755 root root"
From 9a7b2ba93e85d91deb664de7f61451bc9c6679b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 24 Jan 2023 07:25:49 +0700
Subject: [PATCH 084/356] fpc: no needs rpmextract
---
srcpkgs/fpc/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index c867802cf756..d6d20a0c19c6 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -3,10 +3,8 @@ pkgname=fpc
version=3.2.0
revision=1
archs="x86_64* i686* ppc64le ppc64 ppc"
-create_wrksrc=yes
build_wrksrc="${pkgname}build-${version}"
conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
-hostmakedepends="rpmextract"
makedepends="ncurses-devel zlib-devel expat-devel"
short_desc="Free Pascal Compiler"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From aba7e2c1db03fb84ac656732825bfb9641c41cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 08:40:11 +0700
Subject: [PATCH 085/356] gnucash: update to 4.13.
---
srcpkgs/gnucash/template | 6 +++---
srcpkgs/gnucash/update | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/gnucash/update
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 6e8ddbac22bc..aebccbadc567 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
-version=4.12
-revision=3
+version=4.13
+revision=1
build_style=cmake
make_check_target=check
configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
@@ -15,7 +15,7 @@ maintainer="ManfredU <mu@usselmann.it>"
license="GPL-2.0-or-later"
homepage="http://www.gnucash.org"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=cc8c051a56b8bb433566d6e2890df59f3d895a395c8cf5246c1b728102ce10ae
+checksum=401a158086635ea17fbb145325558537289aa1d24d022f7c3317e12f3dabd8e7
pycompile_dirs="usr/share/gnucash/python"
conf_files="/etc/gnucash/environment"
diff --git a/srcpkgs/gnucash/update b/srcpkgs/gnucash/update
new file mode 100644
index 000000000000..e980afc360d1
--- /dev/null
+++ b/srcpkgs/gnucash/update
@@ -0,0 +1 @@
+ignore="*.9??"
From 3bcebef3e693c85df5a6c67e50efd8e224fed803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:29 +0700
Subject: [PATCH 086/356] linux6.1: update to 6.1.9.
---
srcpkgs/linux6.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index c2aa2477de3b..4fd43fad4089 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.1'
pkgname=linux6.1
-version=6.1.8
+version=6.1.9
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- b66c64b8288bfdaa1ce8e9f06af53697e2f538698786c2b6bae79084d8c74323"
+ 64e27f1de56225372d29ff92dc2d8fca6ae961e7470f2364e98c5af0aef261dc"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 948fb768717b2d4bc92496f868f5b7a9e0ca46d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 19:13:18 +0700
Subject: [PATCH 087/356] lint-commits: forbid localhost email, too
---
common/scripts/lint-commits | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index f4bb47c8f9f4..56f16ff194b3 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -36,6 +36,10 @@ do
print "::error title=Commit Lint::" C ": authored by noreply email";
ret=1;
}
+ /^author .*(localhost|localdomain|[(]none[)])/ && !msg {
+ print "::error title=Commit Lint::" C ": authored by localhost email";
+ ret=1;
+ }
!msg { next }
# 3: long-line-is-banned-except-footnote-like-this-for-url
(NF > 2) && (length > 80) {
From 7904d44c5c908336854c5814dc950a9c8c52f4c6 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 2 Feb 2023 15:04:18 +0100
Subject: [PATCH 088/356] terragrunt: update to 0.43.1.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index d5c160424509..e557ae9e4d3a 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.43.0
+version=0.43.1
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=8a4c257ee3f65f9c97d17400aeae705c644fc371393a2df3cd264afa77a1f813
+checksum=282179f73e4269df2311aa90d6b13f504f49bf0f3ee0c1dd573f60bc96053567
post_install() {
vlicense LICENSE.txt
From d29d9c160f482c7f66fbd573094de430b85a7bb8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:17:04 +0100
Subject: [PATCH 089/356] console-setup: update to 1.216.
---
srcpkgs/console-setup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/console-setup/template b/srcpkgs/console-setup/template
index f0f9268344e0..204d0a237488 100644
--- a/srcpkgs/console-setup/template
+++ b/srcpkgs/console-setup/template
@@ -1,6 +1,6 @@
# Template file for 'console-setup'
pkgname=console-setup
-version=1.215
+version=1.216
revision=1
hostmakedepends="perl"
depends="kbd ckbcomp"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
homepage="https://packages.debian.org/sid/console-setup"
distfiles="${DEBIAN_SITE}/main/c/console-setup/console-setup_${version}.tar.xz"
-checksum=d04bcf1b514b5986fe47eb484e959cad99e1744faa29a5fc1b3d1ca0ef7b636b
+checksum=8f913bcf669529c45fc32fdff53030d825c625f3622e062c88b19d971508282b
conf_files="/etc/console-setup/console-setup
/etc/console-setup/keyboard"
From 993d13478677853a810acee8514866fa9a7aaf0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:19:45 +0100
Subject: [PATCH 090/356] libcbor: update to 0.10.2.
---
srcpkgs/libcbor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libcbor/template b/srcpkgs/libcbor/template
index a4f27d8bb9b3..708198ff2502 100644
--- a/srcpkgs/libcbor/template
+++ b/srcpkgs/libcbor/template
@@ -1,6 +1,6 @@
# Template file for 'libcbor'
pkgname=libcbor
-version=0.10.1
+version=0.10.2
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/PJK/libcbor"
distfiles="https://github.com/PJK/libcbor/archive/v${version}.tar.gz"
-checksum=e8fa0a726b18861c24428561c80b3c95aca95f468df4e2f3e3ac618be12d3047
+checksum=e75f712215d7b7e5c89ef322a09b701f7159f028b8b48978865725f00f79875b
post_install() {
vlicense LICENSE.md
From 6ccee002e5a052364003ad070e20fe2d94a51c10 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:23:49 +0100
Subject: [PATCH 091/356] swi-prolog: update to 9.0.4.
---
srcpkgs/swi-prolog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index 1b61b473becc..674f1505bf0d 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,6 +1,6 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
-version=9.0.3
+version=9.0.4
revision=1
build_style=cmake
build_helper="qemu"
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="http://www.swi-prolog.org/"
changelog="http://www.swi-prolog.org/ChangeLog?branch=stable"
distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"
-checksum=e2919bc58710abd62b9cd40179a724c30bdbe9aa428af49d7fdc6d0158921afb
+checksum=feb2815a51d34fa81cb34e8149830405935a7e1d1c1950461239750baa8b49f0
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 17563f68ef2bce972d5f297697ccedd9570bf2f1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 2 Feb 2023 09:52:51 -0500
Subject: [PATCH 092/356] kore: ignore certain warnings (openssl3)
---
srcpkgs/kore/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 0927bc637dc7..175ae14d6a53 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
# Template file for 'kore'
pkgname=kore
version=4.2.3
-revision=2
+revision=3
# arch specific seccomp stuff
archs="x86_64* aarch64* ppc64*"
build_style=gnu-makefile
@@ -16,6 +16,8 @@ homepage="https://kore.io"
distfiles="https://kore.io/releases/kore-${version}.tar.gz"
checksum=f9a9727af97441ae87ff9250e374b9fe3a32a3348b25cb50bd2b7de5ec7f5d82
disable_parallel_build=yes
+# openssl3 fix
+CFLAGS+=" -Wno-deprecated-declarations -Wno-discarded-qualifiers"
export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}
From eca8f1e086f7b28aac0be0477c73a23578ea2397 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 17:26:47 +0100
Subject: [PATCH 093/356] mathcomp: update to 1.16.0.
---
srcpkgs/mathcomp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 09394c7e38ef..37acff40743e 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
# Template file for 'mathcomp'
pkgname=mathcomp
-version=1.15.0
-revision=3
+version=1.16.0
+revision=1
build_wrksrc="mathcomp"
build_style=gnu-makefile
hostmakedepends="coq ocaml-findlib"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="CECILL-B"
homepage="https://github.com/math-comp/math-comp"
distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
-checksum=33105615c937ae1661e12e9bc00e0dbad143c317a6ab78b1a15e1d28339d2d95
+checksum=36fe4f5487f4685db9c6e6affa92abb47248440e6d4dfaaa01ab31df5fd4b513
nocross="ocaml"
do_install() {
From e93cbc9e109a39e5956cda9f3df5f61d674bc006 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 28 Jan 2023 10:48:00 +0100
Subject: [PATCH 094/356] github-cli: update to 2.22.1
---
srcpkgs/github-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 351c497e0dda..510a07a6b4cd 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
# Template file for 'github-cli'
pkgname=github-cli
-version=2.22.0
+version=2.22.1
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://cli.github.com"
changelog="https://github.com/cli/cli/releases"
distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=fc9aacccd6a07da6fb2cfa57e2a08d72bdc3a3476f6abec6250cda1e59ae6e16
+checksum=09cdd1c435d453a0c610f407979ecf8d314aec41d7b8004794f136f05b0fe688
pre_build() {
local _date
From 14f2b9a39126610958f30237caae480fb3e807fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 1 Feb 2023 11:22:00 -0500
Subject: [PATCH 095/356] pkcs11-helper: update to 1.29.0
---
srcpkgs/pkcs11-helper/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index 90f10d0c2538..ac8ebe5138ca 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,25 +1,22 @@
# Template file for 'pkcs11-helper'
pkgname=pkcs11-helper
-version=1.25.1
-revision=6
+version=1.29.0
+revision=1
build_style=gnu-configure
configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
-hostmakedepends="automake libtool pkg-config doxygen"
+hostmakedepends="libtool pkg-config doxygen"
makedepends="openssl-devel"
short_desc="Library to help simplify interacting with PKCS#11 providers"
maintainer="Aloz1 <kno0001@gmail.com>"
license="GPL-2.0-only, BSD-3-Clause"
-homepage="https://github.com/OpenSC/${pkgname}/wiki"
-distfiles="https://github.com/OpenSC/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=fbcec9dd15a71d6ef22b09f63934c66d7d0292fefbaf3a60703ee4a9a73bf6a5
+homepage="https://github.com/OpenSC/pkcs11-helper"
+changelog="https://raw.githubusercontent.com/OpenSC/pkcs11-helper/master/ChangeLog"
+distfiles="https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${version}/pkcs11-helper-${version}.tar.bz2"
+checksum=996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6
build_options="threading"
build_options_default="threading"
desc_option_threading="Enable threading and slotevent support"
-pre_configure() {
- autoreconf -fi
-}
-
post_install() {
vlicense COPYING
vlicense COPYING.GPL
From 2453868316a4fa788c7e51fa2d5a326795f61a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 28 Oct 2022 18:59:37 -0300
Subject: [PATCH 096/356] python3-fastjsonschema: update to 2.16.2.
---
srcpkgs/python3-fastjsonschema/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
index 707f9852cb87..ab5f04f4fb55 100644
--- a/srcpkgs/python3-fastjsonschema/template
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -1,7 +1,7 @@
# Template file for 'python3-fastjsonschema'
pkgname=python3-fastjsonschema
-version=2.15.3
-revision=3
+version=2.16.2
+revision=1
build_style=python3-module
make_check_args="--deselect tests/benchmarks/test_benchmark.py"
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
homepage="https://github.com/seznam/python-fastjsonschema"
changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
-checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+checksum=552e8b07a076f4628e9a3c78f040ed673bed9b5b860d3cb51b323da50e2e3d47
post_install() {
vlicense LICENSE
From 41a6e818443ff2e96d96bdc062645b09b10bb868 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 14:57:19 +0100
Subject: [PATCH 097/356] knot: update to 3.2.5.
---
srcpkgs/knot/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index e2e81817260f..8696b58ca7e9 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
# Template file for 'knot'
pkgname=knot
-version=3.2.4
+version=3.2.5
revision=1
build_style=gnu-configure
configure_args="
@@ -18,9 +18,9 @@ short_desc="High-performance authoritative-only DNS server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.knot-dns.cz/"
-changelog="https://github.com/CZ-NIC/knot/raw/master/NEWS"
+changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13
+checksum=c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820
system_accounts="_knot"
_knot_homedir="/var/lib/knot"
From 9538a33dc9f84d975fac7041638bf4e81e5e8799 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 18:16:33 +0100
Subject: [PATCH 098/356] binwalk: update to 2.3.4.
---
srcpkgs/binwalk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index 3fd78853fc14..b5a3c78f4f01 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,7 +1,7 @@
# Template file for 'binwalk'
pkgname=binwalk
-version=2.3.3
-revision=3
+version=2.3.4
+revision=1
build_style=python3-module
hostmakedepends="python3"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="MIT"
homepage="https://github.com/ReFirmLabs/binwalk"
distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=7e32b94dc77632b51d18732b5456e2a3ef85e4521d7d4a54410e36f93859501f
+checksum=60416bfec2390cec76742ce942737df3e6585c933c2467932f59c21e002ba7a9
post_extract() {
vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py
From 35b7b4fa61560add7a4fefcd842fd4d398dde0f9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 3 Feb 2023 18:31:18 +0100
Subject: [PATCH 099/356] gnumeric: update to 1.12.55.
---
srcpkgs/gnumeric/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 9d8eeebe3784..bb5db0bfb433 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,6 +1,6 @@
# Template file for 'gnumeric'
pkgname=gnumeric
-version=1.12.54
+version=1.12.55
revision=1
build_style=gnu-configure
hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="http://gnumeric.org/"
changelog="https://github.com/GNOME/gnumeric/raw/master/NEWS"
distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz"
-checksum=46904062fd1c4a4c93596d26bf67932cd72fc0f8d2c5a67c17918527fee82b74
+checksum=c69a09cd190b622acca476bbc3d4c03d68d7ccf59bba61bf036ce60885f9fb65
# This isn't a direct dependency but when soname bumping perl it will
# cause build failures
From 21738e409974fc8f3346050c579331955913d45b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:13:55 +0100
Subject: [PATCH 100/356] falkon: update to 22.12.2.
---
srcpkgs/falkon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 1ebf93e88577..e7d69ffe683f 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,6 +1,6 @@
# Template file for 'falkon'
pkgname=falkon
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext pkg-config
@@ -17,7 +17,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-3.0-or-later"
homepage="https://www.falkon.org"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7dea2defd57d6d6db3a3413cc0e480db8fc9b56f56f40d7a22725308667c9693
+checksum=8e2838716646f6fd6c2c811210a92688b70c603d3bff0b0457a7748a02eeddb4
LDFLAGS="-Wl,--no-fatal-warnings"
From 3e8223d0018d127ffd9a216f607658986abfdde8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:16:34 +0100
Subject: [PATCH 101/356] libkdcraw5: update to 22.12.2.
---
srcpkgs/libkdcraw5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 85327ad1dcc6..c30f692acdbf 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
# Template file for 'libkdcraw5'
pkgname=libkdcraw5
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="https://www.kde.org/applications/graphics/"
distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=8b0a71937f7ed4926c2c047e0bd36001e5e98f52b1cf633d8bfbe4e4eeac65eb
+checksum=1f060a20bfe22d2874484d2294a4398ef8055b763e32a0a2f739c6bdd55af686
libkdcraw5-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 39f3d798dfa4baa6f4d713ccf3ad2d1753ced59a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 3 Feb 2023 19:28:05 +0100
Subject: [PATCH 102/356] gwenview: update to 22.12.2.
---
srcpkgs/gwenview/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 66105668037f..3e8dd094ceb4 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
# Template file for 'gwenview'
pkgname=gwenview
-version=22.12.1
+version=22.12.2
revision=1
build_style=cmake
build_helper=qemu
@@ -19,4 +19,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later"
homepage="https://www.kde.org/applications/graphics/gwenview"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4bbf8cdd69c4918b457251d6f906c5ec5ea60ad4d08635fd7212f67a62fe278a
+checksum=7dc1066d03e4b8975109af637929cd391ff2e591b6d3ccc46ac8426b9b7f6fb6
From dfb906e1bf6e602d552fa626b09cfc9ccc08f7a5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:04 +0100
Subject: [PATCH 103/356] ETL: update to 1.4.4
---
srcpkgs/ETL/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ETL/template b/srcpkgs/ETL/template
index 86c878478638..a2dab21bc501 100644
--- a/srcpkgs/ETL/template
+++ b/srcpkgs/ETL/template
@@ -1,6 +1,7 @@
# Template file for 'ETL'
+# Should be kept in sync with 'synfig' and 'synfigstudio'
pkgname=ETL
-version=1.4.3
+version=1.4.4
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
@@ -10,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/ETL-${version}.tar.gz"
-checksum=f0bf2e6ee6aa96c586657d64a9a49def3544eb1b3068e226a737e423049f73a0
+checksum=cc87e478d8e808b1a2266f8f6a3eb54396ba54ff63abb30ea5b9b7bcfb85caca
From 2729344d4986b5b6ff52a6bd9ccb1a9935ab45f2 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:27 +0100
Subject: [PATCH 104/356] synfig: update to 1.4.4
---
srcpkgs/synfig/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfig/template b/srcpkgs/synfig/template
index 390f097c0f05..182dc3cd280f 100644
--- a/srcpkgs/synfig/template
+++ b/srcpkgs/synfig/template
@@ -1,7 +1,8 @@
# Template file for 'synfig'
+# Should be kept in sync with 'synfigstudio' and 'ETL'
pkgname=synfig
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="boost-build ImageMagick pkg-config intltool"
@@ -13,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig-${version}.tar.gz"
-checksum=0c8d02ff6c77e468021a4497be34323d38246208d199ab1c3bbf65c9794752e7
+checksum=cd9882a091433e22e484e47d7bfe542aaefd3f62bfd746d306be4ce964756f06
CXXFLAGS="-std=c++11 -DHAVE_LOCALE_H=1"
From b93a9d6907327cbfc226c96d7e349b8eec19fc9c Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 1 Jan 2023 12:02:47 +0100
Subject: [PATCH 105/356] synfigstudio: update to 1.4.4
---
srcpkgs/synfigstudio/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template
index 4b36350f8768..61d50676c6e1 100644
--- a/srcpkgs/synfigstudio/template
+++ b/srcpkgs/synfigstudio/template
@@ -1,7 +1,8 @@
# Template file for 'synfigstudio'
+# Should be kept in sync with 'synfig' and 'ETL'
pkgname=synfigstudio
-version=1.4.3
-revision=2
+version=1.4.4
+revision=1
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool gettext synfig"
@@ -12,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://www.synfig.org/"
distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfigstudio-${version}.tar.gz"
-checksum=500d08e94b803aa261fa17eebb3ed74cd1573296477f866e3fe8cceab2f7c1ba
+checksum=8893c681ccda6bc34f173d5183e28fbf78feb348f26a7661bc3c038e837eb21f
python_version=3
CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1"
export DATADIRNAME=share
From 5e638ecbc9cfe962a3b21d7babac9745c8e32b21 Mon Sep 17 00:00:00 2001
From: Youssef Eddaif <jo9unreal@gmail.com>
Date: Thu, 2 Feb 2023 19:50:26 +0100
Subject: [PATCH 106/356] go : update to 1.19.5
---
srcpkgs/go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 230b040d9090..029c00cc09e1 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
# Template file for 'go'
pkgname=go
-version=1.19.4
+version=1.19.5
revision=1
create_wrksrc=yes
build_wrksrc=go
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
homepage="https://go.dev/"
changelog="https://go.dev/doc/devel/release.html"
distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368
+checksum=8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f
nostrip=yes
noverifyrdeps=yes
# on CI it tries to use `git submodule`, which is not part of chroot-git
From 8572eb8385b54364b6c0215a1337e474010df451 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 22 Jan 2023 20:03:26 +0530
Subject: [PATCH 107/356] toot: update to 0.34.0.
---
srcpkgs/toot/template | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template
index c04382d273c7..9f7fd36d09f5 100644
--- a/srcpkgs/toot/template
+++ b/srcpkgs/toot/template
@@ -1,20 +1,16 @@
# Template file for 'toot'
pkgname=toot
-version=0.29.0
+version=0.34.0
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4 python3-requests python3-setuptools python3-wcwidth
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-BeautifulSoup4 python3-requests python3-wcwidth
python3-urwid"
-checkdepends="python3-wheel python3-pytest ${depends}"
+checkdepends="${depends} python3-psycopg2 python3-pytest-xdist"
short_desc="Mastodon CLI client"
maintainer="Jon Levin <jon@jefferiestube.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/ihabunek/toot"
changelog="https://raw.githubusercontent.com/ihabunek/toot/master/CHANGELOG.md"
-distfiles="https://github.com/ihabunek/toot/archive/${version}.tar.gz"
-checksum=821d549798453da8ad669a605cddc1ead8a797d716723158526534549a4b0d4d
-
-pre_check() {
- make dist
-}
+distfiles="https://github.com/ihabunek/toot/archive/refs/tags/${version}.tar.gz"
+checksum=56e1bfd5d8a0ebb837ed92b5de5682a93336b87828476ca20b5d7ac7fa20ad33
From 8ea57e6a654b44af54528513dc4ed2017e9cbac5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Fri, 3 Feb 2023 10:22:58 +0100
Subject: [PATCH 108/356] vscode: update to 1.75.0
---
srcpkgs/vscode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index a06fd59bca1e..ac5a91cb37bf 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.74.3
+version=1.75.0
revision=1
_electronver=19.0.8
_npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=f3db2b1132977ddd0309e7c3da5c594a5d77bc423d5e64b3c9900890a43be9ac
+checksum=719c1efeca10a163b18618b5b689d4843247d3e86a27a6e898113219274cb99c
nocross=yes # x64 build does not cut it, it contains native code
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From 696c0329efebfce528ab385ee14117f6b691362b Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cam@nohom.org>
Date: Wed, 1 Feb 2023 15:21:43 -0800
Subject: [PATCH 109/356] podman: update to 4.4.0
---
srcpkgs/podman/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index fef36038e424..0c7265f3dfb0 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
# Template file for 'podman'
pkgname=podman
-version=4.3.1
-revision=2
+version=4.4.0
+revision=1
build_style=go
go_import_path="github.com/containers/podman/v4"
go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -16,7 +16,7 @@ license="Apache-2.0"
homepage="https://podman.io/"
changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813
+checksum=4bb966fd960b0aae05181e30672a6b20be365225758110eb251b81214414cb25
if [ "$CROSS_BUILD" ]; then
go_build_tags+=" containers_image_openpgp"
From cea950e8e24a4b328080cbd45ab8dc50d10a288e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 00:57:37 +0530
Subject: [PATCH 110/356] black: update to 23.1.0.
---
srcpkgs/black/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/black/template b/srcpkgs/black/template
index 88846fc3ac43..0b1553e3b528 100644
--- a/srcpkgs/black/template
+++ b/srcpkgs/black/template
@@ -1,11 +1,12 @@
# Template file for 'black'
pkgname=black
-version=22.12.0
+version=23.1.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling hatch-vcs"
-depends="python3-click python3-platformdirs python3-pathspec python3-mypy_extensions"
-checkdepends="${depends} python3-pytest-xdist python3-aiohttp python3-colorama python3-uvloop
+depends="python3-click python3-platformdirs python3-pathspec python3-packaging
+ python3-mypy_extensions"
+checkdepends="${depends} python3-pytest-xdist python3-aiohttp
python3-ipython python3-tokenize-rt"
short_desc="Uncompromising Python code formatter"
maintainer="icp <pangolin@vivaldi.net>"
@@ -13,7 +14,7 @@ license="MIT"
homepage="https://black.readthedocs.io/en/stable/"
changelog="https://raw.githubusercontent.com/psf/black/main/CHANGES.md"
distfiles="${PYPI_SITE}/b/black/black-${version}.tar.gz"
-checksum=229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f
+checksum=b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac
make_check_pre="env PYTHONPATH=src"
post_check() {
From 29e00748a43306686076ce3a8c01344448a0d8bc Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 16:36:22 +0100
Subject: [PATCH 111/356] seahorse: allow building with GnuPG-2.4.x
This patch is taken from upstream but is not in any released version yet
---
.../patches/allow-building-with-gpg-2.4.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
diff --git a/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
new file mode 100644
index 000000000000..fca2c139b3c6
--- /dev/null
+++ b/srcpkgs/seahorse/patches/allow-building-with-gpg-2.4.patch
@@ -0,0 +1,25 @@
+From 9260c74779be3d7a378db0671af862ffa3573d42 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Wed, 21 Dec 2022 20:58:26 +0800
+Subject: [PATCH] Allow building with GnuPG-2.4.x
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e29b5322..23d0b54f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -26,7 +26,7 @@ endif
+ # Dependencies
+ min_glib_version = '2.66'
+ min_gcr_version = '3.38'
+-accepted_gpg_versions = [ '2.2.0', '2.3.0' ]
++accepted_gpg_versions = [ '2.2.0', '2.3.0', '2.4.0' ]
+ gpg_check_version = find_program('build-aux' / 'gpg_check_version.py')
+
+ glib_deps = [
+--
+2.39.1
+
From 8f40e45e3b07d904d62434cf086fad1057c3ab59 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 112/356] etc/xbps.d/repos-*.conf: add bootstrap repo
---
etc/xbps.d/repos-local-x86_64-multilib.conf | 1 +
etc/xbps.d/repos-local.conf | 1 +
etc/xbps.d/repos-remote-aarch64-musl.conf | 1 +
etc/xbps.d/repos-remote-aarch64.conf | 1 +
etc/xbps.d/repos-remote-musl.conf | 1 +
etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
etc/xbps.d/repos-remote.conf | 1 +
7 files changed, 7 insertions(+)
diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..64ece6521e7b 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -1,4 +1,5 @@
# DON'T EDIT THIS FILE
# x86_64/glibc local repositories
+repository=/host/binpkgs/multilib/bootstrap
repository=/host/binpkgs/multilib
repository=/host/binpkgs/multilib/nonfree
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..6b89e36484ae 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -1,5 +1,6 @@
# DON'T EDIT THIS FILE
# Local repositories
+repository=/host/binpkgs/bootstrap
repository=/host/binpkgs
repository=/host/binpkgs/nonfree
repository=/host/binpkgs/debug
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -1,4 +1,5 @@
# aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..58c544475fcc 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -1,4 +1,5 @@
# aarch64 voidlinux remote repositories
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
repository=https://repo-default.voidlinux.org/current/aarch64
repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
repository=https://repo-default.voidlinux.org/current/aarch64/debug
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..cde4832335c0 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -1,4 +1,5 @@
# voidlinux remote repositories (musl)
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
repository=https://repo-default.voidlinux.org/current/musl
repository=https://repo-default.voidlinux.org/current/musl/nonfree
repository=https://repo-default.voidlinux.org/current/musl/debug
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..aa1a24acafdf 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
# voidlinux remote repositories (x86_64/glibc)
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
repository=https://repo-default.voidlinux.org/current/multilib
repository=https://repo-default.voidlinux.org/current/multilib/nonfree
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..e171ed53c2d4 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -1,4 +1,5 @@
# voidlinux remote repositories (glibc)
+repository=https://repo-default.voidlinux.org/current/bootstrap
repository=https://repo-default.voidlinux.org/current
repository=https://repo-default.voidlinux.org/current/nonfree
repository=https://repo-default.voidlinux.org/current/debug
From 6694c47a45e58062ae8b8a768577f050d0d3d500 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 113/356] common/xbps-src/shutils/: add bootstrap repo
---
common/xbps-src/shutils/bulk.sh | 4 ++--
common/xbps-src/shutils/chroot.sh | 20 +++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 31732abe50a1..69e36f4a43f4 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
return $?
;;
local)
- bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+ bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}/bootstrap" -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
return $?
;;
esac
@@ -122,6 +122,6 @@ bulk_update() {
if [ -n "$pkgs" -a "$bulk_update_cmd" == installed ]; then
echo
msg_normal "xbps-src: updating your system, confirm to proceed...\n"
- ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+ ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY/bootstrap --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
fi
}
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index b8cb25523724..d65d8d7e3074 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -214,16 +214,18 @@ chroot_sync_repodata() {
# Update xbps alternative repository if set.
mkdir -p $confdir
if [ -n "$XBPS_ALT_REPOSITORY" ]; then
- ( \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
- ) > $confdir/00-repository-alt-local.conf
+ cat <<- ! > $confdir/00-repository-alt-local.conf
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug
+ !
if [ "$XBPS_MACHINE" = "x86_64" ]; then
- ( \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
- echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
- ) >> $confdir/00-repository-alt-local.conf
+ cat <<- ! >> $confdir/00-repository-alt-local.conf
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib
+ repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree
+ !
fi
else
rm -f $confdir/00-repository-alt-local.conf
From fac9dcea3cd2a342fcebf9704eb41f42ba742045 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 114/356] common/scripts/lint-conflicts: add bootstrap repo
---
common/scripts/lint-conflicts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..8c7abfd92447 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
fi
declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}/bootstrap" "--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
rv=0
template_exists() {
From 9403397e4ec338f1189d732ab8736b4a8cb1c743 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 115/356] common/travis/: add bootstrap repo to CI scripts
---
common/travis/check-install.sh | 4 +++-
common/travis/show_files.sh | 3 ++-
common/travis/xpkgdiff.sh | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..b5268085db59 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
ROOTDIR="-r /usr/$triplet"
fi
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs/bootstrap
+ --repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree"
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..c8de93a9abae 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -7,7 +7,8 @@ export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
- xbps-query --repository=$HOME/hostdir/binpkgs \
+ xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+ --repository=$HOME/hostdir/binpkgs \
--repository=$HOME/hostdir/binpkgs/nonfree \
-i -f "$subpkg" ||
/bin/echo -e "\x1b[33m $subpkg wasn't found\x1b[0m"
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 6450a6c0889b..ce042c1628bf 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -9,7 +9,8 @@ ARGS="-a $2 -R https://repo-ci.voidlinux.org/current"
while read -r pkg; do
for subpkg in $(xsubpkg $pkg); do
- if xbps-query --repository=$HOME/hostdir/binpkgs \
+ if xbps-query --repository=$HOME/hostdir/binpkgs/bootstrap \
+ --repository=$HOME/hostdir/binpkgs \
--repository=$HOME/hostdir/binpkgs/nonfree \
-i "$subpkg" >&/dev/null; then
/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
From 4c3e68e5f0f01a370c7487c1dd58dfda5fc463d2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 116/356] chroot-bash: move to bootstrap repo
---
srcpkgs/chroot-bash/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 90dcc3372d85..da448e2a57f8 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -15,6 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/bash/bash.html"
distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
for _p in $(seq -w 001 ${_bash_patchlevel}); do
From f319ec47554da19d7c40b3e18ef4a143c4d1ba29 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 117/356] chroot-distcc: move to bootstrap repo
---
srcpkgs/chroot-distcc/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 5e1609934f26..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -13,6 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://distcc.github.io"
distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
conflicts="distcc>=0"
CFLAGS="-fcommon"
From 58d7b02d80c83b1263203092f15dd7ffd56a006d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 118/356] chroot-gawk: move to bootstrap repo
---
srcpkgs/chroot-gawk/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index 2bb65e0467ed..1217a9d982fa 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
homepage="https://directory.fsf.org/wiki/Gawk"
distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
bootstrap=yes
provides="awk-0_1"
From 512873df035f107827fa1dd3020efa4d29f063cc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 119/356] chroot-git: move to bootstrap repo
---
srcpkgs/chroot-git/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index b7641aa34392..8e0e0db7b291 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -10,6 +10,7 @@ license="GPL-2.0-only"
homepage="https://git-scm.com/"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161
+repository=bootstrap
if [ "$CHROOT_READY" ]; then
checkdepends="perl gnupg"
From ffbbad8278645b46bd2decbf5834b73cda246d0a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 120/356] chroot-grep: move to bootstrap repo
---
srcpkgs/chroot-grep/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 7b68ca9348b8..fe26cf1f17f9 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -14,6 +14,7 @@ checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
conflicts="grep>=0"
provides="grep-${version}_${revision}"
make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
From 1526acf54cdbf6f1208c53a413bce9967e488f27 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 121/356] chroot-util-linux: move to bootstrap repo
---
srcpkgs/chroot-util-linux/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index cdfd6ff49840..d03deda0344b 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -20,6 +20,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
conflicts="util-linux>=0"
provides="util-linux-${version}_${revision}"
+repository=bootstrap
if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
From 2e0d81381cfa1f309b68f89d972b0a5bc9654af7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 122/356] curl: move chroot- subpkg to bootstrap repo
---
srcpkgs/curl/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 5442ecfaca4c..6f70942f8838 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -88,6 +88,7 @@ libcurl-devel_package() {
chroot-curl_package() {
short_desc+=" - for build infra use"
+ repository=bootstrap
pkg_install() {
vbin $DESTDIR/usr/bin/curl chroot-curl
}
From aea66ac0432ecac594a53e5ea92b588e54d56613 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 123/356] cargo-bootstrap: move to bootstrap repo
---
srcpkgs/cargo-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index de2b886baa10..4e39b797a035 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
conflicts="cargo>=0"
lib32disabled=yes
nostrip=yes
+repository=bootstrap
_bootstrap_url="https://static.rust-lang.org/dist"
From a2bc8fa1e37b28b5043c992cd88347b839fb465e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 19 Nov 2022 19:10:32 -0500
Subject: [PATCH 124/356] cargo-auditable-bootstrap: move to bootstrap repo
---
srcpkgs/cargo-auditable-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/cargo-auditable-bootstrap/template b/srcpkgs/cargo-auditable-bootstrap/template
index a7fa067c56ea..4efd32137b91 100644
--- a/srcpkgs/cargo-auditable-bootstrap/template
+++ b/srcpkgs/cargo-auditable-bootstrap/template
@@ -14,6 +14,7 @@ homepage="https://github.com/rust-secure-code/cargo-auditable"
changelog="https://github.com/rust-secure-code/cargo-auditable/raw/master/cargo-auditable/CHANGELOG.md"
distfiles="https://github.com/rust-secure-code/cargo-auditable/archive/refs/tags/v${version}.tar.gz"
checksum=1e04922614623ab0fc641ca6b0fc5ab04c91845b19efbace034e161a0e120b33
+repository=bootstrap
post_install() {
vlicense ../LICENSE-MIT
From a16cd02821bc79ae655ae4b2a0eab72c5029c022 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 125/356] dmd-bootstrap: move to bootstrap repo
---
srcpkgs/dmd-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
provides="d-compiler-${version}_${revision}"
+repository=bootstrap
post_extract() {
rm -rf dmd druntime phobos
From c84e14d5b94629890fac853db8adda578bd7bfb2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 126/356] go1.12-bootstrap: move to bootstrap repo
---
srcpkgs/go1.12-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 222baa991a2e..304d2053d041 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -11,6 +11,7 @@ nostrip=yes
noverifyrdeps=yes
nocross=yes
lib32disabled=yes
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
depends+=" gcompat"
From 06ef1bbe0b060d26e06a2168035a439fd3811c4d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 127/356] rust-bootstrap: move to bootstrap repo
---
srcpkgs/rust-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 1fe6f1dee75a..23f147c9fcb9 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
conflicts="rust>=0"
lib32disabled=yes
nostrip=yes
+repository=bootstrap
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
depends="libexecinfo-devel"
From 523de5047eade68f945d0b61d861ae11ef92e06e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 128/356] openjdk7-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk7-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 53dc975a16da..cba1b589f699 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -33,6 +33,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="https://icedtea.classpath.org/"
lib32disabled=yes
make_check=no # requires full jdk build
+repository=bootstrap
if [ -n "$XBPS_DEBUG_PKGS" ]; then
configure_args+=" --enable-native-debuginfo"
From 3207577b93c5956e2132604787a7905af646cf1f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 129/356] openjdk9-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk9-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index d42b6ea3874a..6d85e3e6f17d 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea
From e7db6cd398e9e13d41709c0b5acd65a7119e019f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 130/356] openjdk10-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk10-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c8c621147b6..4776e4b19047 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -34,6 +34,7 @@ homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk10u/archive/refs/tags/jdk-${_repo_ver}.tar.gz"
checksum="39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1"
lib32disabled=yes
+repository=bootstrap
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From 94f3d2a3d5e06ba95dbdae397742083bca0189b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 131/356] openjdk12-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk12-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index c09ed20d2d04..3bbc2c6967e7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -43,6 +43,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
provides="java-environment-${version}_1 java-runtime-${version}_1"
lib32disabled=yes
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From c177fff22ffc3ed7c7f056f31f3583fcce5e6f91 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 132/356] openjdk13-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk13-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 34e901afd839..89b59cfc6f84 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -43,6 +43,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
provides="java-environment-${version}_1 java-runtime-${version}_1"
lib32disabled=yes
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From d4b07dfabab91edeabf78cf909301c16aea095c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 133/356] openjdk14-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk14-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index e58d4448491f..b20333bb85b4 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -42,6 +42,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 3815ed88753150f968b03227bcbce4f5bbb1be3e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 134/356] openjdk15-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk15-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 62f2626c0d53..a3b515b98a96 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -47,6 +47,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 5c98f2dea970761157cee40dfae907c1b8a4b499 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 135/356] openjdk16-bootstrap: move to bootstrap repo
---
srcpkgs/openjdk16-bootstrap/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index e4d09511cee9..b73b590b0b01 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -47,6 +47,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
provides="java-environment-${version}_1 java-runtime-${version}_1"
nocross=yes
+repository=bootstrap
# Build is still parallel, but don't use -jN.
disable_parallel_build=yes
From 4d8289fb27a8540c5bb17bc81e20e91edcd628b0 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 3 Feb 2023 21:34:36 -0600
Subject: [PATCH 136/356] .github/workflows: update masterdirs
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 22cbaa0a1ffe..9065af2e31df 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230111RC01-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 4c3aeb42cc2b..6a9a433e1d65 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230111RC01-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From 26b6e6b3c5db707e74acc42122bfe48a0f179f07 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 3 Feb 2023 22:57:53 -0600
Subject: [PATCH 137/356] .github/workflows: Use a different vintage of
masterdir
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9065af2e31df..f3ad322862d9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 6a9a433e1d65..15783160916c 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC01-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From a992b2794ed922ed8f8386665a6b76bcb889279c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 4 Feb 2023 15:05:05 +0100
Subject: [PATCH 138/356] .github/workflows: update containers to latest
masterdir image
---
.github/workflows/build.yaml | 2 +-
.github/workflows/cycles.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f3ad322862d9..6d86820ae7e2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
if: "!contains(github.event.pull_request.title, '[ci skip]') && !contains(github.event.pull_request.body, '[ci skip]')"
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-${{ matrix.config.bootstrap }}'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230204RC01-${{ matrix.config.bootstrap }}'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 15783160916c..7803c91b39cb 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -10,7 +10,7 @@ jobs:
permissions:
issues: write
container:
- image: 'ghcr.io/void-linux/xbps-src-masterdir:20230203RC02-x86_64-musl'
+ image: 'ghcr.io/void-linux/xbps-src-masterdir:20230204RC01-x86_64-musl'
env:
PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
steps:
From 26a28b1228a99472ea161ac34b8a3f5e6f6e4923 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 3 Feb 2023 21:05:02 -0500
Subject: [PATCH 139/356] python3: fix checks on x86_64-musl
---
srcpkgs/python3/template | 39 +++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 972a3cf5a2ec..3b37f46a8a91 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -73,22 +73,29 @@ do_configure() {
}
do_check() {
- # Tests ignored due to expected failures:
- # test_chown_*: relies on sane group membership not found in xbps-src
- # test_getspnam_exception: expects shadow passwd db unreadable by user
- # test_find_library_with_*: expects functionality patched out for musl
- # test_openssl_version: LibreSSL version and OpenSSL_version_num disagree
- # test_shared_ciphers: SSL advertises unexpected ciphers
- # test_freeze_simple_script: requires in-tree expat, which we removed
- #
- # Test ignored due to failures for unknown reasons:
- # test_session*: anomalies in SSL session handling
- # test_localtime_daylight_*_dst_true: overflow in datetime.time.mktime
- local opts="-i test_chown_* -i test_getspnam_exception \
- -i test_find_library_with_* -i test_openssl_version \
- -i test_shared_ciphers -i test_session* \
- -i test_localtime_daylight_*_dst_true \
- -i test_freeze_simple_script"
+ local opts
+
+ # relies on sane group membership not found in xbps-src
+ opts="-i test_chown_*"
+ # expects shadow passwd db unreadable by user
+ opts+=" -i test_getspnam_exception"
+ # expects functionality patched out for musl
+ opts+=" -i test_find_library_with_*"
+ # SSL advertises unexpected ciphers
+ opts+=" -i test_shared_ciphers"
+ # requires in-tree expat, which we removed
+ opts+=" -i test_freeze_simple_script"
+ # anomalies in SSL session handling
+ opts+=" -i test_session*"
+ # overflow in datetime.time.mktime
+ opts+=" -i test_localtime_daylight_*_dst_true"
+
+ if [ "${XBPS_TARGET_LIBC}" = "musl" ]; then
+ # musl doesn't work with locales
+ opts+=" -i test_locale* -i test_c_locale* -i test__locale"
+ opts+=" -i test_fpathconf"
+ fi
+
make ${makejobs} EXTRATESTOPTS="${opts}" quicktest
}
From df3b62873a82f070d20f56b2049364f29d4110db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 20:19:15 +0200
Subject: [PATCH 140/356] postgis-postgresql13: remove
---
srcpkgs/postgis-postgresql13/template | 32 ---------------------------
srcpkgs/postgis-postgresql13/update | 2 --
2 files changed, 34 deletions(-)
delete mode 100644 srcpkgs/postgis-postgresql13/template
delete mode 100644 srcpkgs/postgis-postgresql13/update
diff --git a/srcpkgs/postgis-postgresql13/template b/srcpkgs/postgis-postgresql13/template
deleted file mode 100644
index b95707840357..000000000000
--- a/srcpkgs/postgis-postgresql13/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'postgis-postgresql13'
-pkgname=postgis-postgresql13
-version=3.2.1
-revision=3
-build_style=gnu-configure
-configure_args="
- --with-projdir=${XBPS_CROSS_BASE}/usr
- --with-jsondir=${XBPS_CROSS_BASE}/usr
- --with-protobufdir=${XBPS_CROSS_BASE}/usr
- --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
-hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql13-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql13-libs-devel
- proj-devel protobuf-c-devel pcre-devel json-c-devel"
-checkdepends="libxslt CUnit-devel"
-short_desc="Spatial database extender for PostgreSQL"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://postgis.net/"
-changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
-distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
-nocross="FIXME: Cannot run test program to determine PROJ version"
-
-pre_configure() {
- ./autogen.sh
-}
-
-pre_check() {
- # regression tests require running postgresql
- vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
-}
diff --git a/srcpkgs/postgis-postgresql13/update b/srcpkgs/postgis-postgresql13/update
deleted file mode 100644
index e5577e6b068a..000000000000
--- a/srcpkgs/postgis-postgresql13/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=postgis
-ignore="*alpha* *beta* *rc*"
From 31c3e8de0f2da0060654bf968ebec42ffb2a69cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 20:22:27 +0200
Subject: [PATCH 141/356] postgresql13: remove
---
srcpkgs/postgresql13-client | 1 -
srcpkgs/postgresql13-contrib | 1 -
srcpkgs/postgresql13-doc | 1 -
srcpkgs/postgresql13-libs | 1 -
srcpkgs/postgresql13-libs-devel | 1 -
srcpkgs/postgresql13-plperl | 1 -
srcpkgs/postgresql13-plpython | 1 -
srcpkgs/postgresql13-pltcl | 1 -
srcpkgs/postgresql13/files/pg_config.sh.in | 143 -----------
srcpkgs/postgresql13/files/postgresql.confd | 17 --
srcpkgs/postgresql13/files/postgresql.pam | 3 -
.../postgresql13/files/postgresql13/control/t | 2 -
.../postgresql13/files/postgresql13/log/run | 2 -
srcpkgs/postgresql13/files/postgresql13/run | 27 ---
srcpkgs/postgresql13/files/profile.sh | 14 --
.../patches/pg_config-cross-value.patch | 45 ----
srcpkgs/postgresql13/patches/relocate.patch | 22 --
srcpkgs/postgresql13/template | 228 ------------------
srcpkgs/postgresql13/update | 2 -
19 files changed, 513 deletions(-)
delete mode 120000 srcpkgs/postgresql13-client
delete mode 120000 srcpkgs/postgresql13-contrib
delete mode 120000 srcpkgs/postgresql13-doc
delete mode 120000 srcpkgs/postgresql13-libs
delete mode 120000 srcpkgs/postgresql13-libs-devel
delete mode 120000 srcpkgs/postgresql13-plperl
delete mode 120000 srcpkgs/postgresql13-plpython
delete mode 120000 srcpkgs/postgresql13-pltcl
delete mode 100644 srcpkgs/postgresql13/files/pg_config.sh.in
delete mode 100644 srcpkgs/postgresql13/files/postgresql.confd
delete mode 100644 srcpkgs/postgresql13/files/postgresql.pam
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/control/t
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/log/run
delete mode 100755 srcpkgs/postgresql13/files/postgresql13/run
delete mode 100644 srcpkgs/postgresql13/files/profile.sh
delete mode 100644 srcpkgs/postgresql13/patches/pg_config-cross-value.patch
delete mode 100644 srcpkgs/postgresql13/patches/relocate.patch
delete mode 100644 srcpkgs/postgresql13/template
delete mode 100644 srcpkgs/postgresql13/update
diff --git a/srcpkgs/postgresql13-client b/srcpkgs/postgresql13-client
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-client
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-contrib b/srcpkgs/postgresql13-contrib
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-contrib
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-doc b/srcpkgs/postgresql13-doc
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-doc
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-libs b/srcpkgs/postgresql13-libs
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-libs
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-libs-devel b/srcpkgs/postgresql13-libs-devel
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-libs-devel
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-plperl b/srcpkgs/postgresql13-plperl
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-plperl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-plpython b/srcpkgs/postgresql13-plpython
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-plpython
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13-pltcl b/srcpkgs/postgresql13-pltcl
deleted file mode 120000
index f6f48b1ff3a2..000000000000
--- a/srcpkgs/postgresql13-pltcl
+++ /dev/null
@@ -1 +0,0 @@
-postgresql13
\ No newline at end of file
diff --git a/srcpkgs/postgresql13/files/pg_config.sh.in b/srcpkgs/postgresql13/files/pg_config.sh.in
deleted file mode 100644
index 3d20d215d0b3..000000000000
--- a/srcpkgs/postgresql13/files/pg_config.sh.in
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-# Released to Public Domain by Doan Tran Cong Danh
-
-print() {
- printf '%s\n' "$@"
-}
-
-sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
-
-BINDIR="$sysroot/@PREFIX@/bin"
-DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
-INCLUDEDIR="$sysroot/usr/include"
-PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
-INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
-LIBDIR="$sysroot/@PREFIX@/lib"
-PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
-LOCALEDIR="$sysroot/@PREFIX@/share/locale"
-MANDIR="$sysroot/@PREFIX@/share/man"
-SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
-SYSCONFDIR="$sysroot/@PREFIX@/etc/postgresql"
-PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
-
-CONFIGURE="@configure_args@"
-CC="@CC@"
-CPPFLAGS="@CPPFLAGS@"
-CFLAGS="@CFLAGS@"
-CFLAGS_SL="@CFLAGS_SL@"
-LDFLAGS="@LDFLAGS@"
-LDFLAGS_EX="@LDFLAGS_EX@"
-LDFLAGS_SL="@LDFLAGS_SL@"
-LIBS="@LIBS@"
-VERSION="PostgreSQL @FULL_VERSION@"
-
-if [ "$sysroot" != "/" ]; then
- CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
- CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
- LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
-fi
-
-usage() {
- cat <<-EOF
- $0 provides information about the installed version of PostgreSQL.
-
- Usage:
- $0 [OPTION]...
-
- Options:
- --bindir show location of user executables
- --docdir show location of documentation files
- --htmldir show location of HTML documentation files
- --includedir show location of C header files of the client interfaces
- --pkgincludedir show location of other C header files
- --includedir-server show location of C header files for the server
- --libdir show location of object code libraries
- --pkglibdir show location of dynamically loadable modules
- --localedir show location of locale support files
- --mandir show location of manual pages
- --sharedir show location of architecture-independent support files
- --sysconfdir show location of system-wide configuration files
- --pgxs show location of extension makefile
- --configure show options given to PostgreSQL was built
- --cc show CC value used when PostgreSQL was built
- --cppflags show CPPFLAGS value used when PostgreSQL was built
- --cflags show CFLAGS value used when PostgreSQL was built
- --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
- --ldflags show LDFLAGS value used when PostgreSQL was built
- --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
- --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
- --libs show LIBS value used when PostgreSQL was built
- --version show the PostgreSQL version
- -?, --help show this help, then exit
-
- With no arguments, all known items are shown.
-
- Report bugs to <pgsql-bugs@postgresql.org>.
- EOF
-}
-
-if test $# -eq 0; then
- cat <<-EOF
- BINDIR = $BINDIR
- DOCDIR = $DOCDIR
- HTMLDIR = $HTMLDIR
- INCLUDEDIR = $INCLUDEDIR
- PKGINCLUDEDIR = $PKGINCLUDEDIR
- INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
- LIBDIR = $LIBDIR
- PKGLIBDIR = $PKGLIBDIR
- LOCALEDIR = $LOCALEDIR
- MANDIR = $MANDIR
- SHAREDIR = $SHAREDIR
- SYSCONFDIR = $SYSCONFDIR
- PGXS = $PGXS
- CONFIGURE = $CONFIGURE
- CC = $CC
- CPPFLAGS = $CPPFLAGS
- CFLAGS = $CFLAGS
- CFLAGS_SL = $CFLAGS_SL
- LDFLAGS = $LDFLAGS
- LDFLAGS_EX = $LDFLAGS_EX
- LDFLAGS_SL = $LDFLAGS_SL
- LIBS = $LIBS
- VERSION = $VERSION
- EOF
-fi
-
-for arg
-do
- if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
- usage
- exit 0
- fi
-done
-
-for arg
-do
- case "$arg" in
- --bindir) print "$BINDIR" ;;
- --docdir) print "$DOCDIR" ;;
- --htmldir) print "$HTMLDIR" ;;
- --includedir) print "$INCLUDEDIR" ;;
- --pkgincludedir) print "$PKGINCLUDEDIR" ;;
- --includedir-server) print "$INCLUDEDIR_SERVER" ;;
- --libdir) print "$LIBDIR" ;;
- --pkglibdir) print "$PKGLIBDIR" ;;
- --localedir) print "$LOCALEDIR" ;;
- --mandir) print "$MANDIR" ;;
- --sharedir) print "$SHAREDIR" ;;
- --sysconfdir) print "$SYSCONFDIR" ;;
- --pgxs) print "$PGXS" ;;
- --configure) print "$CONFIGURE" ;;
- --cc) print "$CC" ;;
- --cppflags) print "$CPPFLAGS" ;;
- --cflags) print "$CFLAGS" ;;
- --cflags_sl) print "$CFLAGS_SL" ;;
- --ldflags) print "$LDFLAGS" ;;
- --ldflags_ex) print "$LDFLAGS_EX" ;;
- --ldflags_sl) print "$LDFLAGS_SL" ;;
- --libs) print "$LIBS" ;;
- --version) print "$VERSION" ;;
- esac
-done
diff --git a/srcpkgs/postgresql13/files/postgresql.confd b/srcpkgs/postgresql13/files/postgresql.confd
deleted file mode 100644
index fe7106626fa5..000000000000
--- a/srcpkgs/postgresql13/files/postgresql.confd
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration file for the PostgreSQL server.
-
-# PostgreSQL's database directory
-PGROOT="/var/lib/postgresql@VERSION@"
-
-# PostgreSQL's log file.
-PGLOG="/var/log/postgresql@VERSION@.log"
-
-# Passed to initdb if necessary
-INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these options
-# can be set directly in the configuration-file.
-#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql13/files/postgresql.pam b/srcpkgs/postgresql13/files/postgresql.pam
deleted file mode 100644
index 53724d1f86a7..000000000000
--- a/srcpkgs/postgresql13/files/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/srcpkgs/postgresql13/files/postgresql13/control/t b/srcpkgs/postgresql13/files/postgresql13/control/t
deleted file mode 100755
index dcedfaa20180..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql13/files/postgresql13/log/run b/srcpkgs/postgresql13/files/postgresql13/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql13/files/postgresql13/run b/srcpkgs/postgresql13/files/postgresql13/run
deleted file mode 100755
index 9d044e9a1ce1..000000000000
--- a/srcpkgs/postgresql13/files/postgresql13/run
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-. /@PREFIX@/etc/default/postgresql
-: ${PGDATA:="$PGROOT/data"}
-
-if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
- echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
- ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
-fi
-
-
-if [ ! -d "$PGDATA" ]; then
- echo "Initializing database in $PGDATA"
-
- mkdir -p "$PGDATA" || exit 1
- chown -R postgres:postgres "$PGDATA"
- chmod 0700 "$PGDATA"
- su - postgres -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" 2>&1 || {
- rm -fr "$PGDATA"
- exit 1
- }
-
- if [ -f /@PREFIX@/etc/postgresql/postgresql.conf ]; then
- ln -sf /@PREFIX@/etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
- fi
-fi
-
-exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql13/files/profile.sh b/srcpkgs/postgresql13/files/profile.sh
deleted file mode 100644
index 54be2ca50a4f..000000000000
--- a/srcpkgs/postgresql13/files/profile.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-appendpath () {
- case ":$PATH:" in
- *:"$1":*)
- ;;
- *)
- PATH="${PATH:+$PATH:}$1"
- esac
-}
-
-appendpath '/@PREFIX@/bin'
-
-unset appendpath
-
-export PATH
diff --git a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch b/srcpkgs/postgresql13/patches/pg_config-cross-value.patch
deleted file mode 100644
index cc0a9fc19133..000000000000
--- a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Sources: Doan Tran Cong Danh
-Upstream: No
- - First part needs to be rework in configure script to be usable
- upstream
- - Second part would un-usable for Windows
-diff --git src/common/Makefile src/common/Makefile
-index ec04710..2af845f 100644
---- a/src/common/Makefile
-+++ b/src/common/Makefile
-@@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global
-
- # don't include subdirectory-path-dependent -I and -L switches
- STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
-+STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
-+STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
- STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
-+STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
- override CPPFLAGS += -DVAL_CC="\"$(CC)\""
- override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
-+override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
- override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
- override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
- override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
-@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
- GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
- GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
-
--all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
-+all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
-+
-+pg_config.sh: pg_config.sh.in
-+ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
-+ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
-+ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
-+ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
-+ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
-+ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
-+ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
-+ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
-+ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
-+ $< >$@
-
- distprep: kwlist_d.h
-
diff --git a/srcpkgs/postgresql13/patches/relocate.patch b/srcpkgs/postgresql13/patches/relocate.patch
deleted file mode 100644
index d2cc14281e3a..000000000000
--- a/srcpkgs/postgresql13/patches/relocate.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Sat, 18 Jan 2020 12:19:45 +0100
-Subject: [PATCH] relocate
-
-
-diff --git src/port/path.c src/port/path.c
-index 710988b..20dc57d 100644
---- a/src/port/path.c
-+++ b/src/port/path.c
-@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
- int tail_len;
- int i;
-
-+ goto no_match; // we relocate only binaries
-+
- /*
- * Determine the common prefix --- note we require it to end on a
- * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
---
-2.23.0
-
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
deleted file mode 100644
index 0f1ea0072b11..000000000000
--- a/srcpkgs/postgresql13/template
+++ /dev/null
@@ -1,228 +0,0 @@
-# Template file for 'postgresql13'
-pkgname=postgresql13
-version=13.8
-revision=3
-build_style=gnu-configure
-make_build_target=world
-_major="${version%%.*}"
-_prefix="usr/lib/psql${_major}"
-configure_args="--with-openssl --with-python
- --with-pam --enable-thread-safety
- --with-perl --with-tcl --without-ldap --without-gssapi
- --without-bonjour --with-libxml --with-libxslt
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
-hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
- python3-devel readline-devel tcl-devel"
-short_desc="Sophisticated open-source Object-Relational DBMS"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="PostgreSQL"
-homepage="https://www.postgresql.org"
-changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
-distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
-checksum=73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
-make_check=ci-skip # Postgres server can't be run as root
-
-conf_files="
- /${_prefix}/etc/default/postgresql
- /${_prefix}/etc/pam.d/postgresql
- /${_prefix}/etc/postgresql/postgresql.conf
-"
-
-# Create 'postgres' user for the server.
-system_accounts="postgres"
-postgres_homedir="/var/lib/postgresql"
-postgres_shell="/bin/sh"
-postgres_descr="PostgreSQL database server user"
-make_dirs="
- /var/lib/postgresql 0750 postgres postgres
- /var/lib/postgresql${_major} 0750 postgres postgres"
-
-if [ "$CROSS_BUILD" ]; then
- configure_args+=" --without-perl --without-python --without-tcl"
-fi
-
-post_patch() {
- cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
- _substitute src/common/pg_config.sh.in
- vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
-}
-
-pre_configure() {
- _style_configure_args="${configure_args}"
- configure_args=" "
- for arg in ${_style_configure_args}; do
- case $arg in
- --prefix=*|*dir=*) : ;; # skip
- *) configure_args+=" $arg"
- esac
- done
- configure_args="--prefix=/${_prefix}
- --sysconfdir=/${_prefix}/etc
- --includedir=/usr/include
- ${configure_args}"
-}
-
-post_build() {
- make -C contrib ${makejobs}
-}
-
-pre_check() {
- ln -sr tmp_install/${_prefix} /${_prefix%/*}
-}
-
-post_install() {
- vmkdir usr/share/man
- cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
- for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
- mv $i ${i%.*}-${_major}.${i##*.}
- done
- vmkdir ${_prefix}/share/doc
- cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
- vsv ${pkgname}
- find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
- vlicense COPYRIGHT
-
- vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
- _substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
- vinstall ${FILESDIR}/postgresql.confd 644 ${_prefix}/etc/default postgresql
- _substitute ${DESTDIR}/${_prefix}/etc/default/postgresql
- vinstall ${FILESDIR}/postgresql.pam 644 ${_prefix}/etc/pam.d postgresql
- _substitute ${DESTDIR}/${_prefix}/etc/pam.d/postgresql
- vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
- 644 ${_prefix}/etc/postgresql postgresql.conf
- vbin src/common/pg_config.sh
-
- vsed -i 's/install_bin = .*/install_bin = install/g' \
- ${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
-}
-
-_substitute() {
- sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
-}
-
-postgresql13-doc_package() {
- short_desc="PostgreSQL documentation"
- pkg_install() {
- vmove ${_prefix}/share/doc
- }
-}
-
-postgresql13-libs_package() {
- short_desc="PostgreSQL shared libraries"
- conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0"
- pkg_install() {
- vmove "${_prefix}/lib/*.so*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name libpq5\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
- }
-}
-
-postgresql13-libs-devel_package() {
- depends="postgresql-libs>=${version}_${revision} openssl-devel"
- short_desc="PostgreSQL shared libraries (development files)"
- conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0"
- pkg_install() {
- vmkdir usr/bin
- vmkdir usr/lib
- for f in pg_config ecpg; do
- vmove ${_prefix}/bin/${f}
- vmove "usr/share/man/man1/$(basename ${f})*"
- ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
- done
- vmove usr/bin/pg_config.sh
- vmove usr/include
- vmove "${_prefix}/lib/*.a"
- mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
- vmove usr/share/man/man3
- vmove ${_prefix}/lib/postgresql/pgxs
- for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
- ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
- done
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pg_config\* -o -name ecpg\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-# XXX disabled for now in cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-
-postgresql13-plperl_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Perl procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/plperl*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name plperl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql13-plpython_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Python procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/plpython*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name plpython\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-postgresql13-pltcl_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc="PL/Tcl procedural language for PostgreSQL"
- pkg_install() {
- vmove "${_prefix}/lib/postgresql/pltcl*"
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pltcl\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- }
-}
-
-fi # !CROSS_BUILD
-
-postgresql13-client_package() {
- short_desc="Client frontends programs for PostgreSQL"
- pkg_install() {
- for f in clusterdb createdb createuser dropdb \
- dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
- vacuumdb; do
- vmove ${_prefix}/bin/${f}
- vmove usr/share/man/man1/$(basename ${f})-${_major}.1
- done
- vmove usr/share/man/man7
- for d in $(find ${DESTDIR}/${_prefix}/share/locale \
- -type f -name pgscripts\* -o \
- -name psql\* -o \
- -name pg_dump\*); do
- mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
- done
- mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
- ${PKGDESTDIR}/${_prefix}/share
- vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
- _substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
- }
-}
-
-postgresql13-contrib_package() {
- short_desc="PostgreSQL contributed programs and extensions"
- pkg_install() {
- make -C contrib install DESTDIR=${PKGDESTDIR}
- mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
- }
-}
diff --git a/srcpkgs/postgresql13/update b/srcpkgs/postgresql13/update
deleted file mode 100644
index 160ccf143338..000000000000
--- a/srcpkgs/postgresql13/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://ftp.postgresql.org/pub/source/"
-pattern="v\K${version%%.*}[\d.]+(?!\w)"
From 86230fb251cc48c80eb1d7d57c4231d50a4912e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:49:49 +0200
Subject: [PATCH 142/356] New package: postgresql15-15.1
---
common/shlibs | 8 +-
srcpkgs/postgresql-libs | 2 +-
srcpkgs/postgresql-libs-devel | 2 +-
srcpkgs/postgresql15-client | 1 +
srcpkgs/postgresql15-contrib | 1 +
srcpkgs/postgresql15-doc | 1 +
srcpkgs/postgresql15-plperl | 1 +
srcpkgs/postgresql15-plpython | 1 +
srcpkgs/postgresql15-pltcl | 1 +
srcpkgs/postgresql15/files/pg_config.sh.in | 143 +++++++++++
srcpkgs/postgresql15/files/postgresql.confd | 17 ++
srcpkgs/postgresql15/files/postgresql.pam | 3 +
.../postgresql15/files/postgresql15/control/t | 2 +
.../postgresql15/files/postgresql15/log/run | 2 +
srcpkgs/postgresql15/files/postgresql15/run | 27 +++
srcpkgs/postgresql15/files/profile.sh | 14 ++
.../patches/pg_config-cross-value.patch | 45 ++++
srcpkgs/postgresql15/patches/relocate.patch | 22 ++
srcpkgs/postgresql15/template | 229 ++++++++++++++++++
srcpkgs/postgresql15/update | 2 +
20 files changed, 518 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/postgresql15-client
create mode 120000 srcpkgs/postgresql15-contrib
create mode 120000 srcpkgs/postgresql15-doc
create mode 120000 srcpkgs/postgresql15-plperl
create mode 120000 srcpkgs/postgresql15-plpython
create mode 120000 srcpkgs/postgresql15-pltcl
create mode 100644 srcpkgs/postgresql15/files/pg_config.sh.in
create mode 100644 srcpkgs/postgresql15/files/postgresql.confd
create mode 100644 srcpkgs/postgresql15/files/postgresql.pam
create mode 100755 srcpkgs/postgresql15/files/postgresql15/control/t
create mode 100755 srcpkgs/postgresql15/files/postgresql15/log/run
create mode 100755 srcpkgs/postgresql15/files/postgresql15/run
create mode 100644 srcpkgs/postgresql15/files/profile.sh
create mode 100644 srcpkgs/postgresql15/patches/pg_config-cross-value.patch
create mode 100644 srcpkgs/postgresql15/patches/relocate.patch
create mode 100644 srcpkgs/postgresql15/template
create mode 100644 srcpkgs/postgresql15/update
diff --git a/common/shlibs b/common/shlibs
index 523fd15af734..af1fd992b5da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -568,10 +568,10 @@ libKF5PurposeWidgets.so.5 purpose-5.48.0_1
libKF5Purpose.so.5 purpose-5.48.0_1
libKF5PulseAudioQt.so.3 pulseaudio-qt-1.3_1
libReviewboardHelpers.so.5 purpose-5.48.0_1
-libecpg_compat.so.3 postgresql-libs-14.0_1
-libecpg.so.6 postgresql-libs-14.0_1
-libpgtypes.so.3 postgresql-libs-14.0_1
-libpq.so.5 postgresql-libs-14.0_1
+libecpg_compat.so.3 postgresql-libs-15.1_1
+libecpg.so.6 postgresql-libs-15.1_1
+libpgtypes.so.3 postgresql-libs-15.1_1
+libpq.so.5 postgresql-libs-15.1_1
libmypaint.so.0 libmypaint-1.6.1_1
libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
libgssrpc.so.4 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/postgresql-libs b/srcpkgs/postgresql-libs
index 13d0224a054b..a44b462efd15 120000
--- a/srcpkgs/postgresql-libs
+++ b/srcpkgs/postgresql-libs
@@ -1 +1 @@
-postgresql14
\ No newline at end of file
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql-libs-devel b/srcpkgs/postgresql-libs-devel
index 13d0224a054b..a44b462efd15 120000
--- a/srcpkgs/postgresql-libs-devel
+++ b/srcpkgs/postgresql-libs-devel
@@ -1 +1 @@
-postgresql14
\ No newline at end of file
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-client b/srcpkgs/postgresql15-client
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-client
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-contrib b/srcpkgs/postgresql15-contrib
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-contrib
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-doc b/srcpkgs/postgresql15-doc
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-doc
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-plperl b/srcpkgs/postgresql15-plperl
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-plperl
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-plpython b/srcpkgs/postgresql15-plpython
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-plpython
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15-pltcl b/srcpkgs/postgresql15-pltcl
new file mode 120000
index 000000000000..a44b462efd15
--- /dev/null
+++ b/srcpkgs/postgresql15-pltcl
@@ -0,0 +1 @@
+postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgresql15/files/pg_config.sh.in b/srcpkgs/postgresql15/files/pg_config.sh.in
new file mode 100644
index 000000000000..68068a82e01e
--- /dev/null
+++ b/srcpkgs/postgresql15/files/pg_config.sh.in
@@ -0,0 +1,143 @@
+#!/bin/sh
+# Released to Public Domain by Doan Tran Cong Danh
+
+print() {
+ printf '%s\n' "$@"
+}
+
+sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
+
+BINDIR="$sysroot/@PREFIX@/bin"
+DOCDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+HTMLDIR="$sysroot/@PREFIX@/share/doc/postgresql"
+INCLUDEDIR="$sysroot/usr/include"
+PKGINCLUDEDIR="$sysroot/usr/include/postgresql"
+INCLUDEDIR_SERVER="$sysroot/usr/include/postgresql/server"
+LIBDIR="$sysroot/@PREFIX@/lib"
+PKGLIBDIR="$sysroot/@PREFIX@/lib/postgresql"
+LOCALEDIR="$sysroot/@PREFIX@/share/locale"
+MANDIR="$sysroot/@PREFIX@/share/man"
+SHAREDIR="$sysroot/@PREFIX@/share/postgresql"
+SYSCONFDIR="$sysroot/etc/psql@VERSION@/postgresql"
+PGXS="$sysroot/@PREFIX@/lib/postgresql/pgxs/src/makefiles/pgxs.mk"
+
+CONFIGURE="@configure_args@"
+CC="@CC@"
+CPPFLAGS="@CPPFLAGS@"
+CFLAGS="@CFLAGS@"
+CFLAGS_SL="@CFLAGS_SL@"
+LDFLAGS="@LDFLAGS@"
+LDFLAGS_EX="@LDFLAGS_EX@"
+LDFLAGS_SL="@LDFLAGS_SL@"
+LIBS="@LIBS@"
+VERSION="PostgreSQL @FULL_VERSION@"
+
+if [ "$sysroot" != "/" ]; then
+ CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+ CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/@PREFIX@/include\\),-I$sysroot\\1,g")"
+ LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/@PREFIX@/lib\\),-L$sysroot\\1,g")"
+fi
+
+usage() {
+ cat <<-EOF
+ $0 provides information about the installed version of PostgreSQL.
+
+ Usage:
+ $0 [OPTION]...
+
+ Options:
+ --bindir show location of user executables
+ --docdir show location of documentation files
+ --htmldir show location of HTML documentation files
+ --includedir show location of C header files of the client interfaces
+ --pkgincludedir show location of other C header files
+ --includedir-server show location of C header files for the server
+ --libdir show location of object code libraries
+ --pkglibdir show location of dynamically loadable modules
+ --localedir show location of locale support files
+ --mandir show location of manual pages
+ --sharedir show location of architecture-independent support files
+ --sysconfdir show location of system-wide configuration files
+ --pgxs show location of extension makefile
+ --configure show options given to PostgreSQL was built
+ --cc show CC value used when PostgreSQL was built
+ --cppflags show CPPFLAGS value used when PostgreSQL was built
+ --cflags show CFLAGS value used when PostgreSQL was built
+ --cflags_sl show CFLAGS_SL value used when PostgreSQL was built
+ --ldflags show LDFLAGS value used when PostgreSQL was built
+ --ldflags_ex show LDFLAGS_EX value used when PostgreSQL was built
+ --ldflags_sl show LDFLAGS_SL value used when PostgreSQL was built
+ --libs show LIBS value used when PostgreSQL was built
+ --version show the PostgreSQL version
+ -?, --help show this help, then exit
+
+ With no arguments, all known items are shown.
+
+ Report bugs to <pgsql-bugs@postgresql.org>.
+ EOF
+}
+
+if test $# -eq 0; then
+ cat <<-EOF
+ BINDIR = $BINDIR
+ DOCDIR = $DOCDIR
+ HTMLDIR = $HTMLDIR
+ INCLUDEDIR = $INCLUDEDIR
+ PKGINCLUDEDIR = $PKGINCLUDEDIR
+ INCLUDEDIR-SERVER = $INCLUDEDIR_SERVER
+ LIBDIR = $LIBDIR
+ PKGLIBDIR = $PKGLIBDIR
+ LOCALEDIR = $LOCALEDIR
+ MANDIR = $MANDIR
+ SHAREDIR = $SHAREDIR
+ SYSCONFDIR = $SYSCONFDIR
+ PGXS = $PGXS
+ CONFIGURE = $CONFIGURE
+ CC = $CC
+ CPPFLAGS = $CPPFLAGS
+ CFLAGS = $CFLAGS
+ CFLAGS_SL = $CFLAGS_SL
+ LDFLAGS = $LDFLAGS
+ LDFLAGS_EX = $LDFLAGS_EX
+ LDFLAGS_SL = $LDFLAGS_SL
+ LIBS = $LIBS
+ VERSION = $VERSION
+ EOF
+fi
+
+for arg
+do
+ if test "x$arg" = "x--help" || test "x$arg" = "x-?"; then
+ usage
+ exit 0
+ fi
+done
+
+for arg
+do
+ case "$arg" in
+ --bindir) print "$BINDIR" ;;
+ --docdir) print "$DOCDIR" ;;
+ --htmldir) print "$HTMLDIR" ;;
+ --includedir) print "$INCLUDEDIR" ;;
+ --pkgincludedir) print "$PKGINCLUDEDIR" ;;
+ --includedir-server) print "$INCLUDEDIR_SERVER" ;;
+ --libdir) print "$LIBDIR" ;;
+ --pkglibdir) print "$PKGLIBDIR" ;;
+ --localedir) print "$LOCALEDIR" ;;
+ --mandir) print "$MANDIR" ;;
+ --sharedir) print "$SHAREDIR" ;;
+ --sysconfdir) print "$SYSCONFDIR" ;;
+ --pgxs) print "$PGXS" ;;
+ --configure) print "$CONFIGURE" ;;
+ --cc) print "$CC" ;;
+ --cppflags) print "$CPPFLAGS" ;;
+ --cflags) print "$CFLAGS" ;;
+ --cflags_sl) print "$CFLAGS_SL" ;;
+ --ldflags) print "$LDFLAGS" ;;
+ --ldflags_ex) print "$LDFLAGS_EX" ;;
+ --ldflags_sl) print "$LDFLAGS_SL" ;;
+ --libs) print "$LIBS" ;;
+ --version) print "$VERSION" ;;
+ esac
+done
diff --git a/srcpkgs/postgresql15/files/postgresql.confd b/srcpkgs/postgresql15/files/postgresql.confd
new file mode 100644
index 000000000000..fe7106626fa5
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql.confd
@@ -0,0 +1,17 @@
+# Configuration file for the PostgreSQL server.
+
+# PostgreSQL's database directory
+PGROOT="/var/lib/postgresql@VERSION@"
+
+# PostgreSQL's log file.
+PGLOG="/var/log/postgresql@VERSION@.log"
+
+# Passed to initdb if necessary
+INITOPTS="-A peer --auth-host=md5 --auth-local=peer --locale en_US.UTF-8"
+
+# Extra options to run postmaster with, e.g.:
+# -N is the maximal number of client connections
+# -B is the number of shared buffers and has to be at least 2x the value for -N
+# Please read the man-page to postmaster for more options. Many of these options
+# can be set directly in the configuration-file.
+#PGOPTS="-N 512 -B 1024"
diff --git a/srcpkgs/postgresql15/files/postgresql.pam b/srcpkgs/postgresql15/files/postgresql.pam
new file mode 100644
index 000000000000..53724d1f86a7
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql.pam
@@ -0,0 +1,3 @@
+auth required pam_unix.so
+account required pam_unix.so
+session required pam_unix.so
diff --git a/srcpkgs/postgresql15/files/postgresql15/control/t b/srcpkgs/postgresql15/files/postgresql15/control/t
new file mode 100755
index 000000000000..dcedfaa20180
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/kill -INT `/usr/bin/head -1 /run/runit/supervise.postgresql@VERSION@/pid`
diff --git a/srcpkgs/postgresql15/files/postgresql15/log/run b/srcpkgs/postgresql15/files/postgresql15/log/run
new file mode 100755
index 000000000000..815d9c974079
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql15/files/postgresql15/run b/srcpkgs/postgresql15/files/postgresql15/run
new file mode 100755
index 000000000000..3aee9440e847
--- /dev/null
+++ b/srcpkgs/postgresql15/files/postgresql15/run
@@ -0,0 +1,27 @@
+#!/bin/sh
+. /etc/psql@VERSION@/default/postgresql
+: ${PGDATA:="$PGROOT/data"}
+
+if [ "$PGROOT" != "/var/lib/postgresql@VERSION@" ]; then
+ echo "Creating symlink /var/lib/postgresql@VERSION@ -> $PGROOT"
+ ln -sf "$PGROOT" /var/lib/postgresql@VERSION@
+fi
+
+
+if [ ! -d "$PGDATA" ]; then
+ echo "Initializing database in $PGDATA"
+
+ mkdir -p "$PGDATA" || exit 1
+ chown -R postgres:postgres "$PGDATA"
+ chmod 0700 "$PGDATA"
+ su - postgres -c "/@PREFIX@/bin/initdb $INITOPTS -D '$PGDATA'" 2>&1 || {
+ rm -fr "$PGDATA"
+ exit 1
+ }
+
+ if [ -f /etc/psql@VERSION@/postgresql/postgresql.conf ]; then
+ ln -sf /etc/psql@VERSION@/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
+ fi
+fi
+
+exec chpst -u postgres:postgres /@PREFIX@/bin/postgres -D "$PGDATA" $PGOPTS 2>&1
diff --git a/srcpkgs/postgresql15/files/profile.sh b/srcpkgs/postgresql15/files/profile.sh
new file mode 100644
index 000000000000..54be2ca50a4f
--- /dev/null
+++ b/srcpkgs/postgresql15/files/profile.sh
@@ -0,0 +1,14 @@
+appendpath () {
+ case ":$PATH:" in
+ *:"$1":*)
+ ;;
+ *)
+ PATH="${PATH:+$PATH:}$1"
+ esac
+}
+
+appendpath '/@PREFIX@/bin'
+
+unset appendpath
+
+export PATH
diff --git a/srcpkgs/postgresql15/patches/pg_config-cross-value.patch b/srcpkgs/postgresql15/patches/pg_config-cross-value.patch
new file mode 100644
index 000000000000..cc0a9fc19133
--- /dev/null
+++ b/srcpkgs/postgresql15/patches/pg_config-cross-value.patch
@@ -0,0 +1,45 @@
+Sources: Doan Tran Cong Danh
+Upstream: No
+ - First part needs to be rework in configure script to be usable
+ upstream
+ - Second part would un-usable for Windows
+diff --git src/common/Makefile src/common/Makefile
+index ec04710..2af845f 100644
+--- a/src/common/Makefile
++++ b/src/common/Makefile
+@@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global
+
+ # don't include subdirectory-path-dependent -I and -L switches
+ STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
++STD_CPPFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_CPPFLAGS))
++STD_CFLAGS := $(subst @XBPS_SYSROOT@,,$(CFLAGS))
+ STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/common -L$(top_builddir)/src/port,$(LDFLAGS))
++STD_LDFLAGS := $(subst @XBPS_SYSROOT@,,$(STD_LDFLAGS))
+ override CPPFLAGS += -DVAL_CC="\"$(CC)\""
+ override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
+-override CPPFLAGS += -DVAL_CFLAGS="\"$(CFLAGS)\""
++override CPPFLAGS += -DVAL_CFLAGS="\"$(STD_CFLAGS)\""
+ override CPPFLAGS += -DVAL_CFLAGS_SL="\"$(CFLAGS_SL)\""
+ override CPPFLAGS += -DVAL_LDFLAGS="\"$(STD_LDFLAGS)\""
+ override CPPFLAGS += -DVAL_LDFLAGS_EX="\"$(LDFLAGS_EX)\""
+@@ -72,7 +75,19 @@ OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o restricted_token.o
+ GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
+ GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
+
+-all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
++all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a pg_config.sh
++
++pg_config.sh: pg_config.sh.in
++ sed -e "s/@configure_args@/$(subst /,\\/,$(configure_args))/" \
++ -e "s/@CC@/$(subst /,\\/,$(CC))/" \
++ -e "s/@CPPFLAGS@/$(subst /,\\/,$(STD_CPPFLAGS))/" \
++ -e "s/@CFLAGS@/$(subst /,\\/,$(STD_CFLAGS))/" \
++ -e "s/@CFLAGS_SL@/$(subst /,\\/,$(CFLAGS_SL))/" \
++ -e "s/@LDFLAGS@/$(subst /,\\/,$(STD_LDFLAGS))/" \
++ -e "s/@LDFLAGS_EX@/$(subst /,\\/,$(LDFLAGS_EX))/" \
++ -e "s/@LDFLAGS_SL@/$(subst /,\\/,$(LDFLAGS_SL))/" \
++ -e "s/@LIBS@/$(subst /,\\/,$(LIBS))/" \
++ $< >$@
+
+ distprep: kwlist_d.h
+
diff --git a/srcpkgs/postgresql15/patches/relocate.patch b/srcpkgs/postgresql15/patches/relocate.patch
new file mode 100644
index 000000000000..d2cc14281e3a
--- /dev/null
+++ b/srcpkgs/postgresql15/patches/relocate.patch
@@ -0,0 +1,22 @@
+From bf0601df89f611b33d8dbc27722351bf99e2cc18 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 18 Jan 2020 12:19:45 +0100
+Subject: [PATCH] relocate
+
+
+diff --git src/port/path.c src/port/path.c
+index 710988b..20dc57d 100644
+--- a/src/port/path.c
++++ b/src/port/path.c
+@@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path,
+ int tail_len;
+ int i;
+
++ goto no_match; // we relocate only binaries
++
+ /*
+ * Determine the common prefix --- note we require it to end on a
+ * directory separator, consider eg '/usr/lib' and '/usr/libexec'.
+--
+2.23.0
+
diff --git a/srcpkgs/postgresql15/template b/srcpkgs/postgresql15/template
new file mode 100644
index 000000000000..01bcb1759747
--- /dev/null
+++ b/srcpkgs/postgresql15/template
@@ -0,0 +1,229 @@
+# Template file for 'postgresql15'
+pkgname=postgresql15
+version=15.1
+revision=1
+build_style=gnu-configure
+make_build_target=world
+_major="${version%%.*}"
+_prefix="usr/lib/psql${_major}"
+_sysconfdir="etc/psql${_major}"
+configure_args="--with-openssl --with-python
+ --with-pam --enable-thread-safety
+ --with-perl --with-tcl --without-ldap --without-gssapi
+ --without-bonjour --with-libxml --with-libxslt
+ --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
+hostmakedepends="docbook2x gettext flex openjade"
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
+ python3-devel readline-devel tcl-devel"
+short_desc="Sophisticated open-source Object-Relational DBMS"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="PostgreSQL"
+homepage="https://www.postgresql.org"
+changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
+distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2"
+checksum=64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae
+make_check=ci-skip # Postgres server can't be run as root
+
+conf_files="
+ /${_sysconfdir}/default/postgresql
+ /${_sysconfdir}/pam.d/postgresql
+ /${_sysconfdir}/postgresql/postgresql.conf
+"
+
+# Create 'postgres' user for the server.
+system_accounts="postgres"
+postgres_homedir="/var/lib/postgresql"
+postgres_shell="/bin/sh"
+postgres_descr="PostgreSQL database server user"
+make_dirs="
+ /var/lib/postgresql 0750 postgres postgres
+ /var/lib/postgresql${_major} 0750 postgres postgres"
+
+if [ "$CROSS_BUILD" ]; then
+ configure_args+=" --without-perl --without-python --without-tcl"
+fi
+
+post_patch() {
+ cp "$FILESDIR"/pg_config.sh.in src/common/pg_config.sh.in
+ _substitute src/common/pg_config.sh.in
+ vsed -i -e "s,@XBPS_SYSROOT@,${XBPS_CROSS_BASE%/}," src/common/Makefile
+}
+
+pre_configure() {
+ _style_configure_args="${configure_args}"
+ configure_args=" "
+ for arg in ${_style_configure_args}; do
+ case $arg in
+ --prefix=*|*dir=*) : ;; # skip
+ *) configure_args+=" $arg"
+ esac
+ done
+ configure_args="--prefix=/${_prefix}
+ --sysconfdir=/${_sysconfdir}
+ --includedir=/usr/include
+ ${configure_args}"
+}
+
+post_build() {
+ make -C contrib ${makejobs}
+}
+
+pre_check() {
+ ln -sr tmp_install/${_prefix} /${_prefix%/*}
+}
+
+post_install() {
+ vmkdir usr/share/man
+ cp -r doc/src/sgml/man? ${DESTDIR}/usr/share/man
+ for i in ${DESTDIR}/usr/share/man/*[^3]/*; do
+ mv $i ${i%.*}-${_major}.${i##*.}
+ done
+ vmkdir ${_prefix}/share/doc
+ cp -r doc/src/sgml/html ${DESTDIR}/${_prefix}/share/doc
+ vsv ${pkgname}
+ find "${DESTDIR}/etc/sv" -type f -exec sed -i -e s:@VERSION@:${_major}: -e s:@PREFIX@:${_prefix}: '{}' ';'
+ vlicense COPYRIGHT
+
+ vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+ _substitute ${DESTDIR}/etc/profile.d/${pkgname}.sh
+ vinstall ${FILESDIR}/postgresql.confd 644 ${_sysconfdir}/default postgresql
+ _substitute ${DESTDIR}/${_sysconfdir}/default/postgresql
+ vinstall ${FILESDIR}/postgresql.pam 644 ${_sysconfdir}/pam.d postgresql
+ _substitute ${DESTDIR}/${_sysconfdir}/pam.d/postgresql
+ vinstall ${DESTDIR}/${_prefix}/share/postgresql/postgresql.conf.sample \
+ 644 ${_sysconfdir}/postgresql postgresql.conf
+ vbin src/common/pg_config.sh
+
+ vsed -i 's/install_bin = .*/install_bin = install/g' \
+ ${DESTDIR}/${_prefix}/lib/postgresql/pgxs/src/Makefile.global
+}
+
+_substitute() {
+ sed -i "$1" -e s:@PREFIX@:${_prefix}: -e s:@VERSION@:${_major}: -e s:@FULL_VERSION@:${version}:
+}
+
+postgresql15-doc_package() {
+ short_desc="PostgreSQL documentation"
+ pkg_install() {
+ vmove ${_prefix}/share/doc
+ }
+}
+
+postgresql-libs_package() {
+ short_desc="PostgreSQL shared libraries"
+ conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0 postgresql13-libs>=0 postgresql14-libs>=0"
+ pkg_install() {
+ vmove "${_prefix}/lib/*.so*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name libpq5\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ mv ${PKGDESTDIR}/${_prefix}/lib/* ${PKGDESTDIR}/usr/lib
+ }
+}
+
+postgresql-libs-devel_package() {
+ depends="postgresql-libs>=${version}_${revision} openssl-devel"
+ short_desc="PostgreSQL shared libraries (development files)"
+ conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0 postgresql13-libs-devel>=0 postgresql14-libs-devel>=0"
+ pkg_install() {
+ vmkdir usr/bin
+ vmkdir usr/lib
+ for f in pg_config ecpg; do
+ vmove ${_prefix}/bin/${f}
+ vmove "usr/share/man/man1/$(basename ${f})*"
+ ln -sr "${PKGDESTDIR}/${_prefix}/bin/${f}" "${PKGDESTDIR}/usr/bin"
+ done
+ vmove usr/bin/pg_config.sh
+ vmove usr/include
+ vmove "${_prefix}/lib/*.a"
+ mv "${DESTDIR}/${_prefix}/lib/pkgconfig" "${PKGDESTDIR}/usr/lib"
+ vmove usr/share/man/man3
+ vmove ${_prefix}/lib/postgresql/pgxs
+ for f in libpq.so libpgtypes.so libecpg_compat.so libecpg.so; do
+ ln -sr "${PKGDESTDIR}/usr/lib/${f}" "${PKGDESTDIR}/${_prefix}/lib"
+ done
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pg_config\* -o -name ecpg\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+# XXX disabled for now in cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+
+postgresql15-plperl_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Perl procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/plperl*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name plperl\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+postgresql15-plpython_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Python procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/plpython*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name plpython\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+postgresql15-pltcl_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc="PL/Tcl procedural language for PostgreSQL"
+ pkg_install() {
+ vmove "${_prefix}/lib/postgresql/pltcl*"
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pltcl\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ }
+}
+
+fi # !CROSS_BUILD
+
+postgresql15-client_package() {
+ short_desc="Client frontends programs for PostgreSQL"
+ pkg_install() {
+ for f in clusterdb createdb createuser dropdb \
+ dropuser pg_dump pg_dumpall pg_isready pg_restore psql reindexdb \
+ vacuumdb; do
+ vmove ${_prefix}/bin/${f}
+ vmove usr/share/man/man1/$(basename ${f})-${_major}.1
+ done
+ vmove usr/share/man/man7
+ for d in $(find ${DESTDIR}/${_prefix}/share/locale \
+ -type f -name pgscripts\* -o \
+ -name psql\* -o \
+ -name pg_dump\*); do
+ mkdir -p ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ mv ${d} ${PKGDESTDIR}/$(dirname ${d#${DESTDIR}})
+ done
+ mv ${DESTDIR}/${_prefix}/share/postgresql/psqlrc.* \
+ ${PKGDESTDIR}/${_prefix}/share
+ vinstall ${FILESDIR}/profile.sh 644 etc/profile.d ${pkgname}.sh
+ _substitute ${PKGDESTDIR}/etc/profile.d/${pkgname}.sh
+ }
+}
+
+postgresql15-contrib_package() {
+ short_desc="PostgreSQL contributed programs and extensions"
+ pkg_install() {
+ make -C contrib install DESTDIR=${PKGDESTDIR}
+ mv ${PKGDESTDIR}/usr/include ${PKGDESTDIR}/${_prefix}
+ }
+}
diff --git a/srcpkgs/postgresql15/update b/srcpkgs/postgresql15/update
new file mode 100644
index 000000000000..160ccf143338
--- /dev/null
+++ b/srcpkgs/postgresql15/update
@@ -0,0 +1,2 @@
+site="https://ftp.postgresql.org/pub/source/"
+pattern="v\K${version%%.*}[\d.]+(?!\w)"
From 7d7d8a6f66ebd464da300f121caa19f43f9db206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:52:48 +0200
Subject: [PATCH 143/356] New package: postgresql14-libs-14.5
---
srcpkgs/postgresql14-libs | 1 +
srcpkgs/postgresql14-libs-devel | 1 +
srcpkgs/postgresql14/template | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/postgresql14-libs
create mode 120000 srcpkgs/postgresql14-libs-devel
diff --git a/srcpkgs/postgresql14-libs b/srcpkgs/postgresql14-libs
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-libs
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14-libs-devel b/srcpkgs/postgresql14-libs-devel
new file mode 120000
index 000000000000..13d0224a054b
--- /dev/null
+++ b/srcpkgs/postgresql14-libs-devel
@@ -0,0 +1 @@
+postgresql14
\ No newline at end of file
diff --git a/srcpkgs/postgresql14/template b/srcpkgs/postgresql14/template
index 9c1d31ce1444..3dc23d8a952f 100644
--- a/srcpkgs/postgresql14/template
+++ b/srcpkgs/postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql14'
pkgname=postgresql14
version=14.5
-revision=3
+revision=4
build_style=gnu-configure
make_build_target=world
_major="${version%%.*}"
@@ -109,7 +109,7 @@ postgresql14-doc_package() {
}
}
-postgresql-libs_package() {
+postgresql14-libs_package() {
short_desc="PostgreSQL shared libraries"
conflicts="postgresql9.6-libs>=0 postgresql12-libs>=0 postgresql13-libs>=0"
pkg_install() {
@@ -123,7 +123,7 @@ postgresql-libs_package() {
}
}
-postgresql-libs-devel_package() {
+postgresql14-libs-devel_package() {
depends="postgresql-libs>=${version}_${revision} openssl-devel"
short_desc="PostgreSQL shared libraries (development files)"
conflicts="postgresql9.6-libs-devel>=0 postgresql12-libs-devel>=0 postgresql13-libs-devel>=0"
From 7ed0b01a517e3ba5feff819b3572adb47c54c3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 22:56:13 +0200
Subject: [PATCH 144/356] postgis-postgresql14: build with postgresql14-libs
---
srcpkgs/postgis-postgresql14/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 5b07a5bd027d..1891f6b9ea2d 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
version=3.2.1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -9,8 +9,8 @@ configure_args="
--with-protobufdir=${XBPS_CROSS_BASE}/usr
--with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
hostmakedepends="automake libtool perl pkg-config geos
- libgdal-tools postgresql-libs-devel which"
-makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ libgdal-tools postgresql14-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql14-libs-devel
proj-devel protobuf-c-devel pcre-devel json-c-devel"
checkdepends="libxslt CUnit-devel"
short_desc="Spatial database extender for PostgreSQL"
From f5d2d38a2aff36a350c020f37d7b3cf41f17e999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 23:05:06 +0200
Subject: [PATCH 145/356] New package: postgis-postgresql15-3.2.1
---
srcpkgs/postgis | 2 +-
srcpkgs/postgis-postgresql14/template | 6 -----
srcpkgs/postgis-postgresql15/template | 38 +++++++++++++++++++++++++++
srcpkgs/postgis-postgresql15/update | 2 ++
4 files changed, 41 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/postgis-postgresql15/template
create mode 100644 srcpkgs/postgis-postgresql15/update
diff --git a/srcpkgs/postgis b/srcpkgs/postgis
index 07d2a298867d..3bacb4f025ed 120000
--- a/srcpkgs/postgis
+++ b/srcpkgs/postgis
@@ -1 +1 @@
-postgis-postgresql14
\ No newline at end of file
+postgis-postgresql15
\ No newline at end of file
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 1891f6b9ea2d..3b0fd21b5a65 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -30,9 +30,3 @@ pre_check() {
# regression tests require running postgresql
vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
}
-
-postgis_package() {
- build_style=meta
- short_desc+=" (meta package)"
- depends="postgis-postgresql14"
-}
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
new file mode 100644
index 000000000000..ae140613c292
--- /dev/null
+++ b/srcpkgs/postgis-postgresql15/template
@@ -0,0 +1,38 @@
+# Template file for 'postgis-postgresql15'
+pkgname=postgis-postgresql15
+version=3.2.1
+revision=6
+build_style=gnu-configure
+configure_args="
+ --with-projdir=${XBPS_CROSS_BASE}/usr
+ --with-jsondir=${XBPS_CROSS_BASE}/usr
+ --with-protobufdir=${XBPS_CROSS_BASE}/usr
+ --with-geosconfig=${XBPS_CROSS_BASE}/usr/bin/geos-config"
+hostmakedepends="automake libtool perl pkg-config geos
+ libgdal-tools postgresql-libs-devel which"
+makedepends="geos-devel libgdal-devel libpqxx-devel libxml2-devel postgresql-libs-devel
+ proj-devel protobuf-c-devel pcre-devel json-c-devel"
+checkdepends="libxslt CUnit-devel"
+short_desc="Spatial database extender for PostgreSQL"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="GPL-2.0-or-later"
+homepage="https://postgis.net/"
+changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
+distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
+checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+nocross="FIXME: Cannot run test program to determine PROJ version"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+pre_check() {
+ # regression tests require running postgresql
+ vsed -i regress/run_test.pl -e '/\/usr\/bin\/env/ a exit;'
+}
+
+postgis_package() {
+ build_style=meta
+ short_desc+=" (meta package)"
+ depends="${sourcepkg}"
+}
diff --git a/srcpkgs/postgis-postgresql15/update b/srcpkgs/postgis-postgresql15/update
new file mode 100644
index 000000000000..e5577e6b068a
--- /dev/null
+++ b/srcpkgs/postgis-postgresql15/update
@@ -0,0 +1,2 @@
+pkgname=postgis
+ignore="*alpha* *beta* *rc*"
From ae9e94ecf8a6f558b15ed8cc632d668f921ea7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 13 Oct 2022 23:05:19 +0200
Subject: [PATCH 146/356] postgresql: update to 15.
---
srcpkgs/postgresql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 349e0c92ac16..99f8adc3d420 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
-version=14
-revision=2
+version=15
+revision=1
build_style=meta
depends="postgresql${version}"
short_desc="PostgreSQL server meta package"
From eff18f09f32b8b744500f78476dd70b751b6228a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 4 Feb 2023 19:46:42 +0100
Subject: [PATCH 147/356] postgis-postgresql14: update to 3.3.2.
---
srcpkgs/postgis-postgresql14/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql14/template b/srcpkgs/postgis-postgresql14/template
index 3b0fd21b5a65..e15977173795 100644
--- a/srcpkgs/postgis-postgresql14/template
+++ b/srcpkgs/postgis-postgresql14/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql14'
pkgname=postgis-postgresql14
-version=3.2.1
-revision=5
+version=3.3.2
+revision=1
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+checksum=9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068
nocross="FIXME: Cannot run test program to determine PROJ version"
pre_configure() {
From e628bdf67e2ded19ce60e2a04983cf094f3e99e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 4 Feb 2023 19:46:43 +0100
Subject: [PATCH 148/356] postgis-postgresql15: update to 3.3.2.
---
srcpkgs/postgis-postgresql15/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/postgis-postgresql15/template b/srcpkgs/postgis-postgresql15/template
index ae140613c292..eb8650e16755 100644
--- a/srcpkgs/postgis-postgresql15/template
+++ b/srcpkgs/postgis-postgresql15/template
@@ -1,7 +1,7 @@
# Template file for 'postgis-postgresql15'
pkgname=postgis-postgresql15
-version=3.2.1
-revision=6
+version=3.3.2
+revision=1
build_style=gnu-configure
configure_args="
--with-projdir=${XBPS_CROSS_BASE}/usr
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://postgis.net/"
changelog="https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"
distfiles="https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"
-checksum=fbab68dde6ca3934b24ba08c8ab0cff2594f57f93deab41a15c82ae1bb69893e
+checksum=9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068
nocross="FIXME: Cannot run test program to determine PROJ version"
pre_configure() {
From d3ffd94b4839b01383185f74529aace00a99b33e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 17:16:02 +0000
Subject: [PATCH 149/356] python3-autobahn: update to 23.1.1.
---
srcpkgs/python3-autobahn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template
index 1d43cf46a7e1..197ff6f6a5f2 100644
--- a/srcpkgs/python3-autobahn/template
+++ b/srcpkgs/python3-autobahn/template
@@ -1,6 +1,6 @@
# Template file for 'python3-autobahn'
pkgname=python3-autobahn
-version=22.12.1
+version=23.1.1
revision=1
build_style=python3-module
hostmakedepends="python3 python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://crossbar.io/autobahn"
changelog="https://raw.githubusercontent.com/crossbario/autobahn-python/master/docs/changelog.rst"
distfiles="${PYPI_SITE}/a/autobahn/autobahn-${version}.tar.gz"
-checksum=43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925
+checksum=a88882ab4700ee9eee46c69c38e2b625f6fda48ab1ce61cf7b58b23cf2fadcb8
make_check=no # https://github.com/crossbario/autobahn-python/issues/1117
post_install() {
From ea8364fc647dfe3fb29da8b2c2aee5425e0e3f2e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:58:51 +0000
Subject: [PATCH 150/356] swaylock: update to 1.7.2.
---
.../fix-shm_unlink-undefined-reference.patch | 29 -------------------
srcpkgs/swaylock/template | 9 +++---
2 files changed, 5 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
diff --git a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch b/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
deleted file mode 100644
index e155d7f85ca8..000000000000
--- a/srcpkgs/swaylock/patches/fix-shm_unlink-undefined-reference.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d9e71c87c7af8687750901d71409140f1bd181bd Mon Sep 17 00:00:00 2001
-From: nerdopolis <bluescreen_avenger@verizon.net>
-Date: Sun, 27 Nov 2022 18:46:05 -0500
-Subject: [PATCH] Fix build on Debian Stable
-
----
- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index ace7c933..13548b74 100644
---- a/meson.build
-+++ b/meson.build
-@@ -47,6 +47,7 @@ fish_comp = dependency('fish', required: false)
- libpam = cc.find_library('pam', required: get_option('pam'))
- crypt = cc.find_library('crypt', required: not libpam.found())
- math = cc.find_library('m')
-+rt = cc.find_library('rt')
-
- git = find_program('git', required: false)
- scdoc = find_program('scdoc', required: get_option('man-pages'))
-@@ -112,6 +113,7 @@ dependencies = [
- client_protos,
- gdk_pixbuf,
- math,
-+ rt,
- xkbcommon,
- wayland_client,
- ]
diff --git a/srcpkgs/swaylock/template b/srcpkgs/swaylock/template
index 1675363faf95..0212a1fab532 100644
--- a/srcpkgs/swaylock/template
+++ b/srcpkgs/swaylock/template
@@ -1,6 +1,6 @@
# Template file for 'swaylock'
pkgname=swaylock
-version=1.7
+version=1.7.2
revision=1
build_style=meson
conf_files="/etc/pam.d/swaylock"
@@ -10,9 +10,10 @@ makedepends="wayland-protocols cairo-devel gdk-pixbuf-devel pam-devel
short_desc="Screen locker for Wayland"
maintainer="Derriick <derriick.ensiie@yahoo.com>"
license="MIT"
-homepage="https://swaywm.org"
-distfiles="https://github.com/swaywm/swaylock/archive/${version}.tar.gz"
-checksum=4c4d3c3ed838c085feb0b237b9aaaabdf66cbc05e2b034b2cb5c552957e620d6
+homepage="https://github.com/swaywm/swaylock"
+changelog="https://github.com/swaywm/swaylock/releases"
+distfiles="https://github.com/swaywm/swaylock/releases/download/v${version}/swaylock-${version}.tar.gz"
+checksum=bf965d47fb6fc1402f854d4679d21a9459713fc0f330bc607c9585db097b4304
post_install() {
vlicense LICENSE
From 1fd5858af4ae53dba6318de3fc2b2044f35c650c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:27:46 +0000
Subject: [PATCH 151/356] gspell: update to 1.12.0.
---
srcpkgs/gspell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index ac19b14b08da..8023ec79544d 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
# Template file for 'gspell'
pkgname=gspell
-version=1.11.1
+version=1.12.0
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gspell"
changelog="https://gitlab.gnome.org/GNOME/gspell/-/raw/master/NEWS"
distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292
+checksum=40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad
make_check_pre="xvfb-run"
# Package build options
From 20fbb400ad485cb2d944342ac35d92bc669fc8d0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 4 Feb 2023 15:39:39 -0600
Subject: [PATCH 152/356] python3-blessed: update to 1.20.0.
---
srcpkgs/python3-blessed/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template
index 5558e0cd1dbe..a57a272b2128 100644
--- a/srcpkgs/python3-blessed/template
+++ b/srcpkgs/python3-blessed/template
@@ -1,7 +1,7 @@
# Template file for 'python3-blessed'
pkgname=python3-blessed
-version=1.19.1
-revision=2
+version=1.20.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-six python3-wcwidth"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/jquast/blessed"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=69d5bdd7f14ab1982c9a4b51b27ea4620625bc7d59bf96faaa4206bf5ccf3095
+checksum=2bc8cfe68b210f3eaca9095bbc0752ca98de5a8845fbc68371fe5f5cf406a63d
post_install() {
vlicense LICENSE
From d512e68a66e90682178c5726c21449262e85d884 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 4 Feb 2023 15:41:18 -0600
Subject: [PATCH 153/356] sqlmap: update to 1.7.2.
---
srcpkgs/sqlmap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 0542f944d077..2253f5922fe7 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
# Template file for 'sqlmap'
pkgname=sqlmap
-version=1.7
+version=1.7.2
revision=1
pycompile_dirs="usr/libexec/sqlmap"
depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://sqlmap.org"
distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=aa00e08007bfdb06a362a0c2798073af8e7053a97ead8ed7cca86393a94ec2e1
+checksum=58db9fb0a79332927634cdb8de6df7e62997ec85b77daef0ce733612a1d79de1
python_version=3
do_install() {
From 6fa96587a5a3d28b343fd74e5950e91b22335b63 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 26 Jan 2023 20:54:43 +0000
Subject: [PATCH 154/356] graphene: update to 1.10.8.
---
...rision-in-graphene_ray_intersect_box.patch | 12 --
...5d2280d02812669ac38e3981692b98de7c10.patch | 26 ----
...6339c70cef3ce767841385d8eb3a2a5e852f.patch | 41 ------
...5d6cd3abcf7586f32e222131849c66cc6ad8.patch | 30 -----
...25109898fa4894df810a546b26c387eaae93.patch | 112 ----------------
...dad5a3f38ddbe543ee8c236b4315bba111b9.patch | 51 -------
.../patches/fix-gcc-vector-check.patch | 25 ----
.../patches/gcc-vectors-fix-pragmas.patch | 125 ------------------
srcpkgs/graphene/template | 7 +-
9 files changed, 4 insertions(+), 425 deletions(-)
delete mode 100644 srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
delete mode 100644 srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
delete mode 100644 srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
delete mode 100644 srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
delete mode 100644 srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
delete mode 100644 srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
delete mode 100644 srcpkgs/graphene/patches/fix-gcc-vector-check.patch
delete mode 100644 srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
diff --git a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
deleted file mode 100644
index 6a2533fe7ea0..000000000000
--- a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/graphene-ray.c src/graphene-ray.c
-index 66c3393..9151300 100644
---- a/src/graphene-ray.c
-+++ b/src/graphene-ray.c
-@@ -563,7 +563,7 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
- #else
- if (ty_min > tx_min || fpclassify (tx_min) == FP_NAN)
- tx_min = ty_min;
-- if (ty_max > tx_max || fpclassify (tx_max) == FP_NAN)
-+ if (ty_max < tx_max || fpclassify (tx_max) == FP_NAN)
- tx_max = ty_max;
- #endif
diff --git a/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch b/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
deleted file mode 100644
index deea8eb3e47f..000000000000
--- a/srcpkgs/graphene/patches/2aae5d2280d02812669ac38e3981692b98de7c10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2aae5d2280d02812669ac38e3981692b98de7c10 Mon Sep 17 00:00:00 2001
-From: Dor Askayo <dor.askayo@gmail.com>
-Date: Sat, 3 Apr 2021 16:37:30 +0300
-Subject: [PATCH] graphene-config: Enable NEON for AArch64 on Linux
-
-NEON is fully supported by AArch64. However, GCC doesn't seem to define
-__ARM_NEON__ or _M_ARM64 for AArch64.
-
-Using __aarch64__ should allow a proper detection of this case.
----
- include/graphene-config.h.meson | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/graphene-config.h.meson b/include/graphene-config.h.meson
-index 949eee7..96192cc 100644
---- a/include/graphene-config.h.meson
-+++ b/include/graphene-config.h.meson
-@@ -19,7 +19,7 @@ extern "C" {
- #mesondefine GRAPHENE_HAS_SSE
- # endif
-
--# if defined(__ARM_NEON__) || defined (_M_ARM64)
-+# if defined(__ARM_NEON__) || defined (_M_ARM64) || defined (__aarch64__)
- #mesondefine GRAPHENE_HAS_ARM_NEON
- # endif
-
diff --git a/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch b/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
deleted file mode 100644
index 30fdb212e1c3..000000000000
--- a/srcpkgs/graphene/patches/5b746339c70cef3ce767841385d8eb3a2a5e852f.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5b746339c70cef3ce767841385d8eb3a2a5e852f Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 23:14:16 +0100
-Subject: [PATCH] Avoid shadowing for nested cross/dot calls
-
----
- include/graphene-simd4f.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index ca711e5..f95fe04 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -897,19 +897,19 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_cross3(a,b) \
- (__extension__ ({ \
-- const graphene_simd4f_t __a = (a); \
-- const graphene_simd4f_t __b = (b); \
-- graphene_simd4f_init (__a[1] * __b[2] - __a[2] * __b[1], \
-- __a[2] * __b[0] - __a[0] * __b[2], \
-- __a[0] * __b[1] - __a[1] * __b[0], \
-+ const graphene_simd4f_t __cross_a = (a); \
-+ const graphene_simd4f_t __cross_b = (b); \
-+ graphene_simd4f_init (__cross_a[1] * __cross_b[2] - __cross_a[2] * __cross_b[1], \
-+ __cross_a[2] * __cross_b[0] - __cross_a[0] * __cross_b[2], \
-+ __cross_a[0] * __cross_b[1] - __cross_a[1] * __cross_b[0], \
- 0.f); \
- }))
-
- # define graphene_simd4f_dot3(a,b) \
- (__extension__ ({ \
-- const graphene_simd4f_t __a = (a); \
-- const graphene_simd4f_t __b = (b); \
-- const float __res = __a[0] * __b[0] + __a[1] * __b[1] + __a[2] * __b[2]; \
-+ const graphene_simd4f_t __dot_a = (a); \
-+ const graphene_simd4f_t __dot_b = (b); \
-+ const float __res = __dot_a[0] * __dot_b[0] + __dot_a[1] * __dot_b[1] + __dot_a[2] * __dot_b[2]; \
- graphene_simd4f_init (__res, __res, __res, __res); \
- }))
-
diff --git a/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch b/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
deleted file mode 100644
index cb29300ae653..000000000000
--- a/srcpkgs/graphene/patches/74845d6cd3abcf7586f32e222131849c66cc6ad8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 74845d6cd3abcf7586f32e222131849c66cc6ad8 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 22:58:34 +0100
-Subject: [PATCH] Fix the GCC check in graphene-config.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We want GCC ≥ 4.9 on non-ARM architectures, so we need to check for:
-
- - GCC
- - GCC ≥ 5 or GCC == 4.9
- - !ARM
----
- include/graphene-config.h.meson | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/graphene-config.h.meson b/include/graphene-config.h.meson
-index ab72d53..949eee7 100644
---- a/include/graphene-config.h.meson
-+++ b/include/graphene-config.h.meson
-@@ -23,7 +23,7 @@ extern "C" {
- #mesondefine GRAPHENE_HAS_ARM_NEON
- # endif
-
--# if defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 9) && !defined(__arm__)
-+# if defined(__GNUC__) && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && !defined(__arm__)
- #mesondefine GRAPHENE_HAS_GCC
- # endif
-
diff --git a/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch b/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
deleted file mode 100644
index db2e2ecc7de3..000000000000
--- a/srcpkgs/graphene/patches/8e5c25109898fa4894df810a546b26c387eaae93.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 8e5c25109898fa4894df810a546b26c387eaae93 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@gnome.org>
-Date: Thu, 1 Apr 2021 23:13:06 +0100
-Subject: [PATCH] Ignore float equality checks
-
-There is a well-defined representation for 0 with single precision
-floating point values, so we can disable the float-equal warning.
----
- include/graphene-simd4f.h | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index 55a1b5b..ca711e5 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -856,12 +856,15 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_reciprocal(v) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / (v)[0] : 0.f, \
- (v)[1] != 0.f ? 1.f / (v)[1] : 0.f, \
- (v)[2] != 0.f ? 1.f / (v)[2] : 0.f, \
- (v)[3] != 0.f ? 1.f / (v)[3] : 0.f, \
- }; \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_sqrt(v) \
-@@ -876,12 +879,15 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_rsqrt(v) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / sqrtf ((v)[0]) : 0.f, \
- (v)[1] != 0.f ? 1.f / sqrtf ((v)[1]) : 0.f, \
- (v)[2] != 0.f ? 1.f / sqrtf ((v)[2]) : 0.f, \
- (v)[3] != 0.f ? 1.f / sqrtf ((v)[3]) : 0.f, \
- }; \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_add(a,b) (__extension__ ({ (graphene_simd4f_t) ((a) + (b)); }))
-@@ -994,49 +1000,64 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
-
- # define graphene_simd4f_cmp_eq(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) == (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_neq(a,b) (!graphene_simd4f_cmp_eq (a,b))
-
- # define graphene_simd4f_cmp_lt(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) < (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_le(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) <= (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_ge(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) >= (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_cmp_gt(a,b) \
- (__extension__ ({ \
-+ _Pragma ("GCC diagnostic push") \
-+ _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) > (b); \
- (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
-+ _Pragma ("GCC diagnostic pop") \
- }))
-
- # define graphene_simd4f_neg(s) \
diff --git a/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch b/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
deleted file mode 100644
index 124448fb7c68..000000000000
--- a/srcpkgs/graphene/patches/fbfbdad5a3f38ddbe543ee8c236b4315bba111b9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From fbfbdad5a3f38ddbe543ee8c236b4315bba111b9 Mon Sep 17 00:00:00 2001
-From: Dor Askayo <dor.askayo@gmail.com>
-Date: Sat, 3 Apr 2021 16:40:30 +0300
-Subject: [PATCH] meson: Fix detection of AArch64 on Linux
-
-Neither __ARM_EABI__ nor __ARM_NEON__ are defined by GCC for AArch64,
-and -mfpu=neon is not required as NEON is always supported in AArch64.
----
- meson.build | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index c96aded..86d8eb8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -10,6 +10,7 @@ project('graphene', 'c',
-
- cc = meson.get_compiler('c')
- host_system = host_machine.system()
-+host_cpu_family = host_machine.cpu_family()
-
- add_project_arguments([ '-D_GNU_SOURCE' ], language: 'c')
-
-@@ -352,11 +353,13 @@ neon_cflags = []
- if get_option('arm_neon')
- neon_prog = '''
- #if !defined (_MSC_VER) || defined (__clang__)
--# ifndef __ARM_EABI__
--# error "EABI is required (to be sure that calling conventions are compatible)"
--# endif
--# ifndef __ARM_NEON__
--# error "No ARM NEON instructions available"
-+# if !defined (_M_ARM64) && !defined (__aarch64__)
-+# ifndef __ARM_EABI__
-+# error "EABI is required (to be sure that calling conventions are compatible)"
-+# endif
-+# ifndef __ARM_NEON__
-+# error "No ARM NEON instructions available"
-+# endif
- # endif
- #endif
- #include <arm_neon.h>
-@@ -376,7 +379,7 @@ int main () {
-
- test_neon_cflags = []
-
-- if cc.get_id() != 'msvc'
-+ if cc.get_id() != 'msvc' and host_cpu_family != 'aarch64'
- test_neon_cflags += ['-mfpu=neon']
- endif
-
diff --git a/srcpkgs/graphene/patches/fix-gcc-vector-check.patch b/srcpkgs/graphene/patches/fix-gcc-vector-check.patch
deleted file mode 100644
index 26e805641ce0..000000000000
--- a/srcpkgs/graphene/patches/fix-gcc-vector-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2da1217742648496c44dff86fd0b477d40d9b067 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Jun 2021 15:47:14 +0200
-Subject: [PATCH] fix gcc vector 64-bit check
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0ef4f5a..669773f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -311,7 +311,7 @@ if get_option('gcc_vector')
- # error "GCC vector intrinsics are disabled on GCC prior to 4.9"
- # elif defined(__arm__)
- # error "GCC vector intrinsics are disabled on ARM"
--# elif !defined(__x86_64__)
-+# elif (__SIZEOF_POINTER__ < 8)
- # error "GCC vector intrinsics are disabled on 32bit"
- # endif
- #else
---
-2.31.1
-
diff --git a/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch b/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
deleted file mode 100644
index 6d9b92872083..000000000000
--- a/srcpkgs/graphene/patches/gcc-vectors-fix-pragmas.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 2756f97c802d6c461cab2a865a98a09504410083 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Sun, 5 Sep 2021 15:21:39 +0200
-Subject: [PATCH] Fix various broken macros when using GCC extension vectors
-
-Commit 8e5c25109898fa4894df810a546b26c387eaae93 introduced
-some pragmas, however those unintentionally change the types
-of the macros, as the diagnostic pop pragma becomes the last
-statement and the type of the expression becomes void.
-
-Work around this by using a temporary and evaluating to that
-before popping.
----
- include/graphene-simd4f.h | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/include/graphene-simd4f.h b/include/graphene-simd4f.h
-index f95fe04..ea29ba3 100644
---- a/include/graphene-simd4f.h
-+++ b/include/graphene-simd4f.h
-@@ -858,13 +858,14 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- (__extension__ ({ \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
-- (graphene_simd4f_t) { \
-+ const graphene_simd4f_t __val = (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / (v)[0] : 0.f, \
- (v)[1] != 0.f ? 1.f / (v)[1] : 0.f, \
- (v)[2] != 0.f ? 1.f / (v)[2] : 0.f, \
- (v)[3] != 0.f ? 1.f / (v)[3] : 0.f, \
- }; \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_sqrt(v) \
-@@ -881,13 +882,14 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- (__extension__ ({ \
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
-- (graphene_simd4f_t) { \
-+ const graphene_simd4f_t __val = (graphene_simd4f_t) { \
- (v)[0] != 0.f ? 1.f / sqrtf ((v)[0]) : 0.f, \
- (v)[1] != 0.f ? 1.f / sqrtf ((v)[1]) : 0.f, \
- (v)[2] != 0.f ? 1.f / sqrtf ((v)[2]) : 0.f, \
- (v)[3] != 0.f ? 1.f / sqrtf ((v)[3]) : 0.f, \
- }; \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_add(a,b) (__extension__ ({ (graphene_simd4f_t) ((a) + (b)); }))
-@@ -1003,11 +1005,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) == (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_neq(a,b) (!graphene_simd4f_cmp_eq (a,b))
-@@ -1017,11 +1020,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) < (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_le(a,b) \
-@@ -1029,11 +1033,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) <= (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_ge(a,b) \
-@@ -1041,11 +1046,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) >= (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_cmp_gt(a,b) \
-@@ -1053,11 +1059,12 @@ typedef int graphene_simd4i_t __attribute__((vector_size (16)));
- _Pragma ("GCC diagnostic push") \
- _Pragma ("GCC diagnostic ignored \"-Wfloat-equal\"") \
- const graphene_simd4i_t __res = (a) > (b); \
-- (bool) (__res[0] != 0 && \
-+ const bool __val = (bool) (__res[0] != 0 && \
- __res[1] != 0 && \
- __res[2] != 0 && \
- __res[3] != 0); \
- _Pragma ("GCC diagnostic pop") \
-+ __val; \
- }))
-
- # define graphene_simd4f_neg(s) \
---
-2.32.0
-
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index 6be39623eeae..f0c41f527d86 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,7 +1,7 @@
# Template file for 'graphene'
pkgname=graphene
-version=1.10.6
-revision=3
+version=1.10.8
+revision=1
build_style=meson
build_helper="gir"
configure_args="-Dinstalled_tests=false
@@ -12,8 +12,9 @@ short_desc="Thin layer of types for graphic libraries"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://github.com/ebassi/graphene"
+changelog="https://github.com/ebassi/graphene/releases"
distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
-checksum=80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25
+checksum=a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" -Dsse2=true" ;;
From 4ec07d3793f805cb1bb3d33b6cb1a82831e1654c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 19:55:26 +0000
Subject: [PATCH 155/356] double-conversion: update to 3.2.1.
---
srcpkgs/double-conversion/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/double-conversion/template b/srcpkgs/double-conversion/template
index 8386838c0755..6f05d58cf9a4 100644
--- a/srcpkgs/double-conversion/template
+++ b/srcpkgs/double-conversion/template
@@ -1,16 +1,20 @@
# Template file for 'double-conversion'
pkgname=double-conversion
-version=3.1.5
+version=3.2.1
revision=1
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON"
+configure_args="-DBUILD_SHARED_LIBS=ON"
short_desc="Efficient binary-decimal and decimal-binary routines for IEEE doubles"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/google/double-conversion"
-changelog="https://raw.githubusercontent.com/google/double-conversion/master/Changelog"
+changelog="https://github.com/google/double-conversion/releases"
distfiles="https://github.com/google/double-conversion/archive/v${version}.tar.gz"
-checksum=a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13
+checksum=e40d236343cad807e83d192265f139481c51fc83a1c49e406ac6ce0a0ba7cd35
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTING=ON"
+fi
post_install() {
vlicense LICENSE
From d1657a39464c2449aec82c364bef444cf8b07b11 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:57:42 +0000
Subject: [PATCH 156/356] StyLua: update to 0.16.0.
---
srcpkgs/StyLua/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index 153647da60a8..234a9ff7bfd2 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
# Template file for 'StyLua'
pkgname=StyLua
-version=0.15.3
+version=0.16.0
revision=1
build_style=cargo
configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if lua53 '--features lua53')
@@ -11,7 +11,7 @@ license="MPL-2.0"
homepage="https://github.com/JohnnyMorganz/StyLua"
changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/main/CHANGELOG.md"
distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=37feff9a52c2355419cb5dabdc6dac15f6fbef7d91b7cd9f33bd593efe278306
+checksum=a42305c175e44c87f4d3c210e7b89d499d81053b48f4aa05bde841a3702ef07a
build_options="lua52 lua53 lua54 luau"
build_options_default="lua52 lua53 lua54 luau"
From e8dae15c5819d9863348a4cbe6246e82a6ad8005 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:18:23 +0000
Subject: [PATCH 157/356] dialog: update to 1.3.20221229.
---
srcpkgs/dialog/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 94c275c2d0a3..a75d023f61fc 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,6 +1,6 @@
# Template file for 'dialog'
pkgname=dialog
-version=1.3.20220728
+version=1.3.20221229
revision=1
_distver=${version%.*}
_date=${version##*.}
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
-distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=54418973d559a461b00695fafe68df62f2bc73d506b436821d77ca3df454190b
+distfiles="https://invisible-mirror.net/archives/dialog/dialog-${_distver}-${_date}.tgz"
+checksum=d5663d016003e5260fa485f5e9c2ddffb386508f3bd0687d4fa3635ea9942b8e
post_install() {
rm -r ${DESTDIR}/usr/lib
From 0032dc89f9d135d11bcd4396046fc2a5744cb8c9 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Wed, 1 Feb 2023 19:47:52 -0600
Subject: [PATCH 158/356] Signal-Desktop: update to 6.4.1.
Closes: #42023 [via git-merge-pr]
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 26cfc3892ea1..c7389f4ed0e2 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=6.3.0
+version=6.4.1
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension
@@ -13,7 +13,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=07c71bd31157873d5d1f57830a636fe61ad551bacf4a87a4f13336f16e524a1a
+checksum=899af104afe358413ebba2971ddb273ee788f7ffad9fdf96ece30e527eda3475
nostrip_files="signal-desktop"
post_extract() {
From a1bd280382da03f54b4869c5cc90a6f73acf82b0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 21 Jan 2023 21:30:32 +0000
Subject: [PATCH 159/356] babl: update to 0.1.98.
---
srcpkgs/babl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index c220d2ccbdf1..38b773c933aa 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,6 +1,6 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.96
+version=0.1.98
revision=1
build_style=meson
build_helper=gir
@@ -13,7 +13,7 @@ license="LGPL-3.0-only"
homepage="https://gegl.org/babl/"
changelog="https://gitlab.gnome.org/GNOME/babl/-/raw/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6
+checksum=f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1
case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
From 82655829dc7211800314224941280a7f06641d5d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 18 Jan 2023 22:28:40 +0530
Subject: [PATCH 160/356] python3-gnupg: update to 0.5.0.
Fix update reporting.
---
srcpkgs/python3-gnupg/template | 8 ++++----
srcpkgs/python3-gnupg/update | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
index 2870ab8f1489..597b6888818b 100644
--- a/srcpkgs/python3-gnupg/template
+++ b/srcpkgs/python3-gnupg/template
@@ -1,7 +1,7 @@
# Template file for 'python3-gnupg'
pkgname=python3-gnupg
-version=0.4.9
-revision=2
+version=0.5.0
+revision=1
build_style=python3-pep517
make_install_target="dist/python_gnupg-${version}-py2.py3-none-any.whl"
hostmakedepends="python3-setuptools python3-wheel"
@@ -11,8 +11,8 @@ short_desc="Python3 wrapper for GnuPG"
maintainer="Lon Willett <xgit@lonw.net>"
license="BSD-3-Clause"
homepage="https://github.com/vsajip/python-gnupg"
-distfiles="${PYPI_SITE}/p/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
-checksum=aaa748795572591aaf127b4ac8985684f3673ff82b39f370c836b006e68fc537
+distfiles="${PYPI_SITE}/p/python-gnupg/python-gnupg-${version}.tar.gz"
+checksum=70758e387fc0e0c4badbcb394f61acbe68b34970a8fed7e0f7c89469fe17912a
make_check_pre="env NO_EXTERNAL_TESTS=1"
post_install() {
diff --git a/srcpkgs/python3-gnupg/update b/srcpkgs/python3-gnupg/update
index 9d5cdc2a6805..1b0e270aa10c 100644
--- a/srcpkgs/python3-gnupg/update
+++ b/srcpkgs/python3-gnupg/update
@@ -1 +1,2 @@
-site="https://pypi.org/project/python-gnupg/"
+pkgname=python-gnupg
+site="https://pypi.org/simple/python-gnupg/"
From 5af1bd0e1c40d1575b10f29e640c9464c5e9be17 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 24 Jan 2023 11:09:38 +0530
Subject: [PATCH 161/356] pre-commit: update to 3.0.4.
---
srcpkgs/pre-commit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index cd5e57b190f6..3a51b303c132 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
# Template file for 'pre-commit'
pkgname=pre-commit
-version=2.21.0
+version=3.0.4
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://pre-commit.com/"
changelog="https://raw.githubusercontent.com/pre-commit/pre-commit/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658
+checksum=bc4687478d55578c4ac37272fe96df66f73d9b5cf81be6f28627d4e712e752d5
make_check=no # unpackaged: pytest-env re-assert
post_install() {
From e660bea85ac0813eebb91d9a77cad7f0711e0146 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 7 Dec 2022 20:03:26 +0530
Subject: [PATCH 162/356] New package: lswt-1.0.4
---
srcpkgs/lswt/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/lswt/template
diff --git a/srcpkgs/lswt/template b/srcpkgs/lswt/template
new file mode 100644
index 000000000000..8e06d8d6eb20
--- /dev/null
+++ b/srcpkgs/lswt/template
@@ -0,0 +1,13 @@
+# Template file for 'lswt'
+pkgname=lswt
+version=1.0.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="wayland-devel"
+makedepends="wayland-devel"
+short_desc="List Wayland toplevels"
+maintainer="icp <pangolin@vivaldi.net>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~leon_plickat/lswt"
+distfiles="https://git.sr.ht/~leon_plickat/lswt/archive/v${version}.tar.gz"
+checksum=a1a422d996e9dbfa2d07daf5588ede280157ab0d0cc7e918d7c16999f4e14b5f
From 8c64080e826dd3db20b3daa054758fdd9cd437fd Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 01:47:22 +0530
Subject: [PATCH 163/356] hstr: update to 2.6.
---
srcpkgs/hstr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index 3f2d95c854ec..8babb38010e6 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
# Template file for 'hstr'
pkgname=hstr
-version=2.5
+version=2.6
revision=1
build_style=gnu-configure
hostmakedepends="automake pkg-config"
@@ -10,8 +10,8 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="Apache-2.0"
homepage="https://github.com/dvorka/hstr"
changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
-distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
-checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4
+distfiles="https://github.com/dvorka/hstr/archive/refs/tags/${version}.tar.gz"
+checksum=085f8a087481bcdf33e75e2fa5aaa9289931782c0bee2db3e02425b9a7d83cdf
pre_configure() {
vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h
From bf83c8de3125dfb53a9a2112a2b5e0501226e619 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 2 Feb 2023 01:26:17 +0530
Subject: [PATCH 164/356] dust: update to 0.8.4.
---
srcpkgs/dust/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 4dcdc139c197..0e158125ba18 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,19 +1,21 @@
# Template file for 'dust'
pkgname=dust
-version=0.8.3
+version=0.8.4
revision=1
build_style=cargo
short_desc="More intuitive version of du"
maintainer="Neel <neel@chot.ai>"
license="Apache-2.0"
homepage="https://github.com/bootandy/dust"
-distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=1e07203546274276503a4510adcf5dc6eacd5d1e20604fcd55a353b3b63c1213
+distfiles="https://github.com/bootandy/dust/archive/refs/tags/v${version}.tar.gz"
+checksum=611f2da80ef5b1d4423bcda159a65e9436692357b686b91b1dd8245a76eed589
post_install() {
vcompletion completions/dust.bash bash
vcompletion completions/dust.fish fish
vcompletion completions/_dust zsh
+
vsconf config/config.toml
+ vman man-page/dust.1
vdoc README.md
}
From 6f2e6cf900decde43ab72505736191ad2e7639d4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 1 Feb 2023 21:13:52 +0530
Subject: [PATCH 165/356] lazygit: update to 0.37.0.
Adopt.
---
srcpkgs/lazygit/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 676982b83a21..1699dab785f4 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,17 +1,17 @@
# Template file for 'lazygit'
pkgname=lazygit
-version=0.36.0
+version=0.37.0
revision=1
build_style=go
go_import_path=github.com/jesseduffield/lazygit
go_ldflags="-X main.version=${version} -X main.buildSource=voidlinux"
depends="git"
short_desc="Simple terminal UI for git commands"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jesseduffield/lazygit"
-distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=0b8630b09e28dc478fb2545c6fbe52e679b9a2e5dbe569982c9649655ab969c3
+distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
+checksum=8545f3cffe110de80c88859cd11b42eaccb71f4c239c5bc2bff841f623438296
post_install() {
vlicense LICENSE
From dea47b4b934f751e51caec169a78b1bcc96292c8 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 29 Jan 2023 11:49:51 +0530
Subject: [PATCH 166/356] gallery-dl: update to 1.24.5.
---
srcpkgs/gallery-dl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template
index 58858eda0ea8..732c460892b5 100644
--- a/srcpkgs/gallery-dl/template
+++ b/srcpkgs/gallery-dl/template
@@ -1,6 +1,6 @@
# Template file for 'gallery-dl'
pkgname=gallery-dl
-version=1.24.4
+version=1.24.5
revision=1
build_style=python3-module
make_check_args="--ignore test/test_results.py"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
homepage="https://github.com/mikf/gallery-dl"
changelog="https://raw.githubusercontent.com/mikf/gallery-dl/master/CHANGELOG.md"
distfiles="https://github.com/mikf/gallery-dl/archive/refs/tags/v${version}.tar.gz"
-checksum=0ee58567b1241a4577cdc2ea177bc46ff8da494a74e6430059e5d0c214ae222a
+checksum=a1feccc0ae74c00a96f068fb079eadaa808e53bc6a028d3774940c473758b462
pre_build() {
make man completion
From 3fb93f72303308b54a09017da46721dc876d7d79 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 00:42:53 +0530
Subject: [PATCH 167/356] python3-zipp: update to 3.12.0.
---
srcpkgs/python3-zipp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template
index 63c2208061c0..f83b9ef5b74c 100644
--- a/srcpkgs/python3-zipp/template
+++ b/srcpkgs/python3-zipp/template
@@ -1,6 +1,6 @@
# Template file for 'python3-zipp'
pkgname=python3-zipp
-version=3.11.0
+version=3.12.0
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://pypi.org/project/zipp/"
changelog="https://raw.githubusercontent.com/jaraco/zipp/main/CHANGES.rst"
distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz"
-checksum=a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766
+checksum=73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb
post_install() {
vlicense LICENSE
From fa78ce37e46fd7cf73bd0b16e4bee4d55c8b2fc0 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 25 Oct 2022 01:25:06 +0530
Subject: [PATCH 168/356] python3-mypy: update to 0.991.
---
srcpkgs/python3-mypy/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 55c2e21b5418..78e082164446 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,18 +1,22 @@
# Template file for 'python3-mypy'
pkgname=python3-mypy
-version=0.961
-revision=2
+version=0.991
+revision=1
build_style=python3-module
+# fails in ci
+make_check_args="-k not(testDaemonStatusKillRestartRecheck)"
+make_check_target="mypy/test"
hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-mypy_extensions python3-typed-ast python3-typing_extensions
- python3-tomli"
+depends="python3-mypy_extensions python3-typing_extensions"
+checkdepends="${depends} python3-attrs python3-filelock
+ python3-lxml python3-psutil python3-py python3-pytest-xdist"
short_desc="Optional static typing for Python3"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
-homepage="https://github.com/python/mypy"
+homepage="https://www.mypy-lang.org"
+changelog="https://mypy-lang.blogspot.com"
distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=f730d56cb924d371c26b8eaddeea3cc07d78ff51c521c6d04899ac6904b75492
-make_check=no # needs pytest-xdist and many tests fail
+checksum=3c0165ba8f354a6d9881809ef29f1a9318a236a6d81c690094c5df32107bde06
post_install() {
make -C docs man
From 265960fc07b138a745e22aef63def0b7bcc8ffae Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 19 Jan 2023 22:43:31 +0530
Subject: [PATCH 169/356] pex: update to 2.1.121.
Adopt.
---
srcpkgs/pex/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template
index cde6e6fc2f34..479a8255e5cf 100644
--- a/srcpkgs/pex/template
+++ b/srcpkgs/pex/template
@@ -1,17 +1,17 @@
# Template file for 'pex'
pkgname=pex
-version=2.1.103
-revision=2
+version=2.1.121
+revision=1
build_style=python3-pep517
hostmakedepends="python3-flit_core python3-Sphinx"
depends="python3"
short_desc="Library & tool for generating .pex (Python EXecutable) files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="Apache-2.0"
homepage="https://github.com/pantsbuild/pex"
changelog="https://raw.githubusercontent.com/pantsbuild/pex/main/CHANGES.rst"
distfiles="${PYPI_SITE}/p/pex/pex-${version}.tar.gz"
-checksum=07bcd633626b7fd6d18eb0d6303acfd0a4fbcb31692e737b15794626da896bf0
+checksum=d66c099d48bf2b00d06be01518c834df888c195c3e17a524cf12f83226fa2489
post_build() {
PYTHONPATH="$PWD" make -C docs man
From d079e5ba860446265a37296093fec312e62cbc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 Feb 2023 00:41:58 +0700
Subject: [PATCH 170/356] fragments: depends on transmission
Fix: #42068
---
srcpkgs/fragments/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/fragments/template b/srcpkgs/fragments/template
index f26e0aa4585e..135e4905b99f 100644
--- a/srcpkgs/fragments/template
+++ b/srcpkgs/fragments/template
@@ -1,13 +1,14 @@
# Template file for 'fragments'
pkgname=fragments
version=2.1
-revision=1
+revision=2
build_style=meson
build_helper="rust"
hostmakedepends="desktop-file-utils cargo pkg-config gettext glib-devel
gtk4-update-icon-cache"
makedepends="sqlite-devel gtk4-devel libadwaita-devel libglib-devel dbus-devel
openssl-devel rust-std"
+depends="transmission"
short_desc="BitTorrent Client"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
From e00e2f64e938c942bc828422d6600d7f4801210d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 3 Feb 2023 23:42:28 +0100
Subject: [PATCH 171/356] neovim: update to 0.8.3
---
srcpkgs/neovim/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 2cd7bafd0dd3..9c7a73bf6fb2 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
-version=0.8.2
-revision=3
+version=0.8.3
+revision=1
build_style=cmake
build_helper="qemu"
# MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3
@@ -16,7 +16,7 @@ maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
license="Apache-2.0, Vim"
homepage="https://neovim.io"
distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz"
-checksum=c516c8db73e1b12917a6b2e991b344d0914c057cef8266bce61a2100a28ffcc9
+checksum=adf45ff160e1d89f519b6114732eba03485ae469beb27919b0f7a4f6b44233c1
build_options=luajit
From 442309c0b1a2931d6f016af68d6042d3c2ec8301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 23:49:08 +0700
Subject: [PATCH 172/356] virtualbox-ose: update to 7.0.6.
Fix: #41681
---
srcpkgs/virtualbox-ose/template | 45 ++++++++++++++++++---------------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 679dac249a25..4efc26f7da06 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=7.0.4
+version=7.0.6
revision=1
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,20 +8,21 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17
+checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
nopie=yes
lib32disabled=yes
archs="x86_64"
hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
- qt6-base"
+ vulkan-loader"
makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-base-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel qt6-qt5compat-devel libtpms-devel
- qt6-scxml-devel qt6-tools-devel SDL2-devel SDL2_ttf-devel SDL2_gfx-devel
- SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel liblvm2app-devel
+ libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
if [ "$XBPS_MACHINE" = "x86_64" ]; then
makedepends+=" gcc-multilib"
@@ -43,7 +44,8 @@ do_build() {
-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
source ./env.sh
- kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+ kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
+ # kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
}
do_install() {
@@ -54,15 +56,20 @@ do_install() {
# virtualbox-ose.
#
cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
- mkdir -p ${DESTDIR}/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
- install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox
+ vmkdir usr/lib/virtualbox
+ vmkdir usr/share/virtualbox
+ vbin VBox.sh VBox
for f in VirtualBox VBoxManage VBoxHeadless \
VBoxBalloonCtrl vboxwebsrv; do
ln -sf VBox ${DESTDIR}/usr/bin/${f}
done
+
# components
- install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components
+ vcopy components usr/lib/virtualbox
+ vcopy dtrace usr/lib/virtualbox
+ vcopy ExtensionPacks usr/lib/virtualbox
+ vcopy tools usr/lib/virtualbox
# libs
install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox
@@ -73,24 +80,23 @@ do_install() {
VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox
install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
+ VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
+ VBoxVolInfo xpidl \
VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
-t ${DESTDIR}/usr/lib/virtualbox
# locales
- install -m0755 nls/*.qm -t ${DESTDIR}/usr/share/virtualbox/nls
+ vcopy nls usr/share/virtualbox
# scripts
install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh \
-t ${DESTDIR}/usr/share/virtualbox
# icons and desktop
- install -D -m0644 VBox.png ${DESTDIR}/usr/share/pixmaps/VBox.png
- install -D -m0644 virtualbox.desktop \
- ${DESTDIR}/usr/share/applications/virtualbox.desktop
- sed -i -e "s|Icon=VBox|Icon=VBox.png|" \
- ${DESTDIR}/usr/share/applications/virtualbox.desktop
- install -Dm644 virtualbox.xml \
- ${DESTDIR}/usr/share/mime/packages/virtualbox.xml
+ vinstall VBox.png 644 usr/share/pixmaps/
+ sed -i -e "s|Icon=VBox|Icon=VBox.png|" virtualbox.desktop
+ vinstall virtualbox.desktop 644 usr/share/applications/
+ vinstall virtualbox.xml 644 usr/share/mime/packages/
install -d ${DESTDIR}/usr/share/icons/hicolor
for i in icons/*; do
ldir=$(basename ${i})
@@ -102,7 +108,6 @@ do_install() {
mkdir -p ${DESTDIR}/etc/vbox
echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${DESTDIR}/etc/vbox/vbox.cfg
- cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
install -d ${DESTDIR}/usr/share/licenses/${pkgname}
install -m0644 ${wrksrc}/COPYING* \
${DESTDIR}/usr/share/licenses/${pkgname}
From 3c1fc884455ae2fd344e64cb04c956ffc01452e4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:36:25 +0000
Subject: [PATCH 173/356] libwacom: update to 2.6.0, adopt.
---
common/shlibs | 2 +-
srcpkgs/libwacom/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index af1fd992b5da..135087319da4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1043,7 +1043,7 @@ libgck-2.so.0.0.0 gcr4-4.0.0_1
libgcr-4.so.0.0.0 gcr4-4.0.0_1
libcld2.so cld2-0.0.1.20150821_1
libcld2_full.so cld2-full-0.0.1.20150821_1
-libwacom.so.2 libwacom-0.3_1
+libwacom.so.9 libwacom-2.6.0_1
libfarstream-0.2.so.5 farstream-0.2.7_1
libass.so.9 libass-0.13.6_1
libcryptui.so.0 libcryptui-3.4.0_1
diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index 248a33d407ac..8216a58a086d 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
# Template file for 'libwacom'
pkgname=libwacom
-version=1.12
+version=2.6.0
revision=1
build_style=meson
build_helper="qemu"
@@ -9,12 +9,12 @@ hostmakedepends="pkg-config"
makedepends="libgudev-devel libxml2-devel"
checkdepends="python3-pytest python3-libevdev python3-pyudev"
short_desc="Library to identify wacom tablets"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
license="MIT"
homepage="https://github.com/linuxwacom/libwacom"
changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
-distfiles="https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=290450d604f78bbd956eddb69f79f8d56f8ed1a5ccbb5e88e22fa84fa2fceb4f
+distfiles="https://github.com/linuxwacom/libwacom/releases/download/libwacom-${version}/libwacom-${version}.tar.xz"
+checksum=2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f
if [ -z "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -Dtests=disabled"
From b35db2342812e97cd21211b2abf54840795fd30b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 174/356] budgie-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/budgie-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
index 11c9080925f0..37736255e165 100644
--- a/srcpkgs/budgie-control-center/template
+++ b/srcpkgs/budgie-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-control-center'
pkgname=budgie-control-center
version=1.1.1
-revision=2
+revision=3
build_style=meson
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
polkit python3 libxml2"
From 1af95be3521c15202340e030479b4a5f357c6347 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 175/356] cinnamon-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/cinnamon-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index e1428a97c61e..db1e4ea6d7ba 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'cinnamon-control-center'
pkgname=cinnamon-control-center
version=5.4.7
-revision=1
+revision=2
build_style=meson
build_helper=gir
hostmakedepends="gettext-devel glib-devel
From e7d693ca992d32cffb4f20efc24f5362afba927f Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:47 +0000
Subject: [PATCH 176/356] gnome-control-center: revbump for libwacom-2.6.0.
---
srcpkgs/gnome-control-center/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template
index af6728cd45a1..849763d23c1e 100644
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-control-center'
pkgname=gnome-control-center
version=43.2
-revision=1
+revision=2
build_style=meson
build_helper="gir"
hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
From faebd0eb23f41574d8edc31520ba8d8a861dc6f3 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 177/356] gnome-settings-daemon: revbump for libwacom-2.6.0.
---
srcpkgs/gnome-settings-daemon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index f22bdbdb61f4..3d3cf393f960 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-settings-daemon'
pkgname=gnome-settings-daemon
version=43.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dsystemd=false"
hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
From 805632865287d15a82dd21aa18df45991cc92353 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 178/356] libinput: revbump for libwacom-2.6.0.
---
srcpkgs/libinput/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index d429098fa2fc..d5b88caeee0b 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,7 +1,7 @@
# Template file for 'libinput'
pkgname=libinput
version=1.22.0
-revision=1
+revision=2
build_style=meson
configure_args="-Db_ndebug=false -Ddebug-gui=false"
hostmakedepends="pkg-config"
From 6f4b23e2ff2951753f8706efa873d2e1c791dd6c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:48 +0000
Subject: [PATCH 179/356] muffin: revbump for libwacom-2.6.0.
---
srcpkgs/muffin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 9383775a47f4..6c30d4452451 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,7 +1,7 @@
# Template file for 'muffin'
pkgname=muffin
version=5.4.5
-revision=1
+revision=2
build_style=meson
build_helper=gir
# -Dtests requires -Dwayland, which is explicitly disabled
From f98ea18135dbbdfe6f91462ae74ee94caef406f0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 11 Jan 2023 00:37:49 +0000
Subject: [PATCH 180/356] mutter: revbump for libwacom-2.6.0.
---
srcpkgs/mutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4adf8a458957..c84c35f12b26 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
version=43.2
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
From 54f97764ed81ef7b071f01216aedd1a4f387b2f7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 3 Feb 2023 20:46:43 +0000
Subject: [PATCH 181/356] kcm-wacomtablet: revbump for libwacom-2.6.0.
---
srcpkgs/kcm-wacomtablet/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kcm-wacomtablet/template b/srcpkgs/kcm-wacomtablet/template
index eedf2684333f..dbb0cd51818c 100644
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@@ -1,12 +1,13 @@
# Template file for 'kcm-wacomtablet'
pkgname=kcm-wacomtablet
version=3.2.0
-revision=2
+revision=3
build_style=cmake
+configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="pkg-config gettext extra-cmake-modules qt5-qmake qt5-host-tools
- kdoctools kcoreaddons"
+ kdoctools kcoreaddons kpackage"
makedepends="qt5-devel qt5-x11extras-devel qt5-declarative-devel
- plasma-workspace-devel libwacom-devel xf86-input-wacom-devel"
+ plasma-workspace-devel libwacom-devel xf86-input-wacom-devel libinput-devel"
depends="xf86-input-wacom"
short_desc="GUI for the Wacom Linux Drivers"
maintainer="Piraty <mail@piraty.dev>"
@@ -14,3 +15,4 @@ license="GPL-2.0-or-later"
homepage="https://invent.kde.org/system/wacomtablet"
distfiles="${KDE_SITE}/wacomtablet/${version}/wacomtablet-${version}.tar.xz"
checksum=c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
+make_check=no # FIXME
From 4a1a00c02c2e37d83fb92bfb134bc6985886face Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:58 +0700
Subject: [PATCH 182/356] libpinyin: update to 2.8.1.
libpinyin: update to 2.8.1
---
common/shlibs | 4 ++--
srcpkgs/libpinyin/template | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 135087319da4..59444164928b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3588,8 +3588,8 @@ libcaf_io.so.0.18.0 zeek-4.0.0_1
libcaf_openssl.so.0.18.0 zeek-4.0.0_1
libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
-libpinyin.so.13 libpinyin-2.2.1_1
-libzhuyin.so.13 libzhuyin-2.6.0_3
+libpinyin.so.15 libpinyin-2.8.1_1
+libzhuyin.so.15 libzhuyin-2.8.1_1
libuhd.so.4.0.0 uhd-4.0.0.0_1
libeditline.so.1 editline-1.16.0_1
libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 31811cac10f6..db04ef0264e1 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,7 +1,7 @@
# Template file for 'libpinyin'
pkgname=libpinyin
-version=2.6.0
-revision=3
+version=2.8.1
+revision=1
build_style=gnu-configure
configure_args="--enable-libzhuyin"
hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
@@ -14,7 +14,7 @@ homepage="https://github.com/libpinyin/libpinyin"
changelog="https://raw.githubusercontent.com/libpinyin/libpinyin/${version}/ChangeLog"
distfiles="https://github.com/libpinyin/libpinyin/archive/${version}.tar.gz
http://downloads.sourceforge.net/libpinyin/models/model19.text.tar.gz"
-checksum="2b52f617a99567a8ace478ee82ccc62d1761e3d1db2f1e05ba05b416708c35d2
+checksum="42c4f899f71fc26bcc57bb1e2a9309c2733212bb241a0008ba3c9b5ebd951443
56422a4ee5966c2c809dd065692590ee8def934e52edbbe249b8488daaa1f50b"
nocross="Requires data generators compiled against target system"
skip_extraction="model19.text.tar.gz"
@@ -53,7 +53,7 @@ libpinyin-utils_package() {
libpinyin-common-devel_package() {
short_desc="Common files for libpinyin and libzhuyin"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/novel*"
+ vmove "usr/include/libpinyin-${version}/novel*"
}
}
@@ -62,7 +62,7 @@ libpinyin-devel_package() {
libpinyin-common-devel-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/pinyin*"
+ vmove "usr/include/libpinyin-${version}/pinyin*"
vmove usr/lib/pkgconfig/libpinyin.pc
vmove "usr/lib/libpinyin.so"
vmove "usr/lib/libpinyin.a"
@@ -74,7 +74,7 @@ libzhuyin-devel_package() {
libpinyin-devel-${version}_${revision}"
short_desc="${short_desc/PinYin/ZhuYin} - development files"
pkg_install() {
- vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+ vmove "usr/include/libpinyin-${version}/zhuyin*"
vmove usr/lib/pkgconfig/libzhuyin.pc
vmove usr/lib/libzhuyin.a
vmove usr/lib/libzhuyin.so
From bd785e955307f9bc6e3a02a09a43dd0c5961b88c Mon Sep 17 00:00:00 2001
From: LMFuture <2835365572zty@gmail.com>
Date: Fri, 3 Feb 2023 11:04:59 +0700
Subject: [PATCH 183/356] ibus-libpinyin: update to 1.15.0.
ibus-libpinyin: update to 1.15.0
---
srcpkgs/ibus-libpinyin/patches/python-3.11.patch | 12 ------------
srcpkgs/ibus-libpinyin/template | 8 ++++----
2 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/ibus-libpinyin/patches/python-3.11.patch
diff --git a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch b/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
deleted file mode 100644
index 73739950b7f0..000000000000
--- a/srcpkgs/ibus-libpinyin/patches/python-3.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ibus-libpinyin-1.12.0/setup/main2.py
-===================================================================
---- ibus-libpinyin-1.12.0.orig/setup/main2.py
-+++ ibus-libpinyin-1.12.0/setup/main2.py
-@@ -63,7 +63,6 @@ except AttributeError:
- pass
-
- gettext.bindtextdomain(DOMAINNAME, localedir)
--gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8')
-
- gettext.install(DOMAINNAME, localedir)
-
diff --git a/srcpkgs/ibus-libpinyin/template b/srcpkgs/ibus-libpinyin/template
index d2a884fdb6c8..7bd0d73a2b38 100644
--- a/srcpkgs/ibus-libpinyin/template
+++ b/srcpkgs/ibus-libpinyin/template
@@ -1,7 +1,7 @@
# Template file for 'ibus-libpinyin'
pkgname=ibus-libpinyin
-version=1.12.0
-revision=2
+version=1.15.0
+revision=1
build_style=gnu-configure
hostmakedepends="gettext intltool libtool pkg-config autoconf-archive
automake gnome-common which"
@@ -10,8 +10,8 @@ short_desc="Intelligent Pinyin engine using libpinyin for IBus"
maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/libpinyin/ibus-libpinyin"
-distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/${version}.tar.gz"
-checksum=1fe023d3416f1be6284e23fd977cae58e3e5eddbc5582e6e8aa7bb82b3751ddd
+distfiles="https://github.com/libpinyin/ibus-libpinyin/archive/refs/tags/${version}.tar.gz"
+checksum=94ece1a2c0f04a0762228a1a0179d5c6b3d26c150a0d61260123052722c95f17
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 6f45167faf4b9d0b7f493a131664baedaa8a3e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 184/356] fcitx-libpinyin: rebuild for libpinyin-2.8.1
---
srcpkgs/fcitx-libpinyin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx-libpinyin/template b/srcpkgs/fcitx-libpinyin/template
index 5cb3d78d6ca7..1921145d1298 100644
--- a/srcpkgs/fcitx-libpinyin/template
+++ b/srcpkgs/fcitx-libpinyin/template
@@ -2,7 +2,7 @@
pkgname=fcitx-libpinyin
_mversion=20161206
version=0.5.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_QT=OFF"
hostmakedepends="pkg-config fcitx libpinyin gettext"
From d4aea83ae5e1e63186e13b80c93692efca3a7183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 2 Feb 2023 18:41:06 +0700
Subject: [PATCH 185/356] fcitx5-zhuyin: rebuild for libpinyin-2.8.1
---
srcpkgs/fcitx5-zhuyin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
index a5fd46aa614b..eb5695dff280 100644
--- a/srcpkgs/fcitx5-zhuyin/template
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-zhuyin'
pkgname=fcitx5-zhuyin
version=5.0.11
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
From 50cf341b6019426525aca353ef0f188207bb7c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 5 Feb 2023 08:51:13 +0700
Subject: [PATCH 186/356] python3-phx-class-registry: update to 4.0.5.
---
.../patches/test-entrypoint.patch | 13 -------------
srcpkgs/python3-phx-class-registry/template | 10 +++++-----
2 files changed, 5 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
diff --git a/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch b/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
deleted file mode 100644
index 4bfe21c99c1e..000000000000
--- a/srcpkgs/python3-phx-class-registry/patches/test-entrypoint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/phx_class_registry.egg-info/SOURCES.txt
-+++ b/phx_class_registry.egg-info/SOURCES.txt
-@@ -13,9 +13,3 @@ phx_class_registry.egg-info/SOURCES.txt
- phx_class_registry.egg-info/dependency_links.txt
- phx_class_registry.egg-info/requires.txt
- phx_class_registry.egg-info/top_level.txt
--test/__init__.py
--test/auto_register_test.py
--test/cache_test.py
--test/entry_points_test.py
--test/patcher_test.py
--test/registry_test.py
-\ No newline at end of file
diff --git a/srcpkgs/python3-phx-class-registry/template b/srcpkgs/python3-phx-class-registry/template
index e45d5060f6be..de6dffb4f2ac 100644
--- a/srcpkgs/python3-phx-class-registry/template
+++ b/srcpkgs/python3-phx-class-registry/template
@@ -1,17 +1,17 @@
# Template file for 'python3-phx-class-registry'
pkgname=python3-phx-class-registry
-version=3.0.5
-revision=2
+version=4.0.5
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
depends="python3"
checkdepends="python3-pytest"
short_desc="Registry pattern for Python classes"
-maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://class-registry.readthedocs.io/"
-distfiles="${PYPI_SITE}/p/phx-class-registry/phx-class-registry-3.0.5.tar.gz"
-checksum=f11462ac410a8cda38c2b6a83b51a2390c7d9528baef591cb5b551b11aba2a92
+distfiles="${PYPI_SITE}/p/phx-class-registry/phx-class-registry-${version}.tar.gz"
+checksum=1901bdaea34d9cfefa4d149b2f20217e7e024492f7e247797e7c4d36d96cdb5b
post_extract() {
# Requires dummy_package.egg-info
From 453a0519f0eebf5f3e10be68371893b7cecba464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 30 Jan 2023 22:55:37 -0500
Subject: [PATCH 187/356] python3-shapely: update to 2.0.1.
---
srcpkgs/python3-shapely/template | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index d9dabb1e066f..02447337f9ae 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,31 +1,36 @@
# Template file for 'python3-shapely'
pkgname=python3-shapely
-version=1.8.5.post1
+version=2.0.1
revision=1
build_style=python3-module
build_helper=numpy
-make_check_target=tests
hostmakedepends="python3-setuptools python3-Cython geos"
makedepends="python3-devel python3-numpy geos-devel"
depends="python3"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest-xdist"
short_desc="Library for manipulation and analysis of geometric objects for Python3"
maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/shapely/shapely"
distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
-checksum=51badb76fa13ce1d4d6e5b2cbfef2b6af0ddae56a4449b84c3f3e6f404c6b43c
+checksum=6250e79ca299222a239ce44df613d228f1216c5cc31351217bf377b03d7be4e0
pre_configure() {
if [ "$CROSS_BUILD" ]; then
- sed "
- /^prefix=/s,=.*,=$XBPS_CROSS_BASE/usr,
- s,echo [\$]{prefix}$,echo /usr,
- " $XBPS_CROSS_BASE/usr/bin/geos-config >$XBPS_WRAPPERDIR/geos-config
- chmod +x $XBPS_WRAPPERDIR/geos-config
+ local _wrapper="${XBPS_WRAPPERDIR}/geos-config"
+
+ sed -e 's,echo [$]{prefix}$,echo /usr,' \
+ -e "/^prefix=/s,=.*,=\"${XBPS_CROSS_BASE}/usr\"," \
+ "${XBPS_CROSS_BASE}/usr/bin/geos-config" > "${_wrapper}"
+ chmod +x "${_wrapper}"
fi
}
+do_check() {
+ cd build/lib*
+ PYTHONPATH="${PWD}" python3 -m pytest -n "${XBPS_MAKEJOBS}" shapely/tests
+}
+
post_install() {
vlicense LICENSE.txt LICENSE
}
From 2d6773c84d2a92821b8d92e1ed355e678bcfed33 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 10:47:26 -0500
Subject: [PATCH 188/356] squid: update to 5.7
* --sbindir is already defined in
common/environment/configure/gnu-configure-args.sh
* --enable-useragent-log and --enable-referer-log are obsolete since
version 3.2.0.4.
* --enable-arp-acl is gone
(squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).
* --enable-carp is gone, CARP is compiled in
(squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).
* --enable-truncate was removed upstream
(squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).
* squid_cv_gnu_atomics is replaced with c++11 std::atomic
(squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).
* squid_opt_enable_large_files is the duplicate of --with-large-files.
Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
cross build for arm* and glibc. Now that squid builds completely fine
without it, it is safe to assume this option is not needed anymore.
* define BUILDCXX properly (CXX_host cannot be set outside of
functions).
* CVE-2018-1000027 was fixed since version 4.0.23.
---
srcpkgs/squid/template | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 626972525bc0..49b9eb9d7b91 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,10 +1,9 @@
# Template file for 'squid'
pkgname=squid
-version=5.3
+version=5.7
revision=1
build_style=gnu-configure
configure_args="
- --sbindir=/usr/bin
--sysconfdir=/etc/squid
--libexecdir=/usr/libexec/squid
--datadir=/usr/share/squid
@@ -26,28 +25,18 @@ configure_args="
--enable-icmp
--enable-linux-netfilter
--enable-ident-lookups
- --enable-useragent-log
--enable-cache-digests
- --enable-referer-log
- --enable-arp-acl
--enable-htcp
- --enable-carp
--enable-epoll
--with-large-files
- --enable-arp-acl
--with-default-user=squid
--enable-async-io
- --enable-truncate
--enable-icap-client
--enable-ssl-crtd
--disable-arch-native
--disable-strict-error-checking
--enable-wccpv2
- --with-build-environment=default
- squid_cv_gnu_atomics=yes
- squid_opt_enable_large_files=yes
- BUILDCXX=${CXX_host}
- BUILDCXXFLAGS=-O2"
+ --with-build-environment=default"
conf_files="/etc/squid/squid.conf
/etc/squid/errorpage.css
/etc/squid/cachemgr.conf
@@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
homepage="http://www.squid-cache.org/"
changelog="http://www.squid-cache.org/Versions/v5/changesets/"
distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
-checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
+checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
system_accounts="squid"
# squid-conf-tests requires a squid user in the system
make_check=no
@@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS+=" -latomic"
fi
+pre_configure() {
+ export BUILDCXX="${CXX_host}"
+ export BUILDCXXFLAGS="-O2"
+}
+
post_install() {
chmod u+s \
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
@@ -82,7 +76,4 @@ post_install() {
${DESTDIR}/usr/libexec/squid/pinger
vsv squid
vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
-
- # CVE-2018-1000027
- echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
}
From 0a056c945fa8b377f089662a3735fba2d178ecd2 Mon Sep 17 00:00:00 2001
From: Alan Barros de Oliveira <deoliveira.alan@outlook.com>
Date: Sun, 5 Feb 2023 01:21:23 -0300
Subject: [PATCH 189/356] python3-paramiko: add missing dependency
---
srcpkgs/python3-paramiko/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template
index 49932af0b3dd..debd2acdd6fa 100644
--- a/srcpkgs/python3-paramiko/template
+++ b/srcpkgs/python3-paramiko/template
@@ -1,10 +1,11 @@
# Template file for 'python3-paramiko'
pkgname=python3-paramiko
version=2.11.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl"
+depends="python3-cryptography python3-pyasn1 python3-bcrypt python3-pynacl
+ python3-six"
short_desc="Python3 SSH2 protocol library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 7628570e6eccb35c7d2659987591d070321ce0d5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 4 Feb 2023 11:09:09 +0530
Subject: [PATCH 190/356] difftastic: update to 0.43.1.
---
srcpkgs/difftastic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template
index 7ad70a4ffcc8..1a6aba33cf40 100644
--- a/srcpkgs/difftastic/template
+++ b/srcpkgs/difftastic/template
@@ -1,6 +1,6 @@
# Template file for 'difftastic'
pkgname=difftastic
-version=0.42.0
+version=0.43.1
revision=1
build_style=cargo
short_desc="Structural diff tool that understands syntax"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://difftastic.wilfred.me.uk"
changelog="https://raw.githubusercontent.com/Wilfred/difftastic/master/CHANGELOG.md"
distfiles="https://static.crates.io/crates/difftastic/difftastic-${version}.crate"
-checksum=6a8ac20b608fd771b1caa3795280b2b09e0d2edbd0c00b11b9e10e96dffb1f38
+checksum=35c3fad5d6442e9514779dc140d998edf76bd808ca3b5d3b9db2e0c41b834a58
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 7ff2efb257e5423dee3a3d22de04913f7ccca5e5 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 3 Feb 2023 15:39:47 +0530
Subject: [PATCH 191/356] cronutils: update to 1.10.
Fix update reporting.
---
srcpkgs/cronutils/template | 9 +++++----
srcpkgs/cronutils/update | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/cronutils/template b/srcpkgs/cronutils/template
index 03728d0f93d7..e5e3c7a93c33 100644
--- a/srcpkgs/cronutils/template
+++ b/srcpkgs/cronutils/template
@@ -1,14 +1,15 @@
# Template file for 'cronutils'
pkgname=cronutils
-version=1.9
-revision=3
+version=1.10
+revision=1
build_style=gnu-makefile
short_desc="Set of tools to assist the reliable running periodic and batch jobs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/google/cronutils"
-distfiles="https://github.com/google/${pkgname}/archive/version/${version}.tar.gz"
-checksum=0109f165b193d3482ebf470e5d19fcef13bb692b173f65c966b0b8b8ebc79238
+changelog="https://github.com/google/cronutils/releases"
+distfiles="https://github.com/google/cronutils/archive/refs/tags/version/${version}.tar.gz"
+checksum=56638170e5a41c71e9992bc0c01b69333dd4af72ea9f8f79d8b863f771b93628
post_install() {
vbin runcron
diff --git a/srcpkgs/cronutils/update b/srcpkgs/cronutils/update
index f1c5f576fb48..ccb0dc04e003 100644
--- a/srcpkgs/cronutils/update
+++ b/srcpkgs/cronutils/update
@@ -1,2 +1 @@
-site=https://github.com/google/cronutils/releases
-pkgname=version/
+pattern="/archive/refs/tags/version/\K[\d.]+(?=\.tar\.gz)"
From 7b359fe886872688d961cbbe92b21541f515c58c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 30 Jan 2023 00:56:22 +0530
Subject: [PATCH 192/356] xmldiff: update to 2.5.
---
srcpkgs/xmldiff/template | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template
index 2185fd18fffb..8fe8aae7a159 100644
--- a/srcpkgs/xmldiff/template
+++ b/srcpkgs/xmldiff/template
@@ -1,21 +1,26 @@
# Template file for 'xmldiff'
pkgname=xmldiff
-version=2.4
-revision=5
+version=2.5
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-lxml python3-six python3-setuptools"
+depends="python3-lxml python3-setuptools"
+checkdepends="${depends} python3-pytest"
short_desc="Python3 classes to diff XML files"
maintainer="prspkt <prspkt@protonmail.com>"
-license="LGPL-3.0-or-later"
+license="MIT"
homepage="https://github.com/Shoobx/xmldiff"
changelog="https://raw.githubusercontent.com/Shoobx/xmldiff/master/CHANGES.rst"
distfiles="${PYPI_SITE}/x/xmldiff/xmldiff-${version}.tar.gz"
-checksum=05bea20ce1f2c9678683bcce0c3ba9981f87d92b709d190e018bcbf047eccf63
+checksum=6c5f30bc65ce6e81d9a70a3cb0269f7ba61852fd6caa7a0fbfc0edf33b3cb717
conflicts="python-xmldiff>=0"
-post_patch() {
- rm -f xmldiff/_diff_match_patch_py2.py
+post_extract() {
+ rm xmldiff/_diff_match_patch_py2.py
+}
+
+post_install() {
+ vlicense LICENSE.txt
}
python3-xmldiff_package() {
From ba484c1c5a38acb6c10d9efdd123c8c79e6dc9e1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 5 Feb 2023 10:46:05 +0100
Subject: [PATCH 193/356] wine: update to 8.1.
---
srcpkgs/wine/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index faacc1188391..fe0ea89be4e2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=8.0
+version=8.1
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -11,10 +11,10 @@ short_desc="Run Microsoft Windows applications"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
-distfiles="https://dl.winehq.org/wine/source/${version}/wine-${_pkgver}.tar.xz
+distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e
- 9b0ba0be13ba2e77bc9a9d8c9160f3580e538d9eb788b52d176222349d9869cd"
+checksum="4120ee6b3f294d97aaf2c73034cf1c2cbf13a195c94c5c74a646a81f92412598
+ b2c50878e48cd69d5cd1e4cbf5f19d4af10a56db42932aacb8f6316a25c639af"
build_options="mingw staging xshm"
build_options_default="mingw xshm"
From 5de792273f9e6edac60c35a9b58612cdfe914221 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 12:29:03 +0530
Subject: [PATCH 194/356] exfatprogs: update to 1.2.0.
---
srcpkgs/exfatprogs/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/exfatprogs/template b/srcpkgs/exfatprogs/template
index 1003630ebfa5..6277c079ba50 100644
--- a/srcpkgs/exfatprogs/template
+++ b/srcpkgs/exfatprogs/template
@@ -1,18 +1,18 @@
# Template file for 'exfatprogs'
pkgname=exfatprogs
-version=1.1.3
-revision=3
+version=1.2.0
+revision=1
build_style=gnu-configure
short_desc="Tools to create, check and label exFAT filesystems"
maintainer="k4leg <python.bogdan@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/exfatprogs/exfatprogs"
-distfiles="https://github.com/exfatprogs/exfatprogs/archive/${version}.tar.gz"
+changelog="https://raw.githubusercontent.com/exfatprogs/exfatprogs/master/NEWS"
distfiles="https://github.com/exfatprogs/exfatprogs/releases/download/${version}/exfatprogs-${version}.tar.xz"
-checksum=3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809
+checksum=56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742
conflicts="exfat-utils"
replaces="exfat-utils>=0"
post_install() {
- vdoc NEWS
+ vdoc README.md
}
From a11f9da1e395e825583c4297a58d506384dbce5a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 30 Jan 2023 09:21:24 +0100
Subject: [PATCH 195/356] miniflux: update to 2.0.42.
---
srcpkgs/miniflux/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index f49cbd1788ac..308e2974e03b 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
# Template file for 'miniflux'
pkgname=miniflux
-version=2.0.41
+version=2.0.42
revision=1
build_style=go
go_import_path="miniflux.app"
@@ -11,7 +11,7 @@ license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/v2/main/ChangeLog"
distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=01e150ebfba12c8b5ca7c1d9d5a5976d018081cafc11228d6f77a48ac3333e1b
+checksum=f050b2bc9839dd485047b9d7820dbb669668fd13135aa8b49dc0ad304e509fd5
system_accounts="_miniflux"
post_install() {
From 035197d1a9e5100708c9628181465f62849be38f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 2 Feb 2023 11:28:33 +0100
Subject: [PATCH 196/356] syncthing-gtk: update debian version
---
srcpkgs/syncthing-gtk/patches/python-3.11.patch | 12 ------------
srcpkgs/syncthing-gtk/template | 6 +++---
2 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 srcpkgs/syncthing-gtk/patches/python-3.11.patch
diff --git a/srcpkgs/syncthing-gtk/patches/python-3.11.patch b/srcpkgs/syncthing-gtk/patches/python-3.11.patch
deleted file mode 100644
index 40cfe2bf509b..000000000000
--- a/srcpkgs/syncthing-gtk/patches/python-3.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: syncthing-gtk-0.9.4.4/syncthing_gtk/tools.py
-===================================================================
---- syncthing-gtk-0.9.4.4.orig/syncthing_gtk/tools.py
-+++ syncthing-gtk-0.9.4.4/syncthing_gtk/tools.py
-@@ -259,7 +259,6 @@ def init_locale(localedir=None):
- global _localedir
- _localedir = localedir
- gettext.bindtextdomain(GETTEXT_DOMAIN, localedir)
-- gettext.bind_textdomain_codeset(GETTEXT_DOMAIN, "utf-8")
- gettext.textdomain(GETTEXT_DOMAIN)
-
- def get_locale_dir():
diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template
index a4f98a341321..9d8805f38472 100644
--- a/srcpkgs/syncthing-gtk/template
+++ b/srcpkgs/syncthing-gtk/template
@@ -2,8 +2,8 @@
pkgname=syncthing-gtk
reverts="0.14.36_1 0.9.4.4+ds+git20220108+9023143f8b93_1 0.9.4.4+ds+git20220108+9023143f8b93_2"
version=0.9.4.4
-revision=6
-_debianver="ds+git20220108+9023143f8b93"
+revision=7
+_debianver="ds+git20221205+12a9702d29ab"
build_style=python3-module
hostmakedepends="python3-setuptools gettext"
depends="syncthing python3-dateutil libnotify librsvg python3-bcrypt
@@ -14,7 +14,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
license="GPL-2.0-or-later"
homepage="https://salsa.debian.org/debian/syncthing-gtk/"
distfiles="${DEBIAN_SITE}/main/s/syncthing-gtk/syncthing-gtk_${version}+${_debianver}.orig.tar.xz"
-checksum=fc71f390a17b10ea9338a60f7ae813a6d6faa7e881b4b31ff7ea4ffdbbecf7a8
+checksum=1ed5cb11658e496f400630e802dc62c09e25ddd1987e6e458cb63910d1440905
# for checks
# v0.9.4.4-ds-git20220108-9023143f8b93 is an invalid version and will not be supported in a future release
From 0d700aa525f803f0ba2f79d7472b51034e24efa6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 5 Feb 2023 09:53:30 +0100
Subject: [PATCH 197/356] htop: update to 3.2.2.
---
srcpkgs/htop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index be58424c0fcc..54b9a69a6ec7 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,6 +1,6 @@
# Template file for 'htop'
pkgname=htop
-version=3.2.1
+version=3.2.2
revision=1
build_style=gnu-configure
configure_args="--enable-unicode --enable-sensors"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
homepage="https://htop.dev/"
changelog="https://raw.githubusercontent.com/htop-dev/htop/main/ChangeLog"
distfiles="https://github.com/htop-dev/htop/releases/download/${version}/htop-${version}.tar.xz"
-checksum=5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb
+checksum=bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8
From 62c6fa5aa8e39a9158d439542381e871c7cb4d02 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Thu, 2 Feb 2023 11:34:01 +0100
Subject: [PATCH 198/356] yq-go: update to 4.30.8.
---
srcpkgs/yq-go/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index dfbc98eef5ff..7334fb9469ae 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,6 +1,6 @@
# Template file for 'yq-go'
pkgname=yq-go
-version=4.30.7
+version=4.30.8
revision=1
build_style=go
go_import_path=github.com/mikefarah/yq/v4
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/mikefarah/yq"
changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
distfiles="https://github.com/mikefarah/yq/archive/refs/tags/v${version}.tar.gz"
-checksum=84dff2f03ae34b84032a36e381440b78684a9eb5cf849789878da78e94fcd679
+checksum=aaf6c9f37968970413b8a6daf0b313a86efd1b8e3e5959e527b50636508eb776
do_check() {
go test -v
From 8cb28dd93d35c7d53f8d16e68e1993f346f320fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 13:20:58 +0100
Subject: [PATCH 199/356] ansible-core: update to 2.14.2.
---
srcpkgs/ansible-core/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 7ef4abca11c1..79bbba396edc 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
# Template file for 'ansible-core'
pkgname=ansible-core
-version=2.14.1
+version=2.14.2
revision=1
hostmakedepends="python3-setuptools python3-wheel python3-packaging
python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
-checksum=589257f2560fffd5d4465352cd4504e2cbfc418ba49e0c4265cd54e16070c938
+checksum=47f0d4b4125b58edba6435a47f37cbe6a18da54594d18f812958bb0cb58d4e65
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"
From b88209cc40815253877c9c44a3d3683602e20565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 13:21:01 +0100
Subject: [PATCH 200/356] ansible: update to 7.2.0.
---
srcpkgs/ansible/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 80012a517c30..b201ce5ed090 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
# Template file for 'ansible'
pkgname=ansible
-version=7.1.0
+version=7.2.0
revision=1
build_style="python3-pep517"
hostmakedepends="python3-setuptools python3-wheel"
@@ -10,6 +10,6 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=1e47238c4aa9e68c0c5367a3fd707ba6c3949b4aaf912b06440ad78dd2bf018d
+checksum=60e2c1a58f1ceb34a190b7c380f7b3386d1e7369061954b1f8b8ca3df76063cc
# Relevant tests happen in ansible-core
make_check=no
From 8efd71a0c1185e832436d67533c26b2cb06f5bdf Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 30 Jan 2023 10:34:06 -0500
Subject: [PATCH 201/356] upx: update to 4.0.2
---
srcpkgs/upx/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template
index 5fd94feb9d32..6510dce77bef 100644
--- a/srcpkgs/upx/template
+++ b/srcpkgs/upx/template
@@ -1,6 +1,6 @@
# Template file for 'upx'
pkgname=upx
-version=4.0.1
+version=4.0.2
revision=1
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=Release"
@@ -10,6 +10,6 @@ short_desc="Ultimate Packer for eXecutables"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://upx.github.io/"
-changelog="https://raw.githubusercontent.com/upx/upx/devel/NEWS"
+changelog="https://raw.githubusercontent.com/upx/upx/master/NEWS"
distfiles="https://github.com/upx/upx/releases/download/v${version}/upx-${version}-src.tar.xz"
-checksum=77003c8e2e29aa9804e2fbaeb30f055903420b3e01d95eafe01aed957fb7e190
+checksum=1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f
From b695c01c07deaeeb9926ab705086cfab95b8b799 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 31 Jan 2023 19:18:11 -0500
Subject: [PATCH 202/356] texlab: update to 5.2.0
---
srcpkgs/texlab/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 4f844d6cb0b3..87569a0a2843 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
# Template file for 'texlab'
pkgname=texlab
-version=5.1.0
+version=5.2.0
revision=1
build_style=cargo
short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
homepage="https://texlab.netlify.app/"
changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
distfiles="https://github.com/latex-lsp/texlab/archive/refs/tags/v${version}.tar.gz"
-checksum=e327c78e079dc94290b34065cde92510f02db3f012aedcba4eb882bfc815cf55
+checksum=e23bff5b39d8605a2e1b789e25015332a5777cfb53b3d24535ceef0034437929
if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
broken="smartstring fails to compile"
From 1f7e68deb2412f5be8d5d15c204096a5a29f69ad Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 4 Feb 2023 22:10:20 -0500
Subject: [PATCH 203/356] jdupes: update to 1.21.1
---
srcpkgs/jdupes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 102b2db97df8..873b07da8a6f 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.21.0
+version=1.21.1
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=13e56c608354f10f9314c99cf37b034dde14e6bf4a9303c77391323e2ef4f549
+checksum=22de88d1963f70c8ed4d0aa40abe05b48aaa4cc08eed6a2c6c9747010f9f4eb7
CFLAGS="-DENABLE_DEDUPE"
From 29c3325cb8da565e06cb3b659425b41abf03b452 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 4 Feb 2023 22:14:56 -0500
Subject: [PATCH 204/356] procs: update to 0.13.4
---
srcpkgs/procs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 90dc2cd982c0..0713f2ac1c9b 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
# Template file for 'procs'
pkgname=procs
-version=0.13.3
+version=0.13.4
revision=1
build_style=cargo
build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/dalance/procs"
changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=aa93a588504dcc74df699d8a3bc2a27d3da94a772106a42d3d862a5fd17725c3
+checksum=9b9b59b79049cf6ae2c39d9cc5b0c5af81411ba898a414fda41f68921c3c9539
post_build() {
PROCS="target/${RUST_TARGET}/release/procs"
From 148de8f06869a44cfce755a0dded3a738cecfc68 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 22 Jan 2023 15:39:25 +0100
Subject: [PATCH 205/356] cocogitto: update to 5.3.1
---
srcpkgs/cocogitto/template | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index bf1d15be5b14..dbed47399d80 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,7 +1,7 @@
# Template file for 'cocogitto'
pkgname=cocogitto
-version=5.2.0
-revision=2
+version=5.3.1
+revision=1
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config"
@@ -13,17 +13,25 @@ license="MIT"
homepage="https://github.com/cocogitto/cocogitto"
changelog="https://raw.githubusercontent.com/cocogitto/cocogitto/main/CHANGELOG.md"
distfiles="https://github.com/cocogitto/cocogitto/archive/refs/tags/${version}.tar.gz"
-checksum=99f9dee05597d7721f6d046dbfefba5cb8d1c4ae22ced415f724affb3a6bd0cc
+checksum=ac6847ce55ba284184d0792afb53c6579da415600bc1b01c180dd87ad34597d0
# Test suite is not atomic, relies on user environment such as git user configuration
make_check=no
post_install() {
- COG="${DESTDIR}/usr/bin/cog"
+ local cog="${DESTDIR}/usr/bin/cog"
for shell in bash zsh fish; do
- vtargetrun ${COG} generate-completions ${shell} > cog.${shell}
+ vtargetrun ${cog} generate-completions ${shell} > cog.${shell}
vcompletion cog.${shell} ${shell} cog
done
+ vtargetrun ${cog} generate-manpage cog > cog.1
+ vman cog.1
+
+ for subcommand in bump changelog check commit edit init install-hook log verify; do
+ vtargetrun ${cog} generate-manpage ${subcommand} > cog-${subcommand}.1
+ vman cog-${subcommand}.1
+ done
+
vdoc README.md
vlicense LICENSE
}
From 0010d1a135a387a451430ee6a0a1ce242f134d40 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 22:27:20 +0530
Subject: [PATCH 206/356] swayimg: update to 1.10, orphan
---
.../patches/0001-fix-zsh-completion.patch | 23 -----------------
srcpkgs/swayimg/patches/0002-fix-help.patch | 25 -------------------
srcpkgs/swayimg/template | 6 ++---
3 files changed, 3 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
delete mode 100644 srcpkgs/swayimg/patches/0002-fix-help.patch
diff --git a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch b/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
deleted file mode 100644
index b9360242ee42..000000000000
--- a/srcpkgs/swayimg/patches/0001-fix-zsh-completion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e938dc5b04bb54dd3f3a89a71d46c7a53ac087bd Mon Sep 17 00:00:00 2001
-From: Leon <adigitoleo@dissimulo.com>
-Date: Wed, 31 Aug 2022 23:07:23 +1000
-Subject: [PATCH] Fix typo in zsh completion
-
-Signed-off-by: Leon <adigitoleo@dissimulo.com>
----
- extra/zsh.completion | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/extra/zsh.completion b/extra/zsh.completion
-index a690528..32b159b 100644
---- a/extra/zsh.completion
-+++ b/extra/zsh.completion
-@@ -8,7 +8,7 @@ _arguments \
- '(-r --recursive)'{-r,--recursive}'[read directories recursively]' \
- '(-a --all)'{-a,--all}'[open all files from the same directory]' \
- '(-m --mark)'{-m,--mark}'[enable marking mode]' \
-- '(-l --slideshow)'{-l --slideshow}'[activate slideshow mode on startup]' \
-+ '(-l --slideshow)'{-l,--slideshow}'[activate slideshow mode on startup]' \
- '(-f --fullscreen)'{-f,--fullscreen}'[show image in full screen mode]' \
- '(-s --scale=SCALE)'{-s,--scale=}'[set initial image scale]:scale:(optimal fit real)' \
- '(-b --background)'{-b,--background=}'[set image background color]:bkg:(none grid)' \
diff --git a/srcpkgs/swayimg/patches/0002-fix-help.patch b/srcpkgs/swayimg/patches/0002-fix-help.patch
deleted file mode 100644
index b735d938d1ad..000000000000
--- a/srcpkgs/swayimg/patches/0002-fix-help.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1cbbe5e6e0cc3f7fb26055e952153c3a23bfad45 Mon Sep 17 00:00:00 2001
-From: Artem Senichev <artemsen@gmail.com>
-Date: Sat, 17 Sep 2022 11:57:10 +0300
-Subject: [PATCH] Allow long option `--help`
-
-Fix error when `--help` is not accepted by getopt.
-
-Signed-off-by: Artem Senichev <artemsen@gmail.com>
----
- src/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main.c b/src/main.c
-index 3939ccb..4eecd12 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -93,7 +93,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg)
- }
- // add terminations
- *short_opts_ptr = 0;
-- memset(&options[(sizeof(arguments) / sizeof(arguments[0])) - 1], 0,
-+ memset(&options[(sizeof(arguments) / sizeof(arguments[0]))], 0,
- sizeof(struct option));
-
- // parse arguments
diff --git a/srcpkgs/swayimg/template b/srcpkgs/swayimg/template
index bfdc3a496d21..073ba379db14 100644
--- a/srcpkgs/swayimg/template
+++ b/srcpkgs/swayimg/template
@@ -1,6 +1,6 @@
# Template file for 'swayimg'
pkgname=swayimg
-version=1.9
+version=1.10
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel"
@@ -8,11 +8,11 @@ makedepends="wayland-devel cairo-devel json-c-devel libxkbcommon-devel
wayland-protocols libheif-devel giflib-devel libjpeg-turbo-devel
libpng-devel librsvg-devel libwebp-devel libexif-devel"
short_desc="Image viewer for Sway/Wayland"
-maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+maintainer="Orphan <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/artemsen/swayimg"
distfiles="https://github.com/artemsen/swayimg/archive/v${version}.tar.gz"
-checksum=693a23a7755ebedb144271b2b674980a1c51a2036dabcff9697c3e3c6258f108
+checksum=fa20e9d5e260ca45ca3fb83343a6c7e7c93bcdb1184a99b19b630aec598f4b17
post_install() {
vcompletion extra/bash.completion bash
From 69d4380a098b6418f600a20a95a86cb967e56f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 4 Feb 2023 12:59:41 +0100
Subject: [PATCH 207/356] openpgp-ca: update to 0.12.0.
---
srcpkgs/openpgp-ca/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
index ca62b5987975..8ed3249de058 100644
--- a/srcpkgs/openpgp-ca/template
+++ b/srcpkgs/openpgp-ca/template
@@ -1,16 +1,16 @@
# Template file for 'openpgp-ca'
pkgname=openpgp-ca
-version=0.11.2
+version=0.12.0
revision=1
build_style=cargo
make_install_args="--path openpgp-ca-bin"
hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"
-makedepends="openssl-devel nettle-devel clang sqlite-devel"
+makedepends="openssl-devel nettle-devel clang sqlite-devel pcsclite-devel"
depends="gnupg"
short_desc="Tool for handling OpenPGP keys in organizaations"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-or-later"
homepage="https://openpgp-ca.org/"
distfiles="https://gitlab.com/openpgp-ca/openpgp-ca/-/archive/openpgp-ca/v${version}/openpgp-ca-openpgp-ca-v${version}.tar.gz"
-checksum=162f60cdb937a9db897f699a35266da00adeb14c42a21f806d13bfbed03f921e
+checksum=9f62ccb10627950645b8183a0ff92a1781ac47c3e2130aac403fccd4a703d2a0
make_check=no # Tests require gpg-agent being set up
From 30b5512109e9354d92c32394ab9e12369157bf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 1 Feb 2023 16:25:33 +0100
Subject: [PATCH 208/356] fotoxx: update to 23.1.
---
srcpkgs/fotoxx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index a1a92a46a2c0..c8fcc65a7498 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,6 +1,6 @@
# Template file for 'fotoxx'
pkgname=fotoxx
-version=23.0
+version=23.1
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
changelog="https://www.kornelix.net/downloads/recent_changes.txt"
distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=7629edde4053ea6ebb815e84f5717e32982ad2c2ef0d00412c9719294f5122d7
+checksum=2043daedac89d5826699ff2833e6e697caad707ae174bebb9470e21b692312c1
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
From 5152427de839580dd2bbda3bef68437e4219ca20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Feb 2023 13:49:36 +0100
Subject: [PATCH 209/356] arti: update to 1.1.1.
---
srcpkgs/arti/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index bfb6e1a496d1..098e7e01ce3e 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,10 +1,9 @@
# Template file for 'arti'
pkgname=arti
-version=1.1.0
+version=1.1.1
revision=1
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
-make_check_args="-- --skip internal::test::internal_macro_test" # fails with --release builds
make_install_args="--path crates/arti"
hostmakedepends="pkg-config"
makedepends="openssl-devel sqlite-devel"
@@ -14,7 +13,7 @@ license="Apache-2.0, MIT"
homepage="https://gitlab.torproject.org/tpo/core/arti"
changelog="https://gitlab.torproject.org/tpo/core/arti/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v${version}/arti-arti-v${version}.tar.gz"
-checksum=68b8b391478b745d4bba50034d5122e2c7b90e0e221f52ba83c078901c83e55a
+checksum=f937858b0eae9220a44895306e859df4ad0098eac515cca299352c62311ac90f
if [ "$XBPS_CHECK_PKGS" ]; then
case "$XBPS_TARGET_MACHINE" in
From 5b8df533e17e0fae21d48913ebb53ccb7b4b4d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 2 Feb 2023 09:40:45 +0100
Subject: [PATCH 210/356] bfs: update to 2.6.3.
---
srcpkgs/bfs/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index caeb3fd17197..855f116d5930 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,6 +1,6 @@
# Template file for 'bfs'
pkgname=bfs
-version=2.6.2
+version=2.6.3
revision=1
build_style=gnu-makefile
makedepends="acl-devel libcap-devel oniguruma-devel"
@@ -11,11 +11,7 @@ license="0BSD"
homepage="https://github.com/tavianator/bfs"
changelog="https://raw.githubusercontent.com/tavianator/bfs/main/docs/CHANGELOG.md"
distfiles="https://github.com/tavianator/bfs/archive/${version}.tar.gz"
-checksum=1d50f7fdeda2bafd3ce6e4eacbe88de43f3ec14fb904aa8f81641aefba465afe
-
-# temporary workaround for failing CI tests
-# https://github.com/void-linux/void-packages/pull/40090#issuecomment-1287842827
-export BFS_TRIED_DROP=""
+checksum=b88b7d8f8c5f701209fd2967546ad154c405281749ad458bc116b40da14b98f6
post_install() {
vlicense LICENSE
From 98cdad9d880c2fb34e871c461d0fdcfbeb2134c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 28 Jan 2023 19:30:13 +0100
Subject: [PATCH 211/356] mpv: update to 0.35.1.
---
srcpkgs/mpv/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 5dcef38aa241..0a56d037e194 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
# Template file for 'mpv'
pkgname=mpv
-version=0.35.0
-revision=2
+version=0.35.1
+revision=1
build_style=meson
configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
-Dlibmpv=true -Dcplugins=enabled
@@ -40,8 +40,8 @@ maintainer="travankor <travankor@tuta.io>"
license="GPL-2.0-or-later"
homepage="https://mpv.io"
changelog="https://github.com/mpv-player/mpv/releases"
-distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00
+distfiles="https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"
+checksum=41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -62,6 +62,6 @@ mpv-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/*.so
+ vmove "usr/lib/*.so"
}
}
From 4f5549677226b3f4b4d5fec835d9c3b1767cf614 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Mon, 30 Jan 2023 23:04:28 -0600
Subject: [PATCH 212/356] nano: update to 7.2.
---
srcpkgs/nano/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 217238565dd8..f87a38ca56fa 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
# Template file for 'nano'
pkgname=nano
-version=7.1
+version=7.2
revision=1
build_style=gnu-configure
configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
homepage="https://www.nano-editor.org/"
changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836
+checksum=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526
post_install() {
vsconf doc/sample.nanorc
From 8e163fa73865c49b92ded564a181d95f0f6acf45 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 26 Jan 2023 13:41:27 -0500
Subject: [PATCH 213/356] vanitygen: remove package
no distfiles available
---
srcpkgs/removed-packages/template | 3 +-
...4a646873c8439d3b5ee3a2278e727575521f.patch | 1171 -----------------
...3e6fff7da52c4aecbd898d9df2e60a56f134.patch | 98 --
srcpkgs/vanitygen/template | 21 -
4 files changed, 2 insertions(+), 1291 deletions(-)
delete mode 100644 srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
delete mode 100644 srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
delete mode 100644 srcpkgs/vanitygen/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 8528ac460a0b..ef781a412eb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20230129
+version=0.1.20230130
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -511,6 +511,7 @@ replaces="
urlmatch-git<=20141116_2
uwsgi-python<=2.0.18_3
v8<=3.24.35.33_4
+ vanitygen<=1.53_2
vapoursynth-mvtools<=23_2
vkd3d<=1.3_1
volnoti<=0.1_1
diff --git a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch b/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
deleted file mode 100644
index 74bd54dbf0fb..000000000000
--- a/srcpkgs/vanitygen/patches/4b814a646873c8439d3b5ee3a2278e727575521f.patch
+++ /dev/null
@@ -1,1171 +0,0 @@
-From 4b814a646873c8439d3b5ee3a2278e727575521f Mon Sep 17 00:00:00 2001
-From: Antonio Spadaro <ilovelinux@users.noreply.github.com>
-Date: Sat, 2 Jun 2018 22:27:51 +0000
-Subject: [PATCH] Fix OpenSSL 1.1.0 incompatibilities (#56)
-
-* Fix openssl 1.1.0 incompatibilities
-
-* Replace BN_MASK2 with 0xffffffffL
-
-* Fix other openssl 1.1.0 incompatibilities
-
-* Fix retrocompatibility issue
-
-* Remove BN_bn2lebinpad due to incompatibility
-
-* Fix other incompatibility errors
-
-* Fixed retrocompatibility (maybe). Thanks to @DesWurstes
-
-* Fix OpenSSL 1.1 and backwards compatibility
----
- keyconv.c | 18 ++--
- oclengine.c | 130 ++++++++++++++++++---------
- pattern.c | 252 ++++++++++++++++++++++++++--------------------------
- pattern.h | 8 +-
- util.c | 90 +++++++++----------
- vanitygen.c | 14 +--
- 6 files changed, 277 insertions(+), 235 deletions(-)
-
-diff --git a/keyconv.c b/keyconv.c
-index f7475e5..394c3a0 100644
---- a/keyconv.c
-+++ b/keyconv.c
-@@ -1160,7 +1160,7 @@ main(int argc, char **argv)
-
- if (key2_in) {
- BN_CTX *bnctx;
-- BIGNUM bntmp, bntmp2;
-+ BIGNUM *bntmp, *bntmp2;
- EC_KEY *pkey2;
-
- pkey2 = EC_KEY_new_by_curve_name(NID_secp256k1);
-@@ -1182,19 +1182,19 @@ main(int argc, char **argv)
- compressed = 1;
- }
-
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
- bnctx = BN_CTX_new();
-- EC_GROUP_get_order(EC_KEY_get0_group(pkey), &bntmp2, NULL);
-- BN_mod_add(&bntmp,
-+ EC_GROUP_get_order(EC_KEY_get0_group(pkey), bntmp2, NULL);
-+ BN_mod_add(bntmp,
- EC_KEY_get0_private_key(pkey),
- EC_KEY_get0_private_key(pkey2),
-- &bntmp2,
-+ bntmp2,
- bnctx);
-- vg_set_privkey(&bntmp, pkey);
-+ vg_set_privkey(bntmp, pkey);
- EC_KEY_free(pkey2);
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
- BN_CTX_free(bnctx);
- }
-
-diff --git a/oclengine.c b/oclengine.c
-index 4085edd..6f65846 100644
---- a/oclengine.c
-+++ b/oclengine.c
-@@ -43,6 +43,34 @@
- #include "pattern.h"
- #include "util.h"
-
-+// Unfortunately we need this!
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+#define PPNT_ARROW_X ppnt->X
-+#define PPNT_ARROW_Y ppnt->Y
-+#define PPNT_ARROW_Z ppnt->Z
-+#define PPS_ARROW_X pps->X
-+#define PPS_ARROW_Y pps->Y
-+#define PPS_ARROW_Z pps->Z
-+#define PPT_ARROW_X ppt->X
-+#define PPT_ARROW_Y ppt->Y
-+#define PPR_ARROW_X ppr->X
-+#define PPR_ARROW_Y ppr->Y
-+#define PPC_ARROW_X ppc->X
-+#define PPC_ARROW_Y ppc->Y
-+#else
-+#define PPNT_ARROW_X &ppnt->X
-+#define PPNT_ARROW_Y &ppnt->Y
-+#define PPNT_ARROW_Z &ppnt->Z
-+#define PPS_ARROW_X &pps->X
-+#define PPS_ARROW_Y &pps->Y
-+#define PPS_ARROW_Z &pps->Z
-+#define PPT_ARROW_X &ppt->X
-+#define PPT_ARROW_Y &ppt->Y
-+#define PPR_ARROW_X &ppr->X
-+#define PPR_ARROW_Y &ppr->Y
-+#define PPC_ARROW_X &ppc->X
-+#define PPC_ARROW_Y &ppc->Y
-+#endif
-
- #define MAX_SLOT 2
- #define MAX_ARG 6
-@@ -1307,14 +1335,21 @@ vg_ocl_kernel_wait(vg_ocl_context_t *vocp, int slot)
- static INLINE void
- vg_ocl_get_bignum_raw(BIGNUM *bn, const unsigned char *buf)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BN_lebin2bn(buf, 32, bn);
-+#else
- bn_expand(bn, 256);
- memcpy(bn->d, buf, 32);
- bn->top = (32 / sizeof(BN_ULONG));
-+#endif
- }
-
- static INLINE void
- vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BN_bn2lebinpad(bn, buf, 32);
-+#else
- int bnlen = (bn->top * sizeof(BN_ULONG));
- if (bnlen >= 32) {
- memcpy(buf, bn->d, 32);
-@@ -1322,6 +1357,7 @@ vg_ocl_put_bignum_raw(unsigned char *buf, const BIGNUM *bn)
- memcpy(buf, bn->d, bnlen);
- memset(buf + bnlen, 0, 32 - bnlen);
- }
-+#endif
- }
-
- #define ACCESS_BUNDLE 1024
-@@ -1351,9 +1387,15 @@ vg_ocl_get_bignum_tpa(BIGNUM *bn, const unsigned char *buf, int cell)
-
- struct ec_point_st {
- const EC_METHOD *meth;
-+#if OPENSSL_VERSION_NUMBER >= 0x0010100000
-+ BIGNUM *X;
-+ BIGNUM *Y;
-+ BIGNUM *Z;
-+#else
- BIGNUM X;
- BIGNUM Y;
- BIGNUM Z;
-+#endif
- int Z_is_one;
- };
-
-@@ -1361,11 +1403,11 @@ static INLINE void
- vg_ocl_get_point(EC_POINT *ppnt, const unsigned char *buf)
- {
- static const unsigned char mont_one[] = { 0x01,0x00,0x00,0x03,0xd1 };
-- vg_ocl_get_bignum_raw(&ppnt->X, buf);
-- vg_ocl_get_bignum_raw(&ppnt->Y, buf + 32);
-+ vg_ocl_get_bignum_raw(PPNT_ARROW_X, buf);
-+ vg_ocl_get_bignum_raw(PPNT_ARROW_Y, buf + 32);
- if (!ppnt->Z_is_one) {
- ppnt->Z_is_one = 1;
-- BN_bin2bn(mont_one, sizeof(mont_one), &ppnt->Z);
-+ BN_bin2bn(mont_one, sizeof(mont_one), PPNT_ARROW_Z);
- }
- }
-
-@@ -1373,8 +1415,8 @@ static INLINE void
- vg_ocl_put_point(unsigned char *buf, const EC_POINT *ppnt)
- {
- assert(ppnt->Z_is_one);
-- vg_ocl_put_bignum_raw(buf, &ppnt->X);
-- vg_ocl_put_bignum_raw(buf + 32, &ppnt->Y);
-+ vg_ocl_put_bignum_raw(buf, PPNT_ARROW_X);
-+ vg_ocl_put_bignum_raw(buf + 32, PPNT_ARROW_Y);
- }
-
- static void
-@@ -1662,7 +1704,7 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- unsigned char *ocl_points_in = NULL, *ocl_strides_in = NULL;
- const EC_GROUP *pgroup;
- EC_POINT *ppr = NULL, *ppc = NULL, *pps = NULL, *ppt = NULL;
-- BIGNUM bnz, bnez, bnm, *bnzc;
-+ BIGNUM *bnz, *bnez, *bnm, *bnzc;
- BN_CTX *bnctx = NULL;
- BN_MONT_CTX *bnmont;
- int ret = 0;
-@@ -1675,9 +1717,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- 0xFF,0xFF,0xFF,0xFE,0xFF,0xFF,0xFC,0x2F
- };
-
-- BN_init(&bnz);
-- BN_init(&bnez);
-- BN_init(&bnm);
-+ bnz = BN_new();
-+ bnez = BN_new();
-+ bnm = BN_new();
-
- bnctx = BN_CTX_new();
- bnmont = BN_MONT_CTX_new();
-@@ -1692,13 +1734,13 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- goto out;
- }
-
-- BN_bin2bn(raw_modulus, sizeof(raw_modulus), &bnm);
-- BN_MONT_CTX_set(bnmont, &bnm, bnctx);
-+ BN_bin2bn(raw_modulus, sizeof(raw_modulus), bnm);
-+ BN_MONT_CTX_set(bnmont, bnm, bnctx);
-
- if (z_inverted) {
-- bnzc = &bnez;
-+ bnzc = bnez;
- } else {
-- bnzc = &pps->Z;
-+ bnzc = PPS_ARROW_Z;
- }
-
- z_heap = (unsigned char *)
-@@ -1726,15 +1768,15 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- EC_POINT_add(pgroup, pps, ppc, ppr, bnctx);
- assert(!pps->Z_is_one);
- vg_ocl_get_point_tpa(ppt, point_tmp, bx + x);
-- vg_ocl_get_bignum_tpa(&bnz, z_heap, bx + x);
-+ vg_ocl_get_bignum_tpa(bnz, z_heap, bx + x);
- if (z_inverted) {
-- BN_mod_inverse(&bnez, &pps->Z, &bnm, bnctx);
-- BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
-- BN_to_montgomery(&bnez, &bnez, bnmont, bnctx);
-+ BN_mod_inverse(bnez, PPS_ARROW_Z, bnm, bnctx);
-+ BN_to_montgomery(bnez, bnez, bnmont, bnctx);
-+ BN_to_montgomery(bnez, bnez, bnmont, bnctx);
- }
-- if (BN_cmp(&ppt->X, &pps->X) ||
-- BN_cmp(&ppt->Y, &pps->Y) ||
-- BN_cmp(&bnz, bnzc)) {
-+ if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X) ||
-+ BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y) ||
-+ BN_cmp(bnz, bnzc)) {
- if (!mismatches) {
- fprintf(stderr, "Base privkey: ");
- fdumpbn(stderr, EC_KEY_get0_private_key(
-@@ -1747,33 +1789,33 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- if (!mm_r) {
- mm_r = 1;
- fprintf(stderr, "Row X : ");
-- fdumpbn(stderr, &ppr->X);
-+ fdumpbn(stderr, PPR_ARROW_X);
- fprintf(stderr, "Row Y : ");
-- fdumpbn(stderr, &ppr->Y);
-+ fdumpbn(stderr, PPS_ARROW_Y);
- }
-
- fprintf(stderr, "Column X: ");
-- fdumpbn(stderr, &ppc->X);
-+ fdumpbn(stderr, PPC_ARROW_X);
- fprintf(stderr, "Column Y: ");
-- fdumpbn(stderr, &ppc->Y);
-+ fdumpbn(stderr, PPC_ARROW_Y);
-
-- if (BN_cmp(&ppt->X, &pps->X)) {
-+ if (BN_cmp(PPT_ARROW_X, PPS_ARROW_X)) {
- fprintf(stderr, "Expect X: ");
-- fdumpbn(stderr, &pps->X);
-+ fdumpbn(stderr, PPS_ARROW_X);
- fprintf(stderr, "Device X: ");
-- fdumpbn(stderr, &ppt->X);
-+ fdumpbn(stderr, PPT_ARROW_X);
- }
-- if (BN_cmp(&ppt->Y, &pps->Y)) {
-+ if (BN_cmp(PPT_ARROW_Y, PPS_ARROW_Y)) {
- fprintf(stderr, "Expect Y: ");
-- fdumpbn(stderr, &pps->Y);
-+ fdumpbn(stderr, PPS_ARROW_Y);
- fprintf(stderr, "Device Y: ");
-- fdumpbn(stderr, &ppt->Y);
-+ fdumpbn(stderr, PPT_ARROW_Y);
- }
-- if (BN_cmp(&bnz, bnzc)) {
-+ if (BN_cmp(bnz, bnzc)) {
- fprintf(stderr, "Expect Z: ");
- fdumpbn(stderr, bnzc);
- fprintf(stderr, "Device Z: ");
-- fdumpbn(stderr, &bnz);
-+ fdumpbn(stderr, bnz);
- }
- }
- }
-@@ -1798,9 +1840,9 @@ vg_ocl_verify_temporary(vg_ocl_context_t *vocp, int slot, int z_inverted)
- EC_POINT_free(pps);
- if (ppt)
- EC_POINT_free(ppt);
-- BN_clear_free(&bnz);
-- BN_clear_free(&bnez);
-- BN_clear_free(&bnm);
-+ BN_clear_free(bnz);
-+ BN_clear_free(bnez);
-+ BN_clear_free(bnm);
- if (bnmont)
- BN_MONT_CTX_free(bnmont);
- if (bnctx)
-@@ -1971,13 +2013,13 @@ vg_opencl_loop(vg_exec_context_t *arg)
- if (!pbatchinc || !poffset || !pseek)
- goto enomem;
-
-- BN_set_word(&vxcp->vxc_bntmp, ncols);
-- EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, ncols);
-+ EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
-
-- BN_set_word(&vxcp->vxc_bntmp, round);
-- EC_POINT_mul(pgroup, poffset, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, round);
-+ EC_POINT_mul(pgroup, poffset, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, poffset, vxcp->vxc_bnctx);
-
-@@ -2046,12 +2088,12 @@ vg_opencl_loop(vg_exec_context_t *arg)
- }
-
- /* Determine rekey interval */
-- EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp, vxcp->vxc_bnctx);
-- BN_sub(&vxcp->vxc_bntmp2,
-- &vxcp->vxc_bntmp,
-+ EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp, vxcp->vxc_bnctx);
-+ BN_sub(vxcp->vxc_bntmp2,
-+ vxcp->vxc_bntmp,
- EC_KEY_get0_private_key(pkey));
-- rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
-- if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
-+ rekey_at = BN_get_word(vxcp->vxc_bntmp2);
-+ if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
- rekey_at = rekey_max;
- assert(rekey_at > 0);
-
-diff --git a/pattern.c b/pattern.c
-index b84334e..5673a7e 100644
---- a/pattern.c
-+++ b/pattern.c
-@@ -151,12 +151,12 @@ vg_exec_context_init(vg_context_t *vcp, vg_exec_context_t *vxcp)
-
- vxcp->vxc_vc = vcp;
-
-- BN_init(&vxcp->vxc_bntarg);
-- BN_init(&vxcp->vxc_bnbase);
-- BN_init(&vxcp->vxc_bntmp);
-- BN_init(&vxcp->vxc_bntmp2);
-+ vxcp->vxc_bntarg = BN_new();
-+ vxcp->vxc_bnbase = BN_new();
-+ vxcp->vxc_bntmp = BN_new();
-+ vxcp->vxc_bntmp2 = BN_new();
-
-- BN_set_word(&vxcp->vxc_bnbase, 58);
-+ BN_set_word(vxcp->vxc_bnbase, 58);
-
- vxcp->vxc_bnctx = BN_CTX_new();
- assert(vxcp->vxc_bnctx);
-@@ -196,10 +196,10 @@ vg_exec_context_del(vg_exec_context_t *vxcp)
- if (tp->vxc_stop)
- pthread_cond_signal(&vg_thread_upcond);
-
-- BN_clear_free(&vxcp->vxc_bntarg);
-- BN_clear_free(&vxcp->vxc_bnbase);
-- BN_clear_free(&vxcp->vxc_bntmp);
-- BN_clear_free(&vxcp->vxc_bntmp2);
-+ BN_clear_free(vxcp->vxc_bntarg);
-+ BN_clear_free(vxcp->vxc_bnbase);
-+ BN_clear_free(vxcp->vxc_bntmp);
-+ BN_clear_free(vxcp->vxc_bntmp2);
- BN_CTX_free(vxcp->vxc_bnctx);
- vxcp->vxc_bnctx = NULL;
- pthread_mutex_unlock(&vg_thread_lock);
-@@ -225,12 +225,12 @@ void
- vg_exec_context_consolidate_key(vg_exec_context_t *vxcp)
- {
- if (vxcp->vxc_delta) {
-- BN_clear(&vxcp->vxc_bntmp);
-- BN_set_word(&vxcp->vxc_bntmp, vxcp->vxc_delta);
-- BN_add(&vxcp->vxc_bntmp2,
-+ BN_clear(vxcp->vxc_bntmp);
-+ BN_set_word(vxcp->vxc_bntmp, vxcp->vxc_delta);
-+ BN_add(vxcp->vxc_bntmp2,
- EC_KEY_get0_private_key(vxcp->vxc_key),
-- &vxcp->vxc_bntmp);
-- vg_set_privkey(&vxcp->vxc_bntmp2, vxcp->vxc_key);
-+ vxcp->vxc_bntmp);
-+ vg_set_privkey(vxcp->vxc_bntmp2, vxcp->vxc_key);
- vxcp->vxc_delta = 0;
- }
- }
-@@ -751,20 +751,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- int b58pow, b58ceil, b58top = 0;
- int ret = -1;
-
-- BIGNUM bntarg, bnceil, bnfloor;
-- BIGNUM bnbase;
-+ BIGNUM *bntarg, *bnceil, *bnfloor;
-+ BIGNUM *bnbase;
- BIGNUM *bnap, *bnbp, *bntp;
- BIGNUM *bnhigh = NULL, *bnlow = NULL, *bnhigh2 = NULL, *bnlow2 = NULL;
-- BIGNUM bntmp, bntmp2;
-+ BIGNUM *bntmp, *bntmp2;
-
-- BN_init(&bntarg);
-- BN_init(&bnceil);
-- BN_init(&bnfloor);
-- BN_init(&bnbase);
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-+ bntarg = BN_new();
-+ bnceil = BN_new();
-+ bnfloor = BN_new();
-+ bnbase = BN_new();
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
-
-- BN_set_word(&bnbase, 58);
-+ BN_set_word(bnbase, 58);
-
- p = strlen(pfx);
-
-@@ -791,20 +791,20 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
-
- /* First non-zero character */
- b58top = c;
-- BN_set_word(&bntarg, c);
-+ BN_set_word(bntarg, c);
-
- } else {
-- BN_set_word(&bntmp2, c);
-- BN_mul(&bntmp, &bntarg, &bnbase, bnctx);
-- BN_add(&bntarg, &bntmp, &bntmp2);
-+ BN_set_word(bntmp2, c);
-+ BN_mul(bntmp, bntarg, bnbase, bnctx);
-+ BN_add(bntarg, bntmp, bntmp2);
- }
- }
-
- /* Power-of-two ceiling and floor values based on leading 1s */
-- BN_clear(&bntmp);
-- BN_set_bit(&bntmp, 200 - (zero_prefix * 8));
-- BN_sub(&bnceil, &bntmp, BN_value_one());
-- BN_set_bit(&bnfloor, 192 - (zero_prefix * 8));
-+ BN_clear(bntmp);
-+ BN_set_bit(bntmp, 200 - (zero_prefix * 8));
-+ BN_sub(bnceil, bntmp, BN_value_one());
-+ BN_set_bit(bnfloor, 192 - (zero_prefix * 8));
-
- bnlow = BN_new();
- bnhigh = BN_new();
-@@ -815,13 +815,13 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- * numeric boundaries of the prefix.
- */
-
-- BN_copy(&bntmp, &bnceil);
-- bnap = &bntmp;
-- bnbp = &bntmp2;
-+ BN_copy(bntmp, bnceil);
-+ bnap = bntmp;
-+ bnbp = bntmp2;
- b58pow = 0;
-- while (BN_cmp(bnap, &bnbase) > 0) {
-+ while (BN_cmp(bnap, bnbase) > 0) {
- b58pow++;
-- BN_div(bnbp, NULL, bnap, &bnbase, bnctx);
-+ BN_div(bnbp, NULL, bnap, bnbase, bnctx);
- bntp = bnap;
- bnap = bnbp;
- bnbp = bntp;
-@@ -837,11 +837,11 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- /* goto out; */
- }
-
-- BN_set_word(&bntmp2, b58pow - (p - zero_prefix));
-- BN_exp(&bntmp, &bnbase, &bntmp2, bnctx);
-- BN_mul(bnlow, &bntmp, &bntarg, bnctx);
-- BN_sub(&bntmp2, &bntmp, BN_value_one());
-- BN_add(bnhigh, bnlow, &bntmp2);
-+ BN_set_word(bntmp2, b58pow - (p - zero_prefix));
-+ BN_exp(bntmp, bnbase, bntmp2, bnctx);
-+ BN_mul(bnlow, bntmp, bntarg, bnctx);
-+ BN_sub(bntmp2, bntmp, BN_value_one());
-+ BN_add(bnhigh, bnlow, bntmp2);
-
- if (b58top <= b58ceil) {
- /* Fill out the upper range too */
-@@ -849,16 +849,16 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow2 = BN_new();
- bnhigh2 = BN_new();
-
-- BN_mul(bnlow2, bnlow, &bnbase, bnctx);
-- BN_mul(&bntmp2, bnhigh, &bnbase, bnctx);
-- BN_set_word(&bntmp, 57);
-- BN_add(bnhigh2, &bntmp2, &bntmp);
-+ BN_mul(bnlow2, bnlow, bnbase, bnctx);
-+ BN_mul(bntmp2, bnhigh, bnbase, bnctx);
-+ BN_set_word(bntmp, 57);
-+ BN_add(bnhigh2, bntmp2, bntmp);
-
- /*
- * Addresses above the ceiling will have one
- * fewer "1" prefix in front than we require.
- */
-- if (BN_cmp(&bnceil, bnlow2) < 0) {
-+ if (BN_cmp(bnceil, bnlow2) < 0) {
- /* High prefix is above the ceiling */
- check_upper = 0;
- BN_free(bnhigh2);
-@@ -866,15 +866,15 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bnceil, bnhigh2) < 0)
-+ else if (BN_cmp(bnceil, bnhigh2) < 0)
- /* High prefix is partly above the ceiling */
-- BN_copy(bnhigh2, &bnceil);
-+ BN_copy(bnhigh2, bnceil);
-
- /*
- * Addresses below the floor will have another
- * "1" prefix in front instead of our target.
- */
-- if (BN_cmp(&bnfloor, bnhigh) >= 0) {
-+ if (BN_cmp(bnfloor, bnhigh) >= 0) {
- /* Low prefix is completely below the floor */
- assert(check_upper);
- check_upper = 0;
-@@ -885,35 +885,35 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bnfloor, bnlow) > 0) {
-+ else if (BN_cmp(bnfloor, bnlow) > 0) {
- /* Low prefix is partly below the floor */
-- BN_copy(bnlow, &bnfloor);
-+ BN_copy(bnlow, bnfloor);
- }
- }
-
- } else {
-- BN_copy(bnhigh, &bnceil);
-+ BN_copy(bnhigh, bnceil);
- BN_clear(bnlow);
- }
-
- /* Limit the prefix to the address type */
-- BN_clear(&bntmp);
-- BN_set_word(&bntmp, addrtype);
-- BN_lshift(&bntmp2, &bntmp, 192);
-+ BN_clear(bntmp);
-+ BN_set_word(bntmp, addrtype);
-+ BN_lshift(bntmp2, bntmp, 192);
-
- if (check_upper) {
-- if (BN_cmp(&bntmp2, bnhigh2) > 0) {
-+ if (BN_cmp(bntmp2, bnhigh2) > 0) {
- check_upper = 0;
- BN_free(bnhigh2);
- bnhigh2 = NULL;
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnlow2) > 0)
-- BN_copy(bnlow2, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnlow2) > 0)
-+ BN_copy(bnlow2, bntmp2);
- }
-
-- if (BN_cmp(&bntmp2, bnhigh) > 0) {
-+ if (BN_cmp(bntmp2, bnhigh) > 0) {
- if (!check_upper)
- goto not_possible;
- check_upper = 0;
-@@ -924,26 +924,26 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnlow) > 0) {
-- BN_copy(bnlow, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnlow) > 0) {
-+ BN_copy(bnlow, bntmp2);
- }
-
-- BN_set_word(&bntmp, addrtype + 1);
-- BN_lshift(&bntmp2, &bntmp, 192);
-+ BN_set_word(bntmp, addrtype + 1);
-+ BN_lshift(bntmp2, bntmp, 192);
-
- if (check_upper) {
-- if (BN_cmp(&bntmp2, bnlow2) < 0) {
-+ if (BN_cmp(bntmp2, bnlow2) < 0) {
- check_upper = 0;
- BN_free(bnhigh2);
- bnhigh2 = NULL;
- BN_free(bnlow2);
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnhigh2) < 0)
-- BN_copy(bnlow2, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnhigh2) < 0)
-+ BN_copy(bnlow2, bntmp2);
- }
-
-- if (BN_cmp(&bntmp2, bnlow) < 0) {
-+ if (BN_cmp(bntmp2, bnlow) < 0) {
- if (!check_upper)
- goto not_possible;
- check_upper = 0;
-@@ -954,8 +954,8 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- bnlow = bnlow2;
- bnlow2 = NULL;
- }
-- else if (BN_cmp(&bntmp2, bnhigh) < 0) {
-- BN_copy(bnhigh, &bntmp2);
-+ else if (BN_cmp(bntmp2, bnhigh) < 0) {
-+ BN_copy(bnhigh, bntmp2);
- }
-
- /* Address ranges are complete */
-@@ -976,12 +976,12 @@ get_prefix_ranges(int addrtype, const char *pfx, BIGNUM **result,
- }
-
- out:
-- BN_clear_free(&bntarg);
-- BN_clear_free(&bnceil);
-- BN_clear_free(&bnfloor);
-- BN_clear_free(&bnbase);
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-+ BN_clear_free(bntarg);
-+ BN_clear_free(bnceil);
-+ BN_clear_free(bnfloor);
-+ BN_clear_free(bnbase);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
- if (bnhigh)
- BN_free(bnhigh);
- if (bnlow)
-@@ -1266,7 +1266,7 @@ prefix_case_iter_next(prefix_case_iter_t *cip)
- typedef struct _vg_prefix_context_s {
- vg_context_t base;
- avl_root_t vcp_avlroot;
-- BIGNUM vcp_difficulty;
-+ BIGNUM *vcp_difficulty;
- int vcp_caseinsensitive;
- } vg_prefix_context_t;
-
-@@ -1294,7 +1294,7 @@ vg_prefix_context_clear_all_patterns(vg_context_t *vcp)
- vcpp->base.vc_npatterns = 0;
- vcpp->base.vc_npatterns_start = 0;
- vcpp->base.vc_found = 0;
-- BN_clear(&vcpp->vcp_difficulty);
-+ BN_clear(vcpp->vcp_difficulty);
- }
-
- static void
-@@ -1302,7 +1302,7 @@ vg_prefix_context_free(vg_context_t *vcp)
- {
- vg_prefix_context_t *vcpp = (vg_prefix_context_t *) vcp;
- vg_prefix_context_clear_all_patterns(vcp);
-- BN_clear_free(&vcpp->vcp_difficulty);
-+ BN_clear_free(vcpp->vcp_difficulty);
- free(vcpp);
- }
-
-@@ -1314,7 +1314,7 @@ vg_prefix_context_next_difficulty(vg_prefix_context_t *vcpp,
-
- BN_clear(bntmp);
- BN_set_bit(bntmp, 192);
-- BN_div(bntmp2, NULL, bntmp, &vcpp->vcp_difficulty, bnctx);
-+ BN_div(bntmp2, NULL, bntmp, vcpp->vcp_difficulty, bnctx);
-
- dbuf = BN_bn2dec(bntmp2);
- if (vcpp->base.vc_verbose > 0) {
-@@ -1337,7 +1337,7 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- prefix_case_iter_t caseiter;
- vg_prefix_t *vp, *vp2;
- BN_CTX *bnctx;
-- BIGNUM bntmp, bntmp2, bntmp3;
-+ BIGNUM *bntmp, *bntmp2, *bntmp3;
- BIGNUM *ranges[4];
- int ret = 0;
- int i, impossible = 0;
-@@ -1346,9 +1346,9 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- char *dbuf;
-
- bnctx = BN_CTX_new();
-- BN_init(&bntmp);
-- BN_init(&bntmp2);
-- BN_init(&bntmp3);
-+ bntmp = BN_new();
-+ bntmp2 = BN_new();
-+ bntmp3 = BN_new();
-
- npfx = 0;
- for (i = 0; i < npatterns; i++) {
-@@ -1426,16 +1426,16 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- npfx++;
-
- /* Determine the probability of finding a match */
-- vg_prefix_range_sum(vp, &bntmp, &bntmp2);
-- BN_add(&bntmp2, &vcpp->vcp_difficulty, &bntmp);
-- BN_copy(&vcpp->vcp_difficulty, &bntmp2);
-+ vg_prefix_range_sum(vp, bntmp, bntmp2);
-+ BN_add(bntmp2, vcpp->vcp_difficulty, bntmp);
-+ BN_copy(vcpp->vcp_difficulty, bntmp2);
-
- if (vcp->vc_verbose > 1) {
-- BN_clear(&bntmp2);
-- BN_set_bit(&bntmp2, 192);
-- BN_div(&bntmp3, NULL, &bntmp2, &bntmp, bnctx);
-+ BN_clear(bntmp2);
-+ BN_set_bit(bntmp2, 192);
-+ BN_div(bntmp3, NULL, bntmp2, bntmp, bnctx);
-
-- dbuf = BN_bn2dec(&bntmp3);
-+ dbuf = BN_bn2dec(bntmp3);
- fprintf(stderr,
- "Prefix difficulty: %20s %s\n",
- dbuf, patterns[i]);
-@@ -1469,13 +1469,13 @@ vg_prefix_context_add_patterns(vg_context_t *vcp,
- }
-
- if (npfx)
-- vg_prefix_context_next_difficulty(vcpp, &bntmp, &bntmp2, bnctx);
-+ vg_prefix_context_next_difficulty(vcpp, bntmp, bntmp2, bnctx);
-
- ret = (npfx != 0);
-
-- BN_clear_free(&bntmp);
-- BN_clear_free(&bntmp2);
-- BN_clear_free(&bntmp3);
-+ BN_clear_free(bntmp);
-+ BN_clear_free(bntmp2);
-+ BN_clear_free(bntmp3);
- BN_CTX_free(bnctx);
- return ret;
- }
-@@ -1484,39 +1484,39 @@ double
- vg_prefix_get_difficulty(int addrtype, const char *pattern)
- {
- BN_CTX *bnctx;
-- BIGNUM result, bntmp;
-+ BIGNUM *result, *bntmp;
- BIGNUM *ranges[4];
- char *dbuf;
- int ret;
- double diffret = 0.0;
-
- bnctx = BN_CTX_new();
-- BN_init(&result);
-- BN_init(&bntmp);
-+ result = BN_new();
-+ bntmp = BN_new();
-
- ret = get_prefix_ranges(addrtype,
- pattern, ranges, bnctx);
-
- if (ret == 0) {
-- BN_sub(&bntmp, ranges[1], ranges[0]);
-- BN_add(&result, &result, &bntmp);
-+ BN_sub(bntmp, ranges[1], ranges[0]);
-+ BN_add(result, result, bntmp);
- if (ranges[2]) {
-- BN_sub(&bntmp, ranges[3], ranges[2]);
-- BN_add(&result, &result, &bntmp);
-+ BN_sub(bntmp, ranges[3], ranges[2]);
-+ BN_add(result, result, bntmp);
- }
- free_ranges(ranges);
-
-- BN_clear(&bntmp);
-- BN_set_bit(&bntmp, 192);
-- BN_div(&result, NULL, &bntmp, &result, bnctx);
-+ BN_clear(bntmp);
-+ BN_set_bit(bntmp, 192);
-+ BN_div(result, NULL, bntmp, result, bnctx);
-
-- dbuf = BN_bn2dec(&result);
-+ dbuf = BN_bn2dec(result);
- diffret = strtod(dbuf, NULL);
- OPENSSL_free(dbuf);
- }
-
-- BN_clear_free(&result);
-- BN_clear_free(&bntmp);
-+ BN_clear_free(result);
-+ BN_clear_free(bntmp);
- BN_CTX_free(bnctx);
- return diffret;
- }
-@@ -1535,10 +1535,10 @@ vg_prefix_test(vg_exec_context_t *vxcp)
- * check code.
- */
-
-- BN_bin2bn(vxcp->vxc_binres, 25, &vxcp->vxc_bntarg);
-+ BN_bin2bn(vxcp->vxc_binres, 25, vxcp->vxc_bntarg);
-
- research:
-- vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, &vxcp->vxc_bntarg);
-+ vp = vg_prefix_avl_search(&vcpp->vcp_avlroot, vxcp->vxc_bntarg);
- if (vp) {
- if (vg_exec_context_upgrade_lock(vxcp))
- goto research;
-@@ -1558,20 +1558,20 @@ vg_prefix_test(vg_exec_context_t *vxcp)
- if (vcpp->base.vc_remove_on_match) {
- /* Subtract the range from the difficulty */
- vg_prefix_range_sum(vp,
-- &vxcp->vxc_bntarg,
-- &vxcp->vxc_bntmp);
-- BN_sub(&vxcp->vxc_bntmp,
-- &vcpp->vcp_difficulty,
-- &vxcp->vxc_bntarg);
-- BN_copy(&vcpp->vcp_difficulty, &vxcp->vxc_bntmp);
-+ vxcp->vxc_bntarg,
-+ vxcp->vxc_bntmp);
-+ BN_sub(vxcp->vxc_bntmp,
-+ vcpp->vcp_difficulty,
-+ vxcp->vxc_bntarg);
-+ BN_copy(vcpp->vcp_difficulty, vxcp->vxc_bntmp);
-
- vg_prefix_delete(&vcpp->vcp_avlroot,vp);
- vcpp->base.vc_npatterns--;
-
- if (!avl_root_empty(&vcpp->vcp_avlroot))
- vg_prefix_context_next_difficulty(
-- vcpp, &vxcp->vxc_bntmp,
-- &vxcp->vxc_bntmp2,
-+ vcpp, vxcp->vxc_bntmp,
-+ vxcp->vxc_bntmp2,
- vxcp->vxc_bnctx);
- vcpp->base.vc_pattern_generation++;
- }
-@@ -1652,7 +1652,7 @@ vg_prefix_context_new(int addrtype, int privtype, int caseinsensitive)
- vcpp->base.vc_test = vg_prefix_test;
- vcpp->base.vc_hash160_sort = vg_prefix_hash160_sort;
- avl_root_init(&vcpp->vcp_avlroot);
-- BN_init(&vcpp->vcp_difficulty);
-+ vcpp->vcp_difficulty = BN_new();
- vcpp->vcp_caseinsensitive = caseinsensitive;
- }
- return &vcpp->base;
-@@ -1778,21 +1778,21 @@ vg_regex_test(vg_exec_context_t *vxcp)
- unsigned char hash1[32], hash2[32];
- int i, zpfx, p, d, nres, re_vec[9];
- char b58[40];
-- BIGNUM bnrem;
-+ BIGNUM *bnrem;
- BIGNUM *bn, *bndiv, *bnptmp;
- int res = 0;
-
- pcre *re;
-
-- BN_init(&bnrem);
-+ bnrem = BN_new();
-
- /* Hash the hash and write the four byte check code */
- SHA256(vxcp->vxc_binres, 21, hash1);
- SHA256(hash1, sizeof(hash1), hash2);
- memcpy(&vxcp->vxc_binres[21], hash2, 4);
-
-- bn = &vxcp->vxc_bntmp;
-- bndiv = &vxcp->vxc_bntmp2;
-+ bn = vxcp->vxc_bntmp;
-+ bndiv = vxcp->vxc_bntmp2;
-
- BN_bin2bn(vxcp->vxc_binres, 25, bn);
-
-@@ -1801,11 +1801,11 @@ vg_regex_test(vg_exec_context_t *vxcp)
- p = sizeof(b58) - 1;
- b58[p] = '\0';
- while (!BN_is_zero(bn)) {
-- BN_div(bndiv, &bnrem, bn, &vxcp->vxc_bnbase, vxcp->vxc_bnctx);
-+ BN_div(bndiv, bnrem, bn, vxcp->vxc_bnbase, vxcp->vxc_bnctx);
- bnptmp = bn;
- bn = bndiv;
- bndiv = bnptmp;
-- d = BN_get_word(&bnrem);
-+ d = BN_get_word(bnrem);
- b58[--p] = vg_b58_alphabet[d];
- }
- while (zpfx--) {
-@@ -1878,7 +1878,7 @@ vg_regex_test(vg_exec_context_t *vxcp)
- res = 1;
- }
- out:
-- BN_clear_free(&bnrem);
-+ BN_clear_free(bnrem);
- return res;
- }
-
-diff --git a/pattern.h b/pattern.h
-index 3ce2d1f..0b604ea 100644
---- a/pattern.h
-+++ b/pattern.h
-@@ -51,10 +51,10 @@ struct _vg_exec_context_s {
- EC_KEY *vxc_key;
- int vxc_delta;
- unsigned char vxc_binres[28];
-- BIGNUM vxc_bntarg;
-- BIGNUM vxc_bnbase;
-- BIGNUM vxc_bntmp;
-- BIGNUM vxc_bntmp2;
-+ BIGNUM *vxc_bntarg;
-+ BIGNUM *vxc_bnbase;
-+ BIGNUM *vxc_bntmp;
-+ BIGNUM *vxc_bntmp2;
-
- vg_exec_context_threadfunc_t vxc_threadfunc;
- pthread_t vxc_pthread;
-diff --git a/util.c b/util.c
-index 4f3cbb8..35cd592 100644
---- a/util.c
-+++ b/util.c
-@@ -110,19 +110,19 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
-
- BN_CTX *bnctx;
- BIGNUM *bn, *bndiv, *bntmp;
-- BIGNUM bna, bnb, bnbase, bnrem;
-+ BIGNUM *bna, *bnb, *bnbase, *bnrem;
- unsigned char *binres;
- int brlen, zpfx;
-
- bnctx = BN_CTX_new();
-- BN_init(&bna);
-- BN_init(&bnb);
-- BN_init(&bnbase);
-- BN_init(&bnrem);
-- BN_set_word(&bnbase, 58);
-+ bna = BN_new();
-+ bnb = BN_new();
-+ bnbase = BN_new();
-+ bnrem = BN_new();
-+ BN_set_word(bnbase, 58);
-
-- bn = &bna;
-- bndiv = &bnb;
-+ bn = bna;
-+ bndiv = bnb;
-
- brlen = (2 * len) + 4;
- binres = (unsigned char*) malloc(brlen);
-@@ -154,11 +154,11 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
-
- p = brlen;
- while (!BN_is_zero(bn)) {
-- BN_div(bndiv, &bnrem, bn, &bnbase, bnctx);
-+ BN_div(bndiv, bnrem, bn, bnbase, bnctx);
- bntmp = bn;
- bn = bndiv;
- bndiv = bntmp;
-- d = BN_get_word(&bnrem);
-+ d = BN_get_word(bnrem);
- binres[--p] = vg_b58_alphabet[d];
- }
-
-@@ -170,10 +170,10 @@ vg_b58_encode_check(void *buf, size_t len, char *result)
- result[brlen - p] = '\0';
-
- free(binres);
-- BN_clear_free(&bna);
-- BN_clear_free(&bnb);
-- BN_clear_free(&bnbase);
-- BN_clear_free(&bnrem);
-+ BN_clear_free(bna);
-+ BN_clear_free(bnb);
-+ BN_clear_free(bnbase);
-+ BN_clear_free(bnrem);
- BN_CTX_free(bnctx);
- }
-
-@@ -185,7 +185,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- {
- int i, l, c;
- unsigned char *xbuf = NULL;
-- BIGNUM bn, bnw, bnbase;
-+ BIGNUM *bn, *bnw, *bnbase;
- BN_CTX *bnctx;
- unsigned char hash1[32], hash2[32];
- unsigned char groestlhash1[64];
-@@ -193,10 +193,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- int zpfx;
- int res = 0;
-
-- BN_init(&bn);
-- BN_init(&bnw);
-- BN_init(&bnbase);
-- BN_set_word(&bnbase, 58);
-+ bn = BN_new();
-+ bnw = BN_new();
-+ bnbase = BN_new();
-+ BN_set_word(bnbase, 58);
- bnctx = BN_CTX_new();
-
- /* Build a bignum from the encoded value */
-@@ -207,10 +207,10 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- c = vg_b58_reverse_map[(int)input[i]];
- if (c < 0)
- goto out;
-- BN_clear(&bnw);
-- BN_set_word(&bnw, c);
-- BN_mul(&bn, &bn, &bnbase, bnctx);
-- BN_add(&bn, &bn, &bnw);
-+ BN_clear(bnw);
-+ BN_set_word(bnw, c);
-+ BN_mul(bn, bn, bnbase, bnctx);
-+ BN_add(bn, bn, bnw);
- }
-
- /* Copy the bignum to a byte buffer */
-@@ -221,7 +221,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- break;
- zpfx++;
- }
-- c = BN_num_bytes(&bn);
-+ c = BN_num_bytes(bn);
- l = zpfx + c;
- if (l < 5)
- goto out;
-@@ -231,7 +231,7 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- if (zpfx)
- memset(xbuf, 0, zpfx);
- if (c)
-- BN_bn2bin(&bn, xbuf + zpfx);
-+ BN_bn2bin(bn, xbuf + zpfx);
-
- /* Check the hash code */
- l -= 4;
-@@ -270,9 +270,9 @@ vg_b58_decode_check(const char *input, void *buf, size_t len)
- out:
- if (xbuf)
- free(xbuf);
-- BN_clear_free(&bn);
-- BN_clear_free(&bnw);
-- BN_clear_free(&bnbase);
-+ BN_clear_free(bn);
-+ BN_clear_free(bnw);
-+ BN_clear_free(bnbase);
- BN_CTX_free(bnctx);
- return res;
- }
-@@ -420,7 +420,7 @@ vg_set_privkey(const BIGNUM *bnpriv, EC_KEY *pkey)
- int
- vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
- {
-- BIGNUM bnpriv;
-+ BIGNUM *bnpriv;
- unsigned char ecpriv[48];
- int res, ret;
-
-@@ -430,10 +430,10 @@ vg_decode_privkey(const char *b58encoded, EC_KEY *pkey, int *addrtype)
-
- ret = res - 32;
-
-- BN_init(&bnpriv);
-- BN_bin2bn(ecpriv + 1, 32, &bnpriv);
-- res = vg_set_privkey(&bnpriv, pkey);
-- BN_clear_free(&bnpriv);
-+ bnpriv = BN_new();
-+ BN_bin2bn(ecpriv + 1, 32, bnpriv);
-+ res = vg_set_privkey(bnpriv, pkey);
-+ BN_clear_free(bnpriv);
- *addrtype = ecpriv[0];
- return ret;
- }
-@@ -632,15 +632,15 @@ vg_protect_crypt(int parameter_group,
- salt_len = 4;
- hmac_len = 8;
- hmac_keylen = 16;
-- ciphertext_len = ((plaintext_len + cipher->block_size - 1) /
-- cipher->block_size) * cipher->block_size;
-+ ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher) - 1) /
-+ EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
- pkcs7_padding = 0;
- hmac_digest = EVP_sha256();
- } else {
- /* PKCS-compliant encoding */
- salt_len = 8;
-- ciphertext_len = ((plaintext_len + cipher->block_size) /
-- cipher->block_size) * cipher->block_size;
-+ ciphertext_len = ((plaintext_len + EVP_CIPHER_block_size(cipher)) /
-+ EVP_CIPHER_block_size(cipher)) * EVP_CIPHER_block_size(cipher);
- hmac_digest = NULL;
- }
-
-@@ -666,12 +666,12 @@ vg_protect_crypt(int parameter_group,
- salt, salt_len,
- params->iterations,
- pbkdf_digest,
-- cipher->key_len + cipher->iv_len + hmac_keylen,
-+ EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher) + hmac_keylen,
- keymaterial);
-
- if (!EVP_CipherInit(ctx, cipher,
- keymaterial,
-- keymaterial + cipher->key_len,
-+ keymaterial + EVP_CIPHER_key_length(cipher),
- enc)) {
- fprintf(stderr, "ERROR: could not configure cipher\n");
- goto out;
-@@ -707,7 +707,7 @@ vg_protect_crypt(int parameter_group,
- if (hmac_len) {
- hlen = sizeof(hmac);
- HMAC(hmac_digest,
-- keymaterial + cipher->key_len + cipher->iv_len,
-+ keymaterial + EVP_CIPHER_key_length(cipher) + EVP_CIPHER_iv_length(cipher),
- hmac_keylen,
- enc ? data_in : data_out, plaintext_len,
- hmac, &hlen);
-@@ -786,7 +786,7 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
- {
- unsigned char ecpriv[64];
- unsigned char ecenc[128];
-- BIGNUM bn;
-+ BIGNUM *bn;
- int restype;
- int res;
-
-@@ -810,10 +810,10 @@ vg_protect_decode_privkey(EC_KEY *pkey, int *keytype,
-
- res = 1;
- if (pkey) {
-- BN_init(&bn);
-- BN_bin2bn(ecpriv, 32, &bn);
-- res = vg_set_privkey(&bn, pkey);
-- BN_clear_free(&bn);
-+ bn = BN_new();
-+ BN_bin2bn(ecpriv, 32, bn);
-+ res = vg_set_privkey(bn, pkey);
-+ BN_clear_free(bn);
- OPENSSL_cleanse(ecpriv, sizeof(ecpriv));
- }
-
-diff --git a/vanitygen.c b/vanitygen.c
-index fb7925a..992e5d7 100644
---- a/vanitygen.c
-+++ b/vanitygen.c
-@@ -94,8 +94,8 @@ vg_thread_loop(void *arg)
- exit(1);
- }
-
-- BN_set_word(&vxcp->vxc_bntmp, ptarraysize);
-- EC_POINT_mul(pgroup, pbatchinc, &vxcp->vxc_bntmp, NULL, NULL,
-+ BN_set_word(vxcp->vxc_bntmp, ptarraysize);
-+ EC_POINT_mul(pgroup, pbatchinc, vxcp->vxc_bntmp, NULL, NULL,
- vxcp->vxc_bnctx);
- EC_POINT_make_affine(pgroup, pbatchinc, vxcp->vxc_bnctx);
-
-@@ -139,13 +139,13 @@ vg_thread_loop(void *arg)
- npoints = 0;
-
- /* Determine rekey interval */
-- EC_GROUP_get_order(pgroup, &vxcp->vxc_bntmp,
-+ EC_GROUP_get_order(pgroup, vxcp->vxc_bntmp,
- vxcp->vxc_bnctx);
-- BN_sub(&vxcp->vxc_bntmp2,
-- &vxcp->vxc_bntmp,
-+ BN_sub(vxcp->vxc_bntmp2,
-+ vxcp->vxc_bntmp,
- EC_KEY_get0_private_key(pkey));
-- rekey_at = BN_get_word(&vxcp->vxc_bntmp2);
-- if ((rekey_at == BN_MASK2) || (rekey_at > rekey_max))
-+ rekey_at = BN_get_word(vxcp->vxc_bntmp2);
-+ if ((rekey_at == 0xffffffffL) || (rekey_at > rekey_max))
- rekey_at = rekey_max;
- assert(rekey_at > 0);
-
diff --git a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch b/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
deleted file mode 100644
index 5ee30ae08cdf..000000000000
--- a/srcpkgs/vanitygen/patches/5f163e6fff7da52c4aecbd898d9df2e60a56f134.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 5f163e6fff7da52c4aecbd898d9df2e60a56f134 Mon Sep 17 00:00:00 2001
-From: DesWurstes <DesWurstes@users.noreply.github.com>
-Date: Sun, 3 Jun 2018 17:46:16 +0300
-Subject: [PATCH] Privkey prefix OpenSSL 1.1 compatibility (#116)
-
-Fixes #114
----
- oclengine.c | 18 +++++++++++++-----
- vanitygen.c | 12 ++++++++++--
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/oclengine.c b/oclengine.c
-index 6585fc6..c69bd4b 100644
---- a/oclengine.c
-+++ b/oclengine.c
-@@ -5,7 +5,7 @@
- * Vanitygen is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
-- * any later version.
-+ * any later version.
- *
- * Vanitygen is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-@@ -1058,7 +1058,7 @@ vg_ocl_kernel_arg_alloc(vg_ocl_context_t *vocp, int slot,
- karg,
- sizeof(clbuf),
- &clbuf);
--
-+
- if (ret) {
- fprintf(stderr,
- "clSetKernelArg(%d,%d): ", knum, karg);
-@@ -1090,7 +1090,7 @@ vg_ocl_copyout_arg(vg_ocl_context_t *vocp, int wslot, int arg,
- buffer,
- 0, NULL,
- NULL);
--
-+
- if (ret) {
- fprintf(stderr, "clEnqueueWriteBuffer(%d): ", arg);
- vg_ocl_error(vocp, ret, NULL);
-@@ -2079,7 +2079,15 @@ vg_opencl_loop(vg_exec_context_t *arg)
- npoints = 0;
- if (vcp->vc_privkey_prefix_length > 0) {
- BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
-- memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ unsigned char pkey_arr[32];
-+ assert(BN_bn2bin(pkbn, pkey_arr) < 33);
-+ memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
-+ int k = pkey_arr[i];
-+ pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
-+ pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
-+ }
-+ BN_bin2bn(pkey_arr, 32, pkbn);
- EC_KEY_set_private_key(pkey, pkbn);
-
- EC_POINT *origin = EC_POINT_new(pgroup);
-@@ -2240,7 +2248,7 @@ vg_opencl_loop(vg_exec_context_t *arg)
- slot_busy = 1;
- slot = (slot + 1) % nslots;
-
-- } else {
-+ } else {
- if (slot_busy) {
- pthread_mutex_lock(&vocp->voc_lock);
- while (vocp->voc_ocl_slot != -1) {
-diff --git a/vanitygen.c b/vanitygen.c
-index 992e5d7..5e49df7 100644
---- a/vanitygen.c
-+++ b/vanitygen.c
-@@ -129,7 +129,15 @@ vg_thread_loop(void *arg)
- EC_KEY_generate_key(pkey);
- if (vcp->vc_privkey_prefix_length > 0) {
- BIGNUM *pkbn = BN_dup(EC_KEY_get0_private_key(pkey));
-- memcpy((char *)pkbn->d + 32 - vcp->vc_privkey_prefix_length, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ unsigned char pkey_arr[32];
-+ assert(BN_bn2bin(pkbn, pkey_arr) < 33);
-+ memcpy((char *) pkey_arr, vcp->vc_privkey_prefix, vcp->vc_privkey_prefix_length);
-+ for (int i = 0; i < vcp->vc_privkey_prefix_length / 2; i++) {
-+ int k = pkey_arr[i];
-+ pkey_arr[i] = pkey_arr[vcp->vc_privkey_prefix_length - 1 - i];
-+ pkey_arr[vcp->vc_privkey_prefix_length - 1 - i] = k;
-+ }
-+ BN_bin2bn(pkey_arr, 32, pkbn);
- EC_KEY_set_private_key(pkey, pkbn);
-
- EC_POINT *origin = EC_POINT_new(pgroup);
-@@ -1395,7 +1403,7 @@ main(int argc, char **argv)
- addrtype = 60;
- privtype = 128;
- break;
-- }
-+ }
- break;
-
- /*END ALTCOIN GENERATOR*/
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
deleted file mode 100644
index 624ac859d5d2..000000000000
--- a/srcpkgs/vanitygen/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'vanitygen'
-pkgname=vanitygen
-version=1.53
-revision=2
-makedepends="pcre-devel openssl-devel"
-short_desc="Bitcoin vanity address generator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="AGPL-3.0-or-later"
-homepage="https://github.com/exploitagency/vanitygen-plus"
-changelog="https://raw.githubusercontent.com/exploitagency/vanitygen-plus/master/CHANGELOG"
-distfiles="https://github.com/exploitagency/vanitygen-plus/archive/PLUS${version}.tar.gz"
-checksum=976a9afe2a4470551a8b6b0da97101a3a2e6c54c5a26dc870ae755bb2d8c7041
-
-do_build() {
- make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}
-}
-do_install() {
- vbin vanitygen
- vbin keyconv
- vlicense LICENSE
-}
From 1ac86079fe807b735f13b450b58f6e5cc80144fc Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 3 Feb 2023 13:31:17 -0500
Subject: [PATCH 214/356] FreeRADIUS: update to 3.0.26
---
srcpkgs/FreeRADIUS/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index b43aaa1f2e6e..ee2059a373b4 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,6 +1,6 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
-version=3.0.23
+version=3.0.26
revision=1
build_style=gnu-configure
makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://freeradius.org"
distfiles="https://github.com/FreeRADIUS/freeradius-server/archive/release_${version//./_}.tar.gz"
-checksum=6192b6a8d141545dc54c00c1a7af7f502f990418d780dcae76074163070dbb86
+checksum=6aea98d6126035e7ccca483d8b3faea447030169639807017ec98985b78fb2ca
nocross=yes # Not supported by upstream
system_accounts="_freeradius"
make_dirs="/etc/raddb 0750 _freeradius _freeradius"
From bd609e7996dfebd648442b8207772585997a28de Mon Sep 17 00:00:00 2001
From: Emil Miler <em@0x45.cz>
Date: Sun, 1 Jan 2023 23:09:52 +0100
Subject: [PATCH 215/356] New package: vlna-1.5
---
srcpkgs/vlna/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/vlna/template
diff --git a/srcpkgs/vlna/template b/srcpkgs/vlna/template
new file mode 100644
index 000000000000..68a4f29888c3
--- /dev/null
+++ b/srcpkgs/vlna/template
@@ -0,0 +1,11 @@
+# Template file for 'vlna'
+pkgname=vlna
+version=1.5
+revision=1
+build_style=gnu-configure
+short_desc="Adding Czech & Slovak non-breaking spaces to TeX and other files"
+maintainer="Emil Miler <em@0x45.cz>"
+license="LPPL-1.0"
+homepage="https://petr.olsak.net/ftp/olsak/vlna/"
+distfiles="https://petr.olsak.net/ftp/olsak/vlna/vlna-${version}.tar.gz"
+checksum=0d79955ec138760fa48dcddd73ed0bac4a81d31e99cb8929a05550373b4f4bfb
From 54c9417c39bfa07b931439e2bdacbd506fe1deb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 1 Feb 2023 16:19:17 +0100
Subject: [PATCH 216/356] doctl: update to 1.92.1.
---
srcpkgs/doctl/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index a326998da8ed..43444534cf5c 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
# Template file for 'doctl'
pkgname=doctl
-version=1.92.0
+version=1.92.1
revision=1
build_style=go
go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -13,5 +13,6 @@ short_desc="Command line tool for DigitalOcean services"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/digitalocean/doctl"
+changelog="https://raw.githubusercontent.com/digitalocean/doctl/main/CHANGELOG.md"
distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz"
-checksum=0ecab3a37731722f1af5085429ce5c94402a8c665233e80f148570231bb16d5b
+checksum=4d1b53ee473f4320fbbd834d364497acc31ba5dd5a4504d71c8b9eecfe9d76d6
From c88c1b364845ef763a6430e50a9c7b139291e890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 18 Jan 2023 08:11:01 +0100
Subject: [PATCH 217/356] gifski: update to 1.10.0.
---
srcpkgs/gifski/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index e585635a4f0e..e2466f4e57ef 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
# Template file for 'gifski'
pkgname=gifski
-version=1.8.1
+version=1.10.0
revision=1
build_style=cargo
configure_args="--features=openmp"
@@ -9,8 +9,9 @@ short_desc="Highest-quality GIF encoder based on pngquant"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="AGPL-3.0-only"
homepage="https://gif.ski"
+changelog="https://github.com/ImageOptim/gifski/releases"
distfiles="https://github.com/ImageOptim/gifski/archive/${version}.tar.gz"
-checksum=9c06e0124a5bde4d70fe44cc8be52ffc9b9099548fc34cac1db43c4a6ff8783c
+checksum=cc536bd3e73c302264cd2add460d9a270c66c545759dcd60cbfc7d365768c656
post_install() {
vlicense LICENSE
From 4be7f7261aa35934a277598bc09d5525f6c6ba53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 21:02:56 +0100
Subject: [PATCH 218/356] python3-ansible-compat: update to 3.0.1.
---
srcpkgs/python3-ansible-compat/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 6119c3bc6817..4f24371ccc7e 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ansible-compat'
pkgname=python3-ansible-compat
-version=2.2.7
+version=3.0.1
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
@@ -9,8 +9,8 @@ short_desc="Python package for working with various version of ansible"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
homepage="https://github.com/ansible/ansible-compat"
-distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=08deddcd0a1dc6baabe674b07c6ff882118492c123d281f56f01905271a7ffc4
+distfiles="${PYPI_SITE}/a/ansible-compat/ansible-compat-${version}.tar.gz"
+checksum=d7dc5e4b7fade9b7375c568a24475b7be81024cac2a20caef3260ef0b51287b4
post_patch() {
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
From 277cb04e17da6f55f93d00a3860c2e8471ac9361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 1 Feb 2023 21:03:05 +0100
Subject: [PATCH 219/356] python3-ansible-lint: update to 6.12.0.
---
srcpkgs/python3-ansible-lint/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index bd14f14474cb..caf694a16080 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ansible-lint'
pkgname=python3-ansible-lint
-version=6.11.0
+version=6.12.0
revision=1
build_style=python3-pep517
make_install_target="dist/ansible_lint-*-*-*-*.whl"
@@ -18,7 +18,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only"
homepage="https://github.com/ansible/ansible-lint"
distfiles="${PYPI_SITE}/a/ansible-lint/ansible-lint-${version}.tar.gz"
-checksum=348ac356c3817a6db98fb6993ec17b5b236c16312238759f0a3f14f3543a9e50
+checksum=887e88262dbd9e2cbb5b7a70a94d945a8a2791d1467cf30af49c22b60899b40b
# cba anymore, the list of failing tests changes with every update
make_check="no"
From d248a92d9ebae08bbacfc2a07c485982064cc62a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sat, 28 Jan 2023 01:19:46 +0530
Subject: [PATCH 220/356] gscreenshot: update to 3.3.0.
---
srcpkgs/gscreenshot/template | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template
index 008172670ed4..a9af8ac0d8ee 100644
--- a/srcpkgs/gscreenshot/template
+++ b/srcpkgs/gscreenshot/template
@@ -1,15 +1,20 @@
# Template file for 'gscreenshot'
pkgname=gscreenshot
-version=2.17.1
-revision=2
+version=3.3.0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools gettext"
-depends="gtk+3 python3-setuptools python3-Pillow python3-gobject scrot"
-short_desc="GUI front-end for the scrot program"
+hostmakedepends="python3-setuptools gettext go-md2man"
+# refer to https://github.com/thenaterhood/gscreenshot#installation
+# for optional dependencies across system configurations
+depends="gtk+3 python3-setuptools python3-Pillow python3-gobject"
+checkdepends="${depends} python3-mock python3-pytest"
+short_desc="GUI for multiple screenshot backends including scrot, PIL, and grim"
maintainer="Rui Flora <rui.flora@gmail.com>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
homepage="https://github.com/thenaterhood/gscreenshot"
-distfiles="https://github.com/thenaterhood/gscreenshot/archive/v${version}.tar.gz"
-checksum=f0cdf81e9ab483e11c04ed27141ac37dd6f24415968bc5f4c874e7b17ca5958d
-# doesn't ship any tests
-make_check=no
+distfiles="https://github.com/thenaterhood/gscreenshot/archive/refs/tags/v${version}.tar.gz"
+checksum=f05e695676cda97483c6cdbebaba9a708b5791e544e977016a772325a1d37231
+
+do_check() {
+ (cd src && PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest ../test)
+}
From 4c84ed49aeb577d038b6a445fe9193902407e553 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 00:10:31 +0000
Subject: [PATCH 221/356] python3-pythondialog: update to 3.5.3.
---
srcpkgs/python3-pythondialog/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-pythondialog/template b/srcpkgs/python3-pythondialog/template
index 76cc1bd41b2b..097380fd92d1 100644
--- a/srcpkgs/python3-pythondialog/template
+++ b/srcpkgs/python3-pythondialog/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pythondialog'
pkgname=python3-pythondialog
-version=3.5.1
-revision=4
+version=3.5.3
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
@@ -9,6 +9,7 @@ depends="python3 dialog"
short_desc="Python wrapper for the dialog utility"
maintainer="svenper <svenper@tuta.io>"
license="LGPL-2.1-or-later"
-homepage="http://pythondialog.sourceforge.net"
+homepage="https://pythondialog.sourceforge.io"
+changelog="https://pythondialog.sourceforge.io/news.html"
distfiles="${PYPI_SITE}/p/pythondialog/pythondialog-${version}.tar.gz"
-checksum=34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8
+checksum=b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323
From c415fa3d7f230bda5b24ab617371106a2fd8c60e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 23 Jan 2023 21:41:40 +0000
Subject: [PATCH 222/356] libheif: update to 1.14.2.
---
srcpkgs/libheif/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 48b4279b9f3a..59d6fe2778c2 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,18 +1,18 @@
# Template file for 'libheif'
pkgname=libheif
-version=1.12.0
-revision=3
+version=1.14.2
+revision=1
build_style=gnu-configure
-configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
libaom-devel"
short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="LGPL-3.0-or-later"
-homepage="http://www.libheif.org"
+homepage="https://github.com/strukturag/libheif"
+changelog="https://github.com/strukturag/libheif/releases"
distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz"
-checksum=086145b0d990182a033b0011caadb1b642da84f39ab83aa66d005610650b3c65
+checksum=e9c88e75e3b7fad9df32e42d28646752de2679df57efddfb3f63cd25110ce9d9
pre_configure() {
./autogen.sh
From d640a72dd28787994b6750e1aaf00e23584db932 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:15:09 +0000
Subject: [PATCH 223/356] fontconfig: update to 2.14.2.
---
srcpkgs/fontconfig/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 636df1d5da7b..bb76f8f95d24 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,6 +1,6 @@
# Template file for 'fontconfig'
pkgname=fontconfig
-version=2.14.1
+version=2.14.2
revision=1
build_style=gnu-configure
configure_args="--enable-static --enable-docs --with-cache-dir=/var/cache/${pkgname}"
@@ -12,12 +12,12 @@ short_desc="Library for configuring and customizing font access"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://www.fontconfig.org"
-distfiles="${FREEDESKTOP_SITE}/${pkgname}/release/${pkgname}-${version}.tar.xz"
-checksum=298e883f6e11d2c5e6d53c8a8394de58d563902cfab934e6be12fb5a5f361ef0
+distfiles="${FREEDESKTOP_SITE}/fontconfig/release/fontconfig-${version}.tar.xz"
+checksum=dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b
post_install() {
if [ "$CROSS_BUILD" ]; then
- sed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
+ vsed -i 's,\(Cflags: -I${includedir}\).*,\1,g' ${DESTDIR}/usr/lib/pkgconfig/fontconfig.pc
fi
vlicense COPYING
}
From d26a8702c6c88433cd406e8d32a7952d810c16f9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Tue, 31 Jan 2023 20:54:11 +0000
Subject: [PATCH 224/356] popt: update to 1.19.
---
srcpkgs/popt/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index e7eabf2b1f07..3973f667d917 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -1,15 +1,16 @@
# Template file for 'popt'
pkgname=popt
-version=1.18
+version=1.19
revision=1
build_style=gnu-configure
hostmakedepends="autoconf tar automake libtool gettext-devel"
short_desc="Command line option parsing library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://rpm.org/"
-distfiles="http://ftp.rpm.org/popt/releases/popt-1.x/popt-${version}.tar.gz"
-checksum=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1
+homepage="https://github.com/rpm-software-management/popt"
+changelog="https://github.com/rpm-software-management/popt/releases"
+distfiles="https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/popt-${version}.tar.gz"
+checksum=c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9
pre_configure() {
./autogen.sh
@@ -20,7 +21,7 @@ post_install() {
}
popt-devel_package() {
- depends="popt>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From ad5eb4c39868559181a0e67f8a3d6973c27a8670 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 30 Jan 2023 16:45:43 +0000
Subject: [PATCH 225/356] libcap: update to 2.67.
---
srcpkgs/libcap/template | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 13c13bcd2822..b1586d3dd7ac 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,6 +1,6 @@
# Template file for 'libcap'
pkgname=libcap
-version=2.54
+version=2.67
revision=1
bootstrap=yes
build_style=gnu-makefile
@@ -10,20 +10,15 @@ make_use_env=yes
short_desc="POSIX.1e capabilities suite"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="GPL-2.0-only"
-homepage="http://sites.google.com/site/fullycapable/"
+homepage="https://sites.google.com/site/fullycapable/"
changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
-distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
-checksum=5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f
+distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/libcap-${version}.tar.xz"
+checksum=ce9b22fdc271beb6dae7543da5f74cf24cb82e6848cfd088a5a069dec5ea5198
if [ "$CROSS_BUILD" ]; then
make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-fi
-
-if [ "$CHROOT_READY" ]; then
- hostmakedepends="perl"
- if [ -z "$CROSS_BUILD" ]; then
- hostmakedepends+=" gperf"
- fi
+elif [ "$CHROOT_READY" ]; then
+ hostmakedepends="gperf"
fi
libcap-devel_package() {
From 4b15b137dba7707b19fa8c16770aebf49e0c23d8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:36:30 +0000
Subject: [PATCH 226/356] ghostscript: update to 10.0.0.
---
common/shlibs | 2 +-
srcpkgs/ghostscript/patches/fix-cross.patch | 37 +++++++++++++++++++
.../fix_gscms_transform_color_typo.patch | 11 ------
srcpkgs/ghostscript/template | 8 ++--
4 files changed, 43 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/ghostscript/patches/fix-cross.patch
delete mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..3042ced11d4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1059,7 +1059,7 @@ libcupscgi.so.1 libcups-1.5.3_1
libcups.so.2 libcups-1.5.3_1
libcupsimage.so.2 libcups-1.5.3_1
libijs-0.35.so libijs-0.8_1
-libgs.so.9 libgs-0.8_1
+libgs.so.10 libgs-10.0.0_1
libssh2.so.1 libssh2-1.9.0_3
libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1
libsnmp.so.40 libnet-snmp-5.9_2
diff --git a/srcpkgs/ghostscript/patches/fix-cross.patch b/srcpkgs/ghostscript/patches/fix-cross.patch
new file mode 100644
index 000000000000..d3f70b435bb3
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/fix-cross.patch
@@ -0,0 +1,37 @@
+From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 24 Nov 2022 16:33:47 +0000
+Subject: [PATCH] Fix a little bitrot in the cross-compiling logic
+
+Removing the option to disable FAPI meant configuring for cross compiling would
+fail because the option being passed to the sub-call to configure would include
+an unknown command line option.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d5c68c4b3..738eb10a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then
+ echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in
+
+ AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)])
+- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
++ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers=""
+ status=$?
+ cp config.log "$olddir/configaux.log"
+ if test $status -eq 0 ; then
+@@ -2530,7 +2530,7 @@ PDF=
+ PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+ PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak"
+
+-if test x"$with_pdf" != x"no" ; then
++if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then
+
+ if test x"$JBIG2_DECODER" = x""; then
+ AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support])
+--
+2.25.1
+
diff --git a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
deleted file mode 100644
index 9ffa2e09ba66..000000000000
--- a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./base/gsicc_lcms2.c.jlg 2021-09-27 03:44:02.000000000 -0400
-+++ ./base/gsicc_lcms2.c 2021-10-05 10:50:03.428000000 -0400
-@@ -462,7 +462,7 @@
- gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
- void *outputcolor, int num_bytes)
- {
-- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
-+ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
- }
-
- int
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 8bce83846ad8..dce91a71ae0e 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,6 +1,6 @@
# Template file for 'ghostscript'
pkgname=ghostscript
-version=9.55.0
+version=10.0.0
revision=1
hostmakedepends="automake libtool pkg-config"
makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
@@ -10,9 +10,9 @@ short_desc="Interpreter for the PostScript language"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later, CPL-1.0"
homepage="https://www.ghostscript.com/"
-changelog="https://www.ghostscript.com/doc/${version}/News.htm"
+changelog="https://ghostscript.readthedocs.io/en/latest/News.html"
distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
+checksum=f1fa585f7c7d32adfa81ab389388100ac9df83444eb64db1fb92737141ef9f61
build_options="cups"
build_options_default="cups"
@@ -28,6 +28,8 @@ pre_configure() {
# add missing LDFLAGS
sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak
+ autoreconf -fi
+
cd ijs
autoreconf -fi
}
From 88d9cc6826523e631f38efcbed47492ec7495d6c Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:25 +0000
Subject: [PATCH 227/356] gimp: revbump for libgs-10.0.0.
---
srcpkgs/gimp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index fb6cb95ff96c..98fe2d367bd3 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.32
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
From 4292080cdad4148645a58e67a5e6d42173c7d2a9 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:25 +0000
Subject: [PATCH 228/356] ImageMagick: revbump for libgs-10.0.0.
---
srcpkgs/ImageMagick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index e98161479198..373154f1e856 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
# Template file for 'ImageMagick'
pkgname=ImageMagick
version=7.1.0.60
-revision=1
+revision=2
_upstream_version="${version/.${version##*.}/-${version##*.}}"
build_style=gnu-configure
configure_args="--disable-static --enable-opencl --with-modules --with-gslib
From d8cc6223e6be543c0dd55e2932f3d57b0660b332 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 22 Jan 2023 14:41:26 +0000
Subject: [PATCH 229/356] libspectre: revbump for libgs-10.0.0.
---
srcpkgs/libspectre/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template
index b8afe7840c9b..64fdd6e8ec3a 100644
--- a/srcpkgs/libspectre/template
+++ b/srcpkgs/libspectre/template
@@ -1,7 +1,7 @@
# Template file for 'libspectre'
pkgname=libspectre
version=0.2.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
makedepends="ghostscript-devel"
From 0c06db8c9ac63000cc0a13af4a83b9472ddba1a7 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 6 Feb 2023 07:56:01 +1000
Subject: [PATCH 230/356] k9s: update to 0.27.2
---
srcpkgs/k9s/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 5fc1cbe54f73..0246edccc7ab 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
# Template file for 'k9s'
pkgname=k9s
-version=0.26.7
+version=0.27.2
revision=1
build_style=go
go_import_path="github.com/derailed/k9s"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://k9scli.io/"
distfiles="https://github.com/derailed/k9s/archive/v${version}.tar.gz"
-checksum=33365e0773210f50013ae3b8e749269b27ff4c7624e8ab17e1a81bfe0c8879dd
+checksum=893b8f3059868944dc74f8c0a175fd4305a8286910c5cdab1f0d7e70719b59c1
# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
From 321818211e0c2ce873a89aa49f0013de03e9caad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 5 Feb 2023 18:33:53 -0600
Subject: [PATCH 231/356] ffuf: update to 2.0.0.
---
srcpkgs/ffuf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 0b697718c45a..9b1fb612e6f9 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
# Template file for 'ffuf'
pkgname=ffuf
-version=1.5.0
+version=2.0.0
revision=1
build_style=go
go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/ffuf/ffuf"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=70dc411c014c826f9c8a7b021e01d5bc50e2cba17e0dcc4df3e2e2574ad12073
+checksum=bc27b19ed78b31862b1922a3adb66839cdf58c9b799a715c206709a73e2583d0
post_install() {
vlicense LICENSE
From 09eb9036e5514bf35a2088502bb0a0a1c2066c1e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 31 Jan 2023 09:17:44 -0500
Subject: [PATCH 232/356] umurmur: patch for openssl3
---
.../umurmur/patches/remove-crypto-mem-ctrl.patch | 16 ++++++++++++++++
srcpkgs/umurmur/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
diff --git a/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch b/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
new file mode 100644
index 000000000000..17a9e5b3b0d2
--- /dev/null
+++ b/srcpkgs/umurmur/patches/remove-crypto-mem-ctrl.patch
@@ -0,0 +1,16 @@
+From: https://git.alpinelinux.org/aports/plain/main/umurmur/remove-crypto-mem-ctrl.patch
+
+fix build with OpenSSL 3
+
+--- umurmur-0.2.20.orig/src/ssli_openssl.c
++++ umurmur-0.2.20/src/ssli_openssl.c
+@@ -142,8 +142,6 @@
+
+ Log_info("Generating new server certificate.");
+
+- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+-
+ x509 = X509_new();
+ if (!x509)
+ goto err_out;
+
diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 11eb69f05b07..a5690d44de4b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,7 +1,7 @@
# Template file for 'umurmur'
pkgname=umurmur
version=0.2.20
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-shmapi --with-ssl=openssl"
conf_files="/etc/umurmur/umurmur.conf"
From ae5c04bd1c7da04f2362b22f0b4c4c676abaf78b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 3 Feb 2023 12:37:41 +0530
Subject: [PATCH 233/356] iwd: update to 2.3.
---
srcpkgs/iwd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 17c0799ce7be..e4f73dc1c4ad 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
# Template file for 'iwd'
pkgname=iwd
-version=2.2
+version=2.3
revision=1
build_style=gnu-configure
configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
homepage="https://iwd.wiki.kernel.org/"
changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=dfeada6d1680221fb128dc6be50fc2d6b40e314b98458acbd696418f8da5c570
+checksum=b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64
make_dirs="/var/lib/iwd 0600 root root
/var/lib/ead 0600 root root
/etc/iwd 755 root root"
From f9f7be5f38167cca189d16e7e881039fc548ab69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 6 Feb 2023 16:07:08 +0100
Subject: [PATCH 234/356] homebank: update to 5.6.2.
---
srcpkgs/homebank/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index f2264827e245..c54158bfdb7a 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
# Template file for 'homebank'
pkgname=homebank
-version=5.6.1
+version=5.6.2
revision=1
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="GPL-2.0-or-later"
homepage="http://homebank.free.fr/"
distfiles="http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"
-checksum=3a489c31c553269ab8aa014fdd0eea90fc21d5715e8c1dc5d0feaf730ef38f0f
+checksum=12ebde58e04d3c18496f95496067c4e8841b0d111668d1f47c239292b15316f1
post_patch() {
vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
From ac7a37ac2619fdd249f65483b566b60322e89d8e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 13:01:31 -0500
Subject: [PATCH 235/356] dnscrypt-proxy: update to 2.1.3, adopt
---
srcpkgs/dnscrypt-proxy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index fa49259e6355..4172fd0a9d5a 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,17 +1,17 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
-version=2.1.2
+version=2.1.3
revision=1
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
go_package="${go_import_path}/dnscrypt-proxy"
short_desc="DNS proxy that encrypts queries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=aa55fd52b9c1b983405bf98b42ec754f5d6f59b429ba9c98115df617eef5dea4
+checksum=6163ab3169edd2158f585dff2ddba416b2d29fd4b44b4cc794365fca666a726a
conf_files="/etc/dnscrypt-proxy.toml"
system_accounts="dnscrypt_proxy"
make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
From b53f224ed4bb8d8ed8e19697d5bc7209eaf0b7c3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:09:28 -0500
Subject: [PATCH 236/356] aravis: update to 0.8.24.
---
srcpkgs/aravis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
index 1d9c727f9ba7..d0f1c1be1615 100644
--- a/srcpkgs/aravis/template
+++ b/srcpkgs/aravis/template
@@ -1,6 +1,6 @@
# Template file for 'aravis'
pkgname=aravis
-version=0.8.22
+version=0.8.24
revision=1
build_style=meson
configure_args="-Ddocumentation=enabled"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/AravisProject/aravis"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b95187e7cea9533ac5f2f79cd84f9f8ce7247f03c110199998849e934989fcc9
+checksum=1504503b057b97e8cdb95decf84a2f348012eda4a4f45b9fe7b7eadb4b809990
# Network test causes timeout in CI
make_check=ci-skip
From 969e8dbcd6024656379cc4517a51f44ed7157835 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:32:11 -0500
Subject: [PATCH 237/356] maturin: update to 0.14.12.
---
srcpkgs/maturin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 236bf50a72d8..a24314a84c50 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
# Template file for 'maturin'
pkgname=maturin
-version=0.14.10
+version=0.14.12
revision=1
create_wrksrc=yes
build_style=python3-module
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
_tlver="0.12.5"
distfiles="${homepage}/archive/v${version}.tar.gz
https://github.com/bytecodealliance/target-lexicon/archive/v${_tlver}.tar.gz>target-lexicon-${_tlver}.tar.gz"
-checksum="8fc9bcdcb7f1535d5e3e8bb500c348ca1bff5a6dce87b0ab7dbc5a49723da28a
+checksum="b1b665ffdfe6fa7f6f7e3ee2b7c3927567dbebea704141ab30dae3a88aba82be
efc488676998ea73d107b0c2632cc71baff91b5ea95abb6064b48a09edc233f9"
# Tests use unstable features and fail to build
make_check=no
From 12b1dd0929153622ba916a969f3c1d2c6beade8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:33:34 -0500
Subject: [PATCH 238/356] python3-hypothesis: update to 6.67.0.
---
srcpkgs/python3-hypothesis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 10be6501a5fa..a8789a5f5be5 100644
--- a/srcpkgs/python3-hypothesis/template
+++ b/srcpkgs/python3-hypothesis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-hypothesis'
pkgname=python3-hypothesis
-version=6.65.0
+version=6.67.0
revision=1
build_wrksrc=hypothesis-python
build_style=python3-module
@@ -14,7 +14,7 @@ license="MPL-2.0"
homepage="https://hypothesis.works/"
changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=f1cea50419e4bfacd417aed13b5021c8ce745ced70da16669abb77cffb76284b
+checksum=77f8f9ea5a3da74429e6286515b6d99ebac9c54e470e2c9d8cdbe53916304e1b
do_check() {
# Manually run the tests that tox considers part of the "full" suite,
From 6ded72c7b9c03b314472b4e76ef4641e68fa967d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:34:57 -0500
Subject: [PATCH 239/356] python3-numpy: update to 1.24.2.
---
srcpkgs/python3-numpy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index e8e76d2e8e6b..e6eebf824fd4 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -1,6 +1,6 @@
# Template file for 'python3-numpy'
pkgname=python3-numpy
-version=1.24.1
+version=1.24.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython gcc-fortran"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://www.numpy.org/"
distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=2b65ddcf1de667ce870f36a0752e6459c5db2019f9eac56d259277a36b964ce2
+checksum=eefc0ac5c0d6346675b9e77cbf72fbb3b78b6003fc0b4fededc6b55c35dbff2d
alternatives="numpy:f2py:/usr/bin/f2py3"
# Tests do not function propery in a build directory
make_check="no"
From 31906d023c2b9a3902758cbac252bc924a2fca98 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:07 -0500
Subject: [PATCH 240/356] python3-pip: update to 23.0.
---
srcpkgs/python3-pip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 066553a9645b..4695098ee4c2 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pip'
pkgname=python3-pip
-version=22.3.1
+version=23.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://pip.pypa.io/"
changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38
+checksum=aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b
# Tests have unpackaged dependencies
make_check=no
From e8c7d14f954bf17940389660e46a22d98285e20b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:14 -0500
Subject: [PATCH 241/356] python3-tifffile: update to 2023.2.3.
---
srcpkgs/python3-tifffile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index d385f70bf249..0b8a3bbcdfaf 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tifffile'
pkgname=python3-tifffile
-version=2023.1.23.1
+version=2023.2.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
homepage="https://github.com/cgohlke/tifffile"
changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=523ef674d75ee34d713578f28a20b18d8a5cbc89165a90f3fd7339be5de2921e
+checksum=6c245e8087b5ee6106f3f056abfc60abae05323c1a1d5e5f41a51a9ec05eb820
# Tests require unpackaged fsspec
make_check=no
From 9b333c5cf2cd9f1849e42d224e8f38493b7698c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:23 -0500
Subject: [PATCH 242/356] python3-setuptools: update to 67.1.0.
---
srcpkgs/python3-setuptools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 97a3e587818a..28bd7143f18e 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=66.1.1
+version=67.1.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel"
@@ -11,7 +11,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=ac4008d396bc9cd983ea483cb7139c0240a07bbc74ffb6232fceffedc6cf03a8
+checksum=e261cdf010c11a41cb5cb5f1bf3338a7433832029f559a6a7614bd42a967c300
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From cf18ae59951678362bf008dcf4e9e8724f635618 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:31 -0500
Subject: [PATCH 243/356] mtools: update to 4.0.42.
---
srcpkgs/mtools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index 764493a5f5e6..c063430d56fc 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
# Template file for 'mtools'
pkgname=mtools
-version=4.0.41
+version=4.0.42
revision=1
build_style=gnu-configure
makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/mtools"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2542152264fb3eff7ed70662abf4f4eef8133bc37d0b7a686c240df2b5f80a13
+checksum=64bfdfde4d82af6b22f3c1c72c3e231cbb618f4c2309cc46f54d16d5502ccf15
conf_files="/etc/mtools.conf"
post_extract() {
From 146bdf841943eb80efcc5ea0c2e9629eff61e6b3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:35:38 -0500
Subject: [PATCH 244/356] dnsmasq: update to 2.89.
---
srcpkgs/dnsmasq/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index ce8536b96140..b1c984f7dc4f 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
# Template file for 'dnsmasq'
pkgname=dnsmasq
-version=2.88
+version=2.89
revision=1
conf_files="/etc/dnsmasq.conf"
hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://www.thekelleys.org.uk/dnsmasq/doc.html"
changelog="https://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
distfiles="https://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=da9d26aa3f3fc15f3b58b94edbb9ddf744cbce487194ea480bd8e7381b3ca028
+checksum=8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4
system_accounts="dnsmasq"
dnsmasq_homedir="/var/chroot"
From 160797181824675aa060df48025325c780afaa48 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 6 Feb 2023 11:37:30 -0500
Subject: [PATCH 245/356] fuse3: update to 3.13.1.
---
srcpkgs/fuse3/patches/use_off_t.patch | 51 ---------------------------
srcpkgs/fuse3/template | 4 +--
2 files changed, 2 insertions(+), 53 deletions(-)
delete mode 100644 srcpkgs/fuse3/patches/use_off_t.patch
diff --git a/srcpkgs/fuse3/patches/use_off_t.patch b/srcpkgs/fuse3/patches/use_off_t.patch
deleted file mode 100644
index c8c986358a03..000000000000
--- a/srcpkgs/fuse3/patches/use_off_t.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 19d95c0e701076407dc1f3cfd39e12e28b332927 Mon Sep 17 00:00:00 2001
-From: psykose <alice@ayaya.dev>
-Date: Sat, 14 Jan 2023 21:31:56 +0000
-Subject: [PATCH] use off_t over __off64_t
-
-when -D_FILE_OFFSET_BITS=64 is defined, the off_t type is 64 bits wide
-already. the fuse_common.h header already checks for this, and errors
-when it is not, so be consistent with all the other uses of off_t.
-
-some libcs like musl do not have a 32-bit off_t type, and don't define
-__off64_t.
----
- example/hello_ll_uds.c | 4 ++--
- include/fuse_lowlevel.h | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c
-index c1f64d7b..f291fed9 100644
---- a/example/hello_ll_uds.c
-+++ b/example/hello_ll_uds.c
-@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) {
- return (res == -1) ? res : (res + prev_res);
- }
-
--static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata) {
- (void)userdata;
-
-diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
-index ff0d966e..96088d7a 100644
---- a/include/fuse_lowlevel.h
-+++ b/include/fuse_lowlevel.h
-@@ -130,11 +130,11 @@ struct fuse_forget_data {
- struct fuse_custom_io {
- ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata);
- ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata);
-- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata);
-- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout,
-- __off64_t *offout, size_t len,
-+ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout,
-+ off_t *offout, size_t len,
- unsigned int flags, void *userdata);
- };
-
diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template
index f0f36a13a40a..5fcf41be2e86 100644
--- a/srcpkgs/fuse3/template
+++ b/srcpkgs/fuse3/template
@@ -1,6 +1,6 @@
# Template file for 'fuse3'
pkgname=fuse3
-version=3.13.0
+version=3.13.1
revision=1
build_style=meson
configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/libfuse/libfuse"
changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst"
distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz"
-checksum=1e54d3ee1d7d04f41e77617c4f7514f611b94332215dd88394bd82803032752a
+checksum=6cd0759944c9aeb3d078b24a97b8a5cd5d49a0b8b7f15f85f32ac0c8a662fb6e
conf_files="/etc/fuse.conf"
# Tests require root
make_check=no
From 57ef34288b4aa9395652acaaaa8d14a11990a8a1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 5 Feb 2023 22:49:50 +0100
Subject: [PATCH 246/356] python3-pyinfra: update to 2.6.2.
---
srcpkgs/python3-pyinfra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 8607aac22bb4..c0c87bbeb688 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pyinfra'
pkgname=python3-pyinfra
-version=2.6.1
+version=2.6.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="MIT"
homepage="https://pyinfra.com/"
changelog="https://github.com/Fizzadar/pyinfra/blob/HEAD/CHANGELOG.md"
distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=20a89a8be8d0bcd310439b8558595fe8e4750457ddf82c01ca9cbad7c79bec68
+checksum=778cbc318037c5884b090930c773ef88c2776fc710ff23bb921aac8b786bee5b
post_extract() {
vsed -i -e '/configparser/d' setup.py # is in Python 3.8
From 5fb6eeb7856fa2be947a7dfd97f23c0a7e6f2482 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 3 Feb 2023 21:51:22 +0100
Subject: [PATCH 247/356] xvidtune: update to 1.0.4.
---
srcpkgs/xvidtune/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/xvidtune/template b/srcpkgs/xvidtune/template
index 04f99a360680..5b960f97c75c 100644
--- a/srcpkgs/xvidtune/template
+++ b/srcpkgs/xvidtune/template
@@ -1,7 +1,7 @@
# Template build file for 'xvidtune'.
pkgname=xvidtune
-version=1.0.3
-revision=4
+version=1.0.4
+revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libXaw-devel libXxf86vm-devel"
@@ -9,8 +9,8 @@ short_desc="Video mode tuner for Xorg"
homepage="http://xorg.freedesktop.org"
license="MIT"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5
post_install() {
vlicense COPYING
From c60df403c277281d9b63efab0f4d00746e5f8679 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 4 Feb 2023 18:52:15 +0100
Subject: [PATCH 248/356] erlang: update to 25.2.2.
---
srcpkgs/erlang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 4fb51a6651bf..058bb35255f6 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
# Template file for 'erlang'
pkgname=erlang
-version=25.2.1
+version=25.2.2
revision=1
build_style=gnu-configure
make_install_target="install install-docs"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="http://www.erlang.org/"
changelog="https://github.com/erlang/otp/releases"
distfiles="https://github.com/erlang/otp/archive/OTP-${version}.tar.gz"
-checksum=d044e3699cb5261127da4bf37a495534bde85c37709f07735efc91f290f51da7
+checksum=535e535b2e90e71deca96c53f19710e6ebf3d4289b0a3116e7cf83b7e2c4bb7e
subpackages="erlang-doc"
if [ -z "$CROSS_BUILD" ]; then
From b19fc6b3024151015935760949689bba0d652d29 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Feb 2023 21:36:35 +0100
Subject: [PATCH 249/356] vttest: update to 20230201.
---
srcpkgs/vttest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template
index 49246ad3755b..082f42cc7421 100644
--- a/srcpkgs/vttest/template
+++ b/srcpkgs/vttest/template
@@ -1,6 +1,6 @@
# Template file for 'vttest'
pkgname=vttest
-version=20221229
+version=20230201
revision=1
build_style=gnu-configure
short_desc="Tests the compatibility so-called 'VT100-compatible' terminals"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://invisible-island.net/vttest/vttest.html"
distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz"
-checksum=6b6a109acaf0569cf7660d20dcd153b83e328e9b93dae4e73b985bbcc6b18bf8
+checksum=27f4300791e7cbcf9d15f88421f98e35d3aee66311368430624e2c1a5a8be683
post_install() {
vlicense COPYING
From 095e1a4ec2964bb28f948ba6ad8889f03bcaebda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 6 Feb 2023 22:08:45 +0100
Subject: [PATCH 250/356] rex: update to 1.14.0.
---
srcpkgs/rex/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rex/template b/srcpkgs/rex/template
index a493cf9aecc2..3ea32dfd7548 100644
--- a/srcpkgs/rex/template
+++ b/srcpkgs/rex/template
@@ -1,6 +1,6 @@
# Template file for 'rex'
pkgname=rex
-version=1.13.4
+version=1.14.0
revision=1
build_style=perl-module
hostmakedepends="perl perl-AWS-Signature4 perl-Clone-Choose
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="http://www.rexify.org/"
distfiles="https://cpan.metacpan.org/authors/id/F/FE/FERKI/Rex-${version}.tar.gz"
-checksum=a86e9270159b41c9a8fce96f9ddc97c5caa68167ca4ed33e97908bfce17098cf
+checksum=447c496e46848ca17d96497a258169da9bdc290bab446514ec57ccfe6e654b3f
post_install() {
vinstall share/rex-tab-completion.bash 644 usr/share/bash-completion/completions rex
From f915d2ef44eece47c7ae275340da6ed777aec9f1 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 6 Feb 2023 14:39:48 -0500
Subject: [PATCH 251/356] vpn-ws: add cflag to build with openssl3
---
srcpkgs/vpn-ws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index 498ca5775a82..73d6697ea34b 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,7 +1,7 @@
# Template file for 'vpn-ws'
pkgname=vpn-ws
version=0.2
-revision=7
+revision=8
build_style=gnu-makefile
make_use_env=yes
makedepends="openssl-devel"
@@ -12,7 +12,7 @@ homepage="https://github.com/unbit/vpn-ws"
distfiles="https://github.com/unbit/vpn-ws/archive/v${version}.tar.gz"
checksum=f35d16d192ef333390ccc7d342df4392676a86502fa087f310eab9758afd565a
-CFLAGS+=" -Wno-stringop-truncation -fcommon"
+CFLAGS+=" -Wno-stringop-truncation -fcommon -Wno-deprecated-declarations"
# no install target in the Makefile
do_install() {
From 61414bb878e56bc25bffb85c6b1b7dcd7e4efb7e Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 7 Feb 2023 00:33:42 +0100
Subject: [PATCH 252/356] hopper: update to 5.8.6.
---
srcpkgs/hopper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 6a465659f582..eadb6fe5b34c 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
# Template file for 'hopper'
pkgname=hopper
-version=5.8.5
+version=5.8.6
revision=1
_build=1
create_wrksrc=yes
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:EULA"
homepage="https://www.hopperapp.com"
distfiles="https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-v4-${version}-Linux-demo.pkg.tar.xz"
-checksum=5af72c42f59538f1c786d18042dc5e43d46a3b5afa6f92500251af7176a54655
+checksum=1c9376a8aebad2b0b6aeee8e8583784f008809a6a37f111e6a0ce2a194e55f2a
archs="x86_64"
restricted=yes
From d49ae3b99020f774681d00c29c5afe6017db37b0 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Tue, 7 Feb 2023 00:34:03 +0100
Subject: [PATCH 253/356] docker-gen: update to 0.9.4.
---
srcpkgs/docker-gen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 98d0dee456a1..bdda8a926285 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -1,6 +1,6 @@
# Template file for 'docker-gen'
pkgname=docker-gen
-version=0.9.3
+version=0.9.4
revision=1
build_style=go
go_import_path="github.com/nginx-proxy/docker-gen"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/nginx-proxy/docker-gen"
distfiles="https://github.com/nginx-proxy/docker-gen/archive/refs/tags/${version}.tar.gz"
-checksum=7ba1fbd10648f91f175d082a9994ce10a352c87c4a65b676c55d98eeec1d816d
+checksum=4c25f9a876d90710586fce38ec18336fc9b679e5a6237df458f5674ca82b3d8b
post_install() {
vlicense LICENSE
From 4af6bf4a39f2d4f30624427a6a3ba62d3c47b5f1 Mon Sep 17 00:00:00 2001
From: Goran Vukoman <g@numerys.net>
Date: Sun, 5 Feb 2023 22:48:39 +0100
Subject: [PATCH 254/356] New package: hunspell-nl_NL-2.20.19.
---
srcpkgs/hunspell-nl_NL/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/hunspell-nl_NL/template
diff --git a/srcpkgs/hunspell-nl_NL/template b/srcpkgs/hunspell-nl_NL/template
new file mode 100644
index 000000000000..e3d6a0dd93f1
--- /dev/null
+++ b/srcpkgs/hunspell-nl_NL/template
@@ -0,0 +1,16 @@
+# Template file for 'hunspell-nl_NL'
+pkgname=hunspell-nl_NL
+version=2.20.19
+revision=1
+short_desc="Dutch nl_NL dictionary for hunspell"
+maintainer="Goran Vukoman <g@numerys.net>"
+license="BSD-3-Clause, CC-BY-3.0"
+homepage="https://www.opentaal.org/"
+distfiles="https://github.com/OpenTaal/opentaal-hunspell/archive/refs/tags/${version}.tar.gz"
+checksum=0a86ec393450d7070bd69ee83f69c37ff27dbbc5fe684803375f113d7128bd87
+
+do_install() {
+ vinstall nl.aff 644 /usr/share/hunspell nl_NL.aff
+ vinstall nl.dic 644 /usr/share/hunspell nl_NL.dic
+ vlicense LICENSE.txt
+}
From 69b015b610c16dd641207741fba189a4cc5639f2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 6 Feb 2023 22:58:42 -0500
Subject: [PATCH 255/356] chezmoi: update to 2.30.0.
---
srcpkgs/chezmoi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 14b704281434..49c0178f3566 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
-version=2.29.4
+version=2.30.0
revision=1
build_style=go
go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="MIT"
homepage="https://chezmoi.io/"
distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=3205d4519251b3e9a016fc6579bc0363361ad7d037ed17c8bf1ee8bdb9ffa9cd
+checksum=4cb96b898ef178a2e832eab7954ec675ded116fc44944d5026ec6f95be1144c7
pre_build() {
local _date
From 7b2fb21c3a8ab5b98159da579e74e9d6226401c1 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 11:26:56 +0530
Subject: [PATCH 256/356] lua-language-server: update to 3.6.10.
---
srcpkgs/lua-language-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua-language-server/template b/srcpkgs/lua-language-server/template
index 82da0ffeb8bf..7ca059600c2f 100644
--- a/srcpkgs/lua-language-server/template
+++ b/srcpkgs/lua-language-server/template
@@ -1,6 +1,6 @@
# Template file for 'lua-language-server'
pkgname=lua-language-server
-version=3.6.4
+version=3.6.10
revision=1
create_wrksrc=yes
hostmakedepends="ninja"
@@ -10,7 +10,7 @@ license="MIT"
homepage="https://github.com/sumneko/lua-language-server"
changelog="https://raw.githubusercontent.com/sumneko/lua-language-server/master/changelog.md"
distfiles="https://github.com/sumneko/lua-language-server/releases/download/${version}/lua-language-server-${version}-submodules.zip"
-checksum=e506731636b3683359dea000a927fe7696a3ea6f0cc6fb1526a77dabe2013ae7
+checksum=3dbbe70901540e1e217d5e4744e528399a92201eb63c35545c0cf1936ffb1efc
do_build() {
ninja -C 3rd/luamake -f compile/ninja/linux.ninja
From efa6a2a6b463519471fe0ecb8c8465072284586d Mon Sep 17 00:00:00 2001
From: lz-coder <lzcoder@proton.me>
Date: Fri, 20 Jan 2023 02:34:40 -0300
Subject: [PATCH 257/356] New package: chrono-date-3.0.1
---
common/shlibs | 1 +
srcpkgs/chrono-date-devel | 1 +
.../538_output_date_pc_for_pkg_config.patch | 60 +++++++++++++++++++
.../disable_buggy_libstdc++_tests.patch | 30 ++++++++++
srcpkgs/chrono-date/patches/get_info.patch | 24 ++++++++
srcpkgs/chrono-date/patches/sys_info.patch | 29 +++++++++
srcpkgs/chrono-date/template | 29 +++++++++
7 files changed, 174 insertions(+)
create mode 120000 srcpkgs/chrono-date-devel
create mode 100644 srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
create mode 100644 srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
create mode 100644 srcpkgs/chrono-date/patches/get_info.patch
create mode 100644 srcpkgs/chrono-date/patches/sys_info.patch
create mode 100644 srcpkgs/chrono-date/template
diff --git a/common/shlibs b/common/shlibs
index 3042ced11d4b..504d29f4cb98 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4224,3 +4224,4 @@ libIlmThread-3_1.so.30 libopenexr-3.1.5_1
libOpenEXR-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRCore-3_1.so.30 libopenexr-3.1.5_1
libOpenEXRUtil-3_1.so.30 libopenexr-3.1.5_1
+libdate-tz.so.3 chrono-date-3.0.1_1
diff --git a/srcpkgs/chrono-date-devel b/srcpkgs/chrono-date-devel
new file mode 120000
index 000000000000..7ba11f09e6bd
--- /dev/null
+++ b/srcpkgs/chrono-date-devel
@@ -0,0 +1 @@
+chrono-date
\ No newline at end of file
diff --git a/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch b/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
new file mode 100644
index 000000000000..d20af66b16dc
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/538_output_date_pc_for_pkg_config.patch
@@ -0,0 +1,60 @@
+From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001
+From: Cole Mickens <cole.mickens@gmail.com>
+Date: Sun, 26 Jan 2020 01:27:08 -0800
+Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config
+
+---
+ CMakeLists.txt | 15 +++++++++++++++
+ date.pc.in | 10 ++++++++++
+ 2 files changed, 25 insertions(+)
+ create mode 100644 date.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f30c473..fe778e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB )
+ endif( )
+ endif( )
+
++if ( BUILD_TZ_LIB )
++ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
++ set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:date-tz>,-D$<JOIN:$<TARGET_PROPERTY:date-tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" )
++ configure_file(date.pc.in date.pc.cf @ONLY)
++ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc"
++ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" )
++
++endif( )
++
+ #[===================================================================[
+ installation
+ #]===================================================================]
+@@ -171,6 +180,12 @@ install (
+ FILES cmake/dateConfig.cmake "${version_config}"
+ DESTINATION ${CONFIG_LOC})
+
++if ( BUILD_TZ_LIB )
++ install(
++ FILES ${CMAKE_BINARY_DIR}/date.pc
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++endif( )
++
+ #[===================================================================[
+ testing
+ #]===================================================================]
+diff --git a/date.pc.in b/date.pc.in
+new file mode 100644
+index 0000000..b9c4623
+--- /dev/null
++++ b/date.pc.in
+@@ -0,0 +1,10 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=@CMAKE_INSTALL_BINDIR@
++libdir=@CMAKE_INSTALL_LIB@
++includedir=@CMAKE_INSTALL_INCLUDE@
++
++Name: date
++Description: A date and time library based on the C++11/14/17 <chrono> header
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -ldate-tz
++Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@
diff --git a/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch b/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
new file mode 100644
index 000000000000..d6257c4c3016
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/disable_buggy_libstdc++_tests.patch
@@ -0,0 +1,30 @@
+--- a/test/date_test/parse.pass.cpp 2020-06-02 18:08:57.000000000 -0700
++++ b/test/date_test/parse.pass.cpp 2020-07-11 19:35:35.349377734 -0700
+@@ -874,27 +874,20 @@
+ int
+ main()
+ {
+- test_a();
+- test_b();
+- test_c();
+ test_C();
+ test_d();
+ test_D();
+ test_F();
+ test_H();
+- test_Ip();
+ test_j();
+ test_m();
+ test_M();
+- test_p();
+- test_r();
+ test_R();
+ test_S();
+ test_T();
+ test_U();
+ test_W();
+ test_GV();
+- test_x();
+ test_X();
+ test_z();
+ test_Z();
diff --git a/srcpkgs/chrono-date/patches/get_info.patch b/srcpkgs/chrono-date/patches/get_info.patch
new file mode 100644
index 000000000000..5ce6f15f6d26
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/get_info.patch
@@ -0,0 +1,24 @@
+From b49a7575ebbe127e8bd344900a52c14b5d69dd7b Mon Sep 17 00:00:00 2001
+From: Howard Hinnant <howard.hinnant@gmail.com>
+Date: Tue, 18 May 2021 16:15:31 -0400
+Subject: [PATCH] Zero initialize local_info in get_info
+
+* Even when the result is unique, the second sys_info
+ should be zero initialized.
+---
+ src/tz.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tz.cpp b/src/tz.cpp
+index 26babbd9..1592bc8f 100644
+--- a/src/tz.cpp
++++ b/src/tz.cpp
+@@ -2164,7 +2164,7 @@ time_zone::get_info_impl(local_seconds tp) const
+ {
+ using namespace std::chrono;
+ init();
+- local_info i;
++ local_info i{};
+ i.result = local_info::unique;
+ auto tr = upper_bound(transitions_.begin(), transitions_.end(), tp,
+ [](const local_seconds& x, const transition& t)
diff --git a/srcpkgs/chrono-date/patches/sys_info.patch b/srcpkgs/chrono-date/patches/sys_info.patch
new file mode 100644
index 000000000000..d7edfa0a4b5f
--- /dev/null
+++ b/srcpkgs/chrono-date/patches/sys_info.patch
@@ -0,0 +1,29 @@
+From 052eebaf0086e6bbc5ead01c3f1a8f02496aa701 Mon Sep 17 00:00:00 2001
+From: Howard Hinnant <howard.hinnant@gmail.com>
+Date: Tue, 18 May 2021 16:17:37 -0400
+Subject: [PATCH] When comparing sys_info in test... only compare whether the
+ saves are equal to 0 and not their actual values.
+
+This allows one to compare against the binary database
+which does not contain actual values of save.
+---
+ test/posix/ptz.pass.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/posix/ptz.pass.cpp b/test/posix/ptz.pass.cpp
+index 5601c21d..9e15e3a9 100644
+--- a/test/posix/ptz.pass.cpp
++++ b/test/posix/ptz.pass.cpp
+@@ -29,10 +29,11 @@
+ bool
+ is_equal(date::sys_info const& x, date::sys_info const& y)
+ {
++ using namespace std::chrono;
+ return x.begin == y.begin &&
+ x.end == y.end &&
+ x.offset == y.offset &&
+- x.save == y.save &&
++ (x.save == minutes{0}) == (y.save == minutes{0}) &&
+ x.abbrev == y.abbrev;
+ }
+
diff --git a/srcpkgs/chrono-date/template b/srcpkgs/chrono-date/template
new file mode 100644
index 000000000000..ff3f21b63f17
--- /dev/null
+++ b/srcpkgs/chrono-date/template
@@ -0,0 +1,29 @@
+# Template file for 'chrono-date'
+pkgname=chrono-date
+version=3.0.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=true -DBUILD_TZ_LIB=true
+ -DUSE_SYSTEM_TZ_DB=true -DENABLE_DATE_TESTING=false"
+short_desc="Date and time library based on the C++11/14/17 <chrono> header"
+maintainer="lz-coder <lzcoder@proton.me>"
+license="MIT"
+homepage="https://howardhinnant.github.io/date/date.html"
+changelog="https://github.com/HowardHinnant/date/releases"
+distfiles="https://github.com/HowardHinnant/date/archive/v${version}.tar.gz"
+checksum=7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+chrono-date-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 5570ecdda2af9480a548d9a331fb8d71cbd76515 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:33:53 +0100
Subject: [PATCH 258/356] rust-boostrap: hardcode platform triplets
---
srcpkgs/rust-bootstrap/template | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 23f147c9fcb9..539a4097ef3c 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -24,42 +24,61 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
-distfiles="
- ${_bootstrap_url}/rustc-${version}-${RUST_TARGET}.tar.xz
- ${_bootstrap_url}/rust-std-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
;;
x86_64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
;;
x86_64-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
;;
ppc64le)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="
11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
;;
ppc64le-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="
9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
;;
ppc64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="
aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
;;
ppc)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="
5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
From 2244c445eced5a60cc16c5ff688924b9ad76f976 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:34:26 +0100
Subject: [PATCH 259/356] cargo-bootstrap: hardcode platform triplets
---
srcpkgs/cargo-bootstrap/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 4e39b797a035..9da646a63ade 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -23,28 +23,35 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
-distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
;;
x86_64)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
;;
x86_64-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
;;
ppc64le)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
;;
ppc64le-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
;;
ppc64)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
;;
ppc)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
From 4faf26951ae1f0eeeb28c50f9bed676b3045b8a4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 5 Feb 2023 14:52:45 +0530
Subject: [PATCH 260/356] twemoji: update to 14.0.2.
Adopt.
---
srcpkgs/twemoji/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/twemoji/template b/srcpkgs/twemoji/template
index 3dae26abaa65..499e8006b2d6 100644
--- a/srcpkgs/twemoji/template
+++ b/srcpkgs/twemoji/template
@@ -1,14 +1,14 @@
# Template file for 'twemoji'
pkgname=twemoji
-version=13.1.0
+version=14.0.2
revision=1
depends="font-util"
short_desc="Twitter emoji font set in color and b&w"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="CC-BY-SA-4.0, MIT"
-homepage="https://github.com/eosrei/twemoji-color-font"
-distfiles="https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"
-checksum=57c0d651400af872c33dcab78b33ecd7be0f7d49da49e2c1c83a59c215085f94
+homepage="https://github.com/13rac1/twemoji-color-font"
+distfiles="https://github.com/13rac1/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"
+checksum=6826e21ea08dc5df26c887ae4e56046987e0f4909df8c02c73de05714a0353c1
font_dirs="/usr/share/fonts/twemoji"
From d3eba7b118c39888015607112aa2644fb7c26a54 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 6 Feb 2023 15:55:49 +0200
Subject: [PATCH 261/356] opera: update to 95.0.4635.25.
---
srcpkgs/opera/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index d18c926ee1c5..dbfbea49cba7 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
# Template file for 'opera'
pkgname=opera
-version=94.0.4606.76
+version=95.0.4635.25
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:Proprietary"
homepage="https://www.opera.com/computer"
distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=0542e391b934b5646478a71d7c9a46c8119cfd2663f83f78ad80c2ea92574ea5
+checksum=0db4fb3247d24249ad19f65f1e63ce339d8f9a1e9fcb789835a84bc0f916fdfe
repository="nonfree"
nostrip=yes
From eb36abb425e5a9cf0cbef1922207ca93bba01e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Mon, 6 Feb 2023 16:10:23 +0100
Subject: [PATCH 262/356] papirus-folders: update to 1.12.1.
---
srcpkgs/papirus-folders/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/papirus-folders/template b/srcpkgs/papirus-folders/template
index 69d04f3e158b..d4b797e0f42d 100644
--- a/srcpkgs/papirus-folders/template
+++ b/srcpkgs/papirus-folders/template
@@ -1,6 +1,6 @@
# Template file for 'papirus-folders'
pkgname=papirus-folders
-version=1.12.0
+version=1.12.1
revision=1
build_style=gnu-makefile
depends="papirus-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
homepage="https://github.com/PapirusDevelopmentTeam/papirus-folders"
distfiles="https://github.com/PapirusDevelopmentTeam/papirus-folders/archive/v${version}.tar.gz"
-checksum=e20df336d909ef320606caed49797418fba54867fc24d6596576cfa55995c337
+checksum=e0079af92ffc1b16eebd0f182d740e85aa2e34450cf0f191c229a568fcc5bee0
post_install() {
vlicense LICENSE
From bab4e96e936a79c0e3bb27d9fbd4f1788841472f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 6 Feb 2023 10:35:35 +0100
Subject: [PATCH 263/356] PrismLauncher: update to 6.3.
---
srcpkgs/PrismLauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..2c9e9cc3d8d4 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=6.1
+version=6.3
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d89171a982af0f93208b25c33f5f890ca9674bd0573e685da969d6436103da9c
+checksum=fc1896df6422248dbd767d4a82066fe6044ae104354ebf75fc5ae92252f2fb1a
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
From c99fdb38bb6848bd2e4e0bc138175e97eb057ef6 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 08:44:40 -0500
Subject: [PATCH 264/356] lolcat-c: update to 1.3
---
srcpkgs/lolcat-c/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/lolcat-c/template b/srcpkgs/lolcat-c/template
index 54a94910502b..3db29baec216 100644
--- a/srcpkgs/lolcat-c/template
+++ b/srcpkgs/lolcat-c/template
@@ -1,6 +1,6 @@
# Template file for 'lolcat-c'
pkgname=lolcat-c
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
make_build_target="lolcat"
@@ -8,8 +8,8 @@ short_desc="High-performance implementation of lolcat"
maintainer="John <me@johnnynator.dev>"
license="WTFPL"
homepage="https://github.com/jaseg/lolcat"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b6e1a0e24479fbdd4eb907531339e2cafc0c00b78d19caf70e8377b8b7546331
+distfiles="https://github.com/jaseg/lolcat/archive/refs/tags/v${version}.tar.gz"
+checksum=5596c9ad40f78cc40483ada3fed25f9fa743b4d281b00c2b78de02f49a415d10
do_install() {
vbin lolcat
From 1fca123acde4e603a90c862f9e4167b9417128b3 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 7 Feb 2023 01:26:47 +0530
Subject: [PATCH 265/356] elfinfo: update to 1.2.2.
---
srcpkgs/elfinfo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index b354ced06d81..50f03b480101 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -1,15 +1,15 @@
# Template file for 'elfinfo'
pkgname=elfinfo
-version=1.1.0
+version=1.2.2
revision=1
build_style=go
go_import_path=github.com/xyproto/elfinfo
short_desc="Emit basic information about an ELF file"
maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
-license="MIT"
+license="BSD-3-Clause"
homepage="https://elfinfo.roboticoverlords.org/"
-distfiles="https://github.com/xyproto/elfinfo/archive/${version}.tar.gz"
-checksum=d50ae9facbfa2c9ecc24feaa817a2f1c92949b06649ae7a097729c99bd8474dd
+distfiles="https://github.com/xyproto/elfinfo/archive/refs/tags/${version}.tar.gz"
+checksum=33c9bf9942dfa770fa6530f5a268f15d96abcd4c57aaddf93636cdfcd2dfc540
post_install() {
vlicense LICENSE
From 7a792ed2ef34cb748bba7986879863eb7eb9cb55 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 12:33:58 +0100
Subject: [PATCH 266/356] rustup: update to 1.25.2
---
srcpkgs/rustup/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index da9d2751ba4f..06319a580eef 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,6 +1,6 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.25.1
+version=1.25.2
revision=1
# rustup doesn't recognize this target
archs="~armv*-musl"
@@ -14,8 +14,9 @@ short_desc="Rust toolchain installer"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
-distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=4d062c77b08309bd212f22dd7da1957c1882509c478e57762f34ec4fb2884c9a
+changelog="https://github.com/rust-lang/rustup/raw/master/CHANGELOG.md"
+distfiles="https://github.com/rust-lang/rustup/archive/refs/tags/${version}.tar.gz"
+checksum=dc9bb5d3dbac5cea9afa9b9c3c96fcf644a1e7ed6188a6b419dfe3605223b5f3
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*)
From 05243f582816ae2f629304cfbc9ee848c9162926 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 31 Jan 2023 13:20:09 -0500
Subject: [PATCH 267/356] wsjtx: update to 2.6.1.
---
srcpkgs/wsjtx/template | 21 +++++++++------------
srcpkgs/wsjtx/update | 4 ++--
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index fc6094743511..20bc4737410d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,11 +1,13 @@
# Template file for 'wsjtx'
pkgname=wsjtx
-version=2.5.4
-revision=3
+version=2.6.1
+revision=1
build_wrksrc=wsjtx
build_style=cmake
-configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
-hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar"
+configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE=
+ -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
+hostmakedepends="pkg-config gcc-fortran ruby-asciidoctor asciidoc tar qt5-qmake
+ qt5-host-tools"
makedepends="boost-devel fftw-devel libgomp-devel hamlib-devel libusb-devel qt5-devel
qt5-multimedia-devel qt5-tools-devel qt5-serialport-devel qt5-plugin-mysql
qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
@@ -15,18 +17,13 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-3.0-or-later"
homepage="https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html"
changelog="https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt"
-distfiles="${SOURCEFORGE_SITE}/wsjt/${pkgname}-${version}/${pkgname}-${version}.tgz"
-checksum=1b3f3846ad2c0a5f410178b6612765d59ee63db249eb6cfc332ace17f0a30898
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-qmake qt5-host-tools"
- configure_args+=" -DBoost_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
-fi
+distfiles="${SOURCEFORGE_SITE}/wsjt/wsjtx-${version}/wsjtx-${version}.tgz"
+checksum=60d0e2cb45a49a6ad585b0908821a9ff2c3ac2564d61042620ff36c2ddcc765f
post_extract() {
tar xf src/wsjtx.tgz
}
post_install() {
- rm -f ${DESTDIR}/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz
+ rm ${DESTDIR}/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz
}
diff --git a/srcpkgs/wsjtx/update b/srcpkgs/wsjtx/update
index b5cc9bd4f17d..02ba6d585b5d 100644
--- a/srcpkgs/wsjtx/update
+++ b/srcpkgs/wsjtx/update
@@ -1,3 +1,3 @@
-site='https://physics.princeton.edu/pulsar/K1JT/Release_Notes.txt'
-pattern='Release: WSJT-X \K[\d\w.-]+(?=)'
+site='https://wsjt.sourceforge.io/Release_Notes.txt'
+pattern='Release: WSJT-X \K[\d.-]+\d(?=)'
ignore='*-rc*'
From 37914df36146abe26a293f3f01b774e979c4c42e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 31 Jan 2023 19:37:16 +0200
Subject: [PATCH 268/356] skype: update to 8.93.0.404.
---
srcpkgs/skype/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 1bcc2532d271..96a6ffd03262 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
# Template file for 'skype'
# This just repackages the rpm package.
pkgname=skype
-version=8.93.0.403
+version=8.93.0.404
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
license="custom:skype-servicesagreement" # no vlicense
homepage="https://www.skype.com"
distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=4e8a29c4dc7f1c8e7c5e934598e207771d40bb523a0bef93d309e4242739655e
+checksum=02d9bc02eec3be408b1a53c93fab8b795f399911615d4987ad6dcddbb4188b1a
repository="nonfree"
nostrip="yes"
From d4825beb9479f1a057de99afd915450a480085dd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 30 Jan 2023 09:34:51 -0500
Subject: [PATCH 269/356] common: cleanup trailing whitespaces
---
common/build-helper/gir.sh | 6 +++---
common/build-helper/rust.sh | 4 ++--
common/build-style/configure.sh | 2 +-
common/build-style/gem.sh | 2 +-
common/build-style/gemspec.sh | 2 +-
common/build-style/gnu-configure.sh | 2 +-
common/build-style/gnu-makefile.sh | 2 +-
common/build-style/slashpackage.sh | 2 +-
common/chroot-style/ethereal.sh | 4 ++--
common/environment/configure/autoconf_cache/aarch64-linux | 4 ++--
common/environment/configure/autoconf_cache/arm-common | 2 +-
common/environment/configure/autoconf_cache/ix86-common | 2 +-
common/travis/xlint.sh | 2 +-
common/xbps-src/shutils/consistency_check.sh | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh
index 0091fb31ad93..70699adb1797 100644
--- a/common/build-helper/gir.sh
+++ b/common/build-helper/gir.sh
@@ -3,7 +3,7 @@
#
# This build-helper is used for packages that make use of
# the GObject introspection middleware layer.
-#
+#
# Check if the 'gir' build_option is set or if there is no
# 'gir' build_option.
@@ -13,12 +13,12 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then
# and its wrappers.
hostmakedepends+=" gobject-introspection"
fi
-
+
if [ "$CROSS_BUILD" ]; then
# Required for running binaries produced from g-ir-compiler
# via g-ir-scanner-qemuwrapper
hostmakedepends+=" qemu-user-static"
-
+
# Required for running the g-ir-scanner-lddwrapper
hostmakedepends+=" prelink-cross"
diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 272d03f52607..9e604929ed23 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -12,7 +12,7 @@ if [ "$CROSS_BUILD" ]; then
_XBPS_CROSS_RUST_TARGET_ENV="${_XBPS_CROSS_RUST_TARGET_ENV//-/_}"
export CARGO_TARGET_${_XBPS_CROSS_RUST_TARGET_ENV}_LINKER="$CC"
unset _XBPS_CROSS_RUST_TARGET_ENV
-
+
# Define equivalent of TOML config in environment
# [build]
# target = ${RUST_TARGET}
@@ -39,7 +39,7 @@ export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext"
export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
# libssh2-sys
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+export LIBSSH2_SYS_USE_PKG_CONFIG=1
# sodium-sys
export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh
index 7a6d136f4cc6..8fe327507d9e 100644
--- a/common/build-style/configure.sh
+++ b/common/build-style/configure.sh
@@ -15,7 +15,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/gem.sh b/common/build-style/gem.sh
index 150c5b30d338..779e94eec353 100644
--- a/common/build-style/gem.sh
+++ b/common/build-style/gem.sh
@@ -5,7 +5,7 @@ do_install() {
: ${gem_cmd:=gem}
local _GEMDIR _INSTDIR
-
+
_GEMDIR=$($gem_cmd env gemdir)
_INSTDIR=${DESTDIR}/${_GEMDIR}/gems/${pkgname#ruby-}-${version}
diff --git a/common/build-style/gemspec.sh b/common/build-style/gemspec.sh
index b47ef7b1bc6b..9568e819ed45 100644
--- a/common/build-style/gemspec.sh
+++ b/common/build-style/gemspec.sh
@@ -173,7 +173,7 @@ do_install() {
if [ "$CROSS_BUILD" ]; then
local _TARGET_PLATFORM _TARGET_EXT_DIR
-
+
# Get arch of the target and host platform by reading the rbconfig.rb
# of the cross ruby
_TARGET_PLATFORM="$(ruby -r \
diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 4326d07d75cc..82d36f6ee0f7 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -16,7 +16,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index f81ef4e21db4..c4f4f780f9f6 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -18,7 +18,7 @@ do_build() {
}
do_check() {
- if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+ if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
if make -q check 2>/dev/null; then
:
else
diff --git a/common/build-style/slashpackage.sh b/common/build-style/slashpackage.sh
index 5f4fe4fb93fd..59e82732f7a8 100644
--- a/common/build-style/slashpackage.sh
+++ b/common/build-style/slashpackage.sh
@@ -7,7 +7,7 @@
# build_style=slashpackage
# build_wrksrc=${pkgname}-${version}
# distfiles=<download link>
-#
+#
# example (daemontools)
#
# Template file for 'daemontools'
diff --git a/common/chroot-style/ethereal.sh b/common/chroot-style/ethereal.sh
index cf6e4dc244f9..a226465cc82f 100755
--- a/common/chroot-style/ethereal.sh
+++ b/common/chroot-style/ethereal.sh
@@ -12,7 +12,7 @@
# into /.xbps_chroot_init
#
# The supported way to make use of thie chroot-style is to create
-# a root filesystem that has base-chroot and git installed and
+# a root filesystem that has base-chroot and git installed and
# have it inside a container engine like Docker.
#
# Docker example:
@@ -21,7 +21,7 @@
# -R http://mirrors.servercentral.com/voidlinux/current \
# -S base-chroot
# $ tar -pC /tmp/image -c . | sudo docker import - voidlinux/masterdir
-# $ rm -rf /tmp/image
+# $ rm -rf /tmp/image
# # docker run --rm -it \
# -e XBPS_CHROOT_CMD=ethereal \
# -e XBPS_ALLOW_CHROOT_BREAKOUT=yes \
diff --git a/common/environment/configure/autoconf_cache/aarch64-linux b/common/environment/configure/autoconf_cache/aarch64-linux
index ad17545c098e..4367f917bf56 100644
--- a/common/environment/configure/autoconf_cache/aarch64-linux
+++ b/common/environment/configure/autoconf_cache/aarch64-linux
@@ -81,10 +81,10 @@ libIDL_cv_long_long_format=ll
## ac_cv_alignof_CORBA_short=2
## ac_cv_alignof_CORBA_struct=1
## ac_cv_alignof_CORBA_wchar=2
-##
+##
## lf_cv_sane_realloc=yes
as_cv_unaligned_access=${as_cv_unaligned_access=no}
-##
+##
## #unfs3
## nfsd_cv_broken_setfsuid=${nfsd_cv_broken_setfsuid=0}
## nfsd_cv_func_statfs=${nfsd_cv_func_statfs=statfs2_bsize}
diff --git a/common/environment/configure/autoconf_cache/arm-common b/common/environment/configure/autoconf_cache/arm-common
index 0f09e06671e1..3526b775039d 100644
--- a/common/environment/configure/autoconf_cache/arm-common
+++ b/common/environment/configure/autoconf_cache/arm-common
@@ -99,7 +99,7 @@ acx_working_snprintf=${acx_working_snprintf=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
-# libnet
+# libnet
ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
# libpcap
diff --git a/common/environment/configure/autoconf_cache/ix86-common b/common/environment/configure/autoconf_cache/ix86-common
index beed9a24a1e4..8eb82deae467 100644
--- a/common/environment/configure/autoconf_cache/ix86-common
+++ b/common/environment/configure/autoconf_cache/ix86-common
@@ -120,7 +120,7 @@ lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
-# libnet
+# libnet
ac_cv_lbl_unaligned_fail=${ac_cv_lbl_unaligned_fail=no}
ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 327417c1c327..790791ef1733 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -2,7 +2,7 @@
#
# xlint.sh
-[ "$XLINT" ] || exit 0
+[ "$XLINT" ] || exit 0
EXITCODE=0
read base tip < /tmp/revisions
diff --git a/common/xbps-src/shutils/consistency_check.sh b/common/xbps-src/shutils/consistency_check.sh
index cd70f4a9cbab..6a5b2ec19975 100644
--- a/common/xbps-src/shutils/consistency_check.sh
+++ b/common/xbps-src/shutils/consistency_check.sh
@@ -22,7 +22,7 @@ consistency_convert_pkgname () {
;;
esac
case "$dep" in
- *\<*|*\>*|*=*)
+ *\<*|*\>*|*=*)
printf "%s %s %s\n" "$dep" "$origname" "$deplabel"
continue
;;
From 58fe16afea1f6b7f2a6218ace32d060228af1d92 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Sat, 4 Feb 2023 12:59:41 +0530
Subject: [PATCH 270/356] telegram-desktop: update to 4.6.1.
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 03bc7806f54f..ba0947762311 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=4.5.3
+version=4.6.1
revision=1
build_style=cmake
build_helper="qemu"
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later, OpenSSL"
homepage="https://desktop.telegram.org/"
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=3e338607708751813df36b677904e2e652f8adfac669da418c8dab4588a4f70f
+checksum=96fc517036bea908fb31b456aeb2950296e98965241bab318faa7641fb506f2f
build_options="spellcheck"
build_options_default="spellcheck"
From 6b52d82bea0ddee68b7e0c1c3995e766af87239b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 7 Feb 2023 13:19:36 +0100
Subject: [PATCH 271/356] syncthing: update to 1.23.1.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 06fcc107917d..d0e8b48205c1 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.23.0
+version=1.23.1
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=3ac5002419d261b7d9352a621dbe20fada165372444824213b9d46910df7502e
+checksum=2e1f1b146f18630a3dfa1480a333f39366d855dc6749fe23dc029a61f5fe4cd1
pre_build() {
GOARCH= go generate \
From 83d62b8bdcfd3c9d7fc8e6f64b01e79df7a68887 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 7 Feb 2023 13:30:27 +0100
Subject: [PATCH 272/356] xtools: update to 0.65.
---
srcpkgs/xtools/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index 676928bff814..74effe6beaa5 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,15 +1,15 @@
# Template file for 'xtools'
pkgname=xtools
-version=0.64
-revision=2
+version=0.65
+revision=1
build_style=gnu-makefile
depends="curl git make spdx-licenses-list xtools-minimal-${version}_${revision}"
short_desc="Opinionated helpers for working with XBPS"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
-homepage="http://git.vuxu.org/xtools"
-distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be
+homepage="https://git.vuxu.org/xtools"
+distfiles="https://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
+checksum=2128fb5066fa2aab7bcfb149519463d513ade820f1d8e25aecbeaf259294615e
# all xtools that can function without git installed
# (git is by far the largest dependency)
From 3302de0ff65867f49a9f81ddb6ba410990eeae85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:27 +0100
Subject: [PATCH 273/356] openssh: update to 9.2p1.
---
srcpkgs/openssh/patches/time_t-32-bit.patch | 11 +++++++++++
srcpkgs/openssh/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/openssh/patches/time_t-32-bit.patch
diff --git a/srcpkgs/openssh/patches/time_t-32-bit.patch b/srcpkgs/openssh/patches/time_t-32-bit.patch
new file mode 100644
index 000000000000..8c11f3714ec6
--- /dev/null
+++ b/srcpkgs/openssh/patches/time_t-32-bit.patch
@@ -0,0 +1,11 @@
+--- openssh-9.2p1.orig/channels.c
++++ openssh-9.2p1/channels.c
+@@ -2558,7 +2558,7 @@ channel_handler(struct ssh *ssh, int tab
+ if (table == CHAN_PRE &&
+ c->type == SSH_CHANNEL_OPEN &&
+ c->inactive_deadline != 0 && c->lastused != 0 &&
+- now >= c->lastused + c->inactive_deadline) {
++ now >= c->lastused + (time_t)c->inactive_deadline) {
+ /* channel closed for inactivity */
+ verbose("channel %d: closing after %u seconds "
+ "of inactivity", c->self,
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..3adadcdbac33 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
-version=9.1p1
-revision=2
+version=9.2p1
+revision=1
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -23,7 +23,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause, ISC"
homepage="https://www.openssh.com"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
make_dirs="/var/chroot/ssh 0755 root root"
From 158c7da238d7e679dd46b066010473a947d423fc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 2 Feb 2023 16:57:38 +0100
Subject: [PATCH 274/356] gnome-ssh-askpass: update to 9.2p1.
---
srcpkgs/gnome-ssh-askpass/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 8b47bd4ca8cb..389516822702 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
# Template file for 'gnome-ssh-askpass'
pkgname=gnome-ssh-askpass
-version=9.1p1
+version=9.2p1
revision=1
build_wrksrc="contrib"
build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause, BSD-2-Clause"
homepage="http://www.openssh.org"
distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
+checksum=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
alternatives="
ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
From c9327b8a6709dc0b308651ddfdb04404cf65159b Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 6 Feb 2023 16:36:55 +0200
Subject: [PATCH 275/356] man-pages: update to 6.02.
---
srcpkgs/man-pages/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index 0422ff053de2..1606b58decf6 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,16 +1,16 @@
# Template file for 'man-pages'
pkgname=man-pages
-version=5.13
-revision=2
+version=6.02
+revision=1
short_desc="Linux Documentation Project (LDP) manual pages"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://man7.org/linux/man-pages/index.html"
-distfiles="${KERNEL_SITE}/docs/man-pages/${pkgname}-${version}.tar.xz"
-checksum=614dae3efe7dfd480986763a2a2a8179215032a5a4526c0be5e899a25f096b8b
+homepage="https://www.kernel.org/doc/man-pages/index.html"
+distfiles="${KERNEL_SITE}/docs/man-pages/man-pages-${version}.tar.xz"
+checksum=66d809b62ba8681ebcbd1a8d0a0670776924ab93bfbbb54e1c31170e14303795
do_install() {
- make all prefix=${DESTDIR}/usr
+ make install prefix=/usr DESTDIR=${DESTDIR}
# Remove dup manpages.
cd ${DESTDIR}/usr/share/man
From 2217108c9976a824582d84c02fbd80f0e47e0d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 7 Feb 2023 21:29:53 +0700
Subject: [PATCH 276/356] linux6.1: update to 6.1.10.
---
srcpkgs/linux6.1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.1/template b/srcpkgs/linux6.1/template
index 4fd43fad4089..d7a58660dcc0 100644
--- a/srcpkgs/linux6.1/template
+++ b/srcpkgs/linux6.1/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.1'
pkgname=linux6.1
-version=6.1.9
+version=6.1.10
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
- 64e27f1de56225372d29ff92dc2d8fca6ae961e7470f2364e98c5af0aef261dc"
+ ab73cf44175fcaacc7a467bedc3731cc14367a377088c157cdfcf8853f73b1e9"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 366963b7d9ee244183b3e954d8f641ee452f3d81 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 31 Jan 2023 19:57:21 +0200
Subject: [PATCH 277/356] terminology: update to 1.13.0.
---
srcpkgs/terminology/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template
index 71dc0dd24e44..af9c3587f076 100644
--- a/srcpkgs/terminology/template
+++ b/srcpkgs/terminology/template
@@ -1,6 +1,6 @@
# Template file for 'terminology'
pkgname=terminology
-version=1.12.1
+version=1.13.0
revision=1
build_style=meson
hostmakedepends="pkg-config efl gettext"
@@ -10,8 +10,8 @@ short_desc="Enlightenment's terminal emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://www.enlightenment.org"
-distfiles="https://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f8ced9584c2e9ae87452ce7425fd25b2d3e122c7489785d2917890215c6b5aa9
+distfiles="https://download.enlightenment.org/rel/apps/terminology/terminology-${version}.tar.xz"
+checksum=16a37fecd7bbd63ec9de3ec6c0af331cee77d6dfda838a1b1573d6f298474da5
post_install() {
vlicense COPYING
From d60c55c6891c9a4b280f1fe8810777887bb1410c Mon Sep 17 00:00:00 2001
From: Dave Eddy <dave@daveeddy.com>
Date: Sun, 5 Feb 2023 14:20:19 -0500
Subject: [PATCH 278/356] vsv: update to 2.0.0
`vsv` was rewritten from Bash to Rust so this template reflects that
change - the user-facing CLI interface has not changed.
---
srcpkgs/vsv/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/vsv/template b/srcpkgs/vsv/template
index 2e1780a68fe8..d77a49d874ed 100644
--- a/srcpkgs/vsv/template
+++ b/srcpkgs/vsv/template
@@ -1,18 +1,18 @@
# Template file for 'vsv'
pkgname=vsv
-version=1.3.5
+version=2.0.0
revision=1
-depends="bash psmisc"
+build_style=cargo
+depends="psmisc"
short_desc="Manage and view runit services"
maintainer="Dave Eddy <dave@daveeddy.com>"
license="MIT"
homepage="https://github.com/bahamas10/vsv"
changelog="https://raw.githubusercontent.com/bahamas10/vsv/master/CHANGES.md"
distfiles="https://github.com/bahamas10/vsv/archive/v${version}.tar.gz"
-checksum=d4b88a7d11189d6a9dd160a25025cbec8d27a88ea02a6826e0c010824b6bc943
+checksum=05c20d8e04ca37fdc47dde80a04a4709b54650748529456ebdddb4104fc805ec
-do_install() {
- vbin vsv
+post_install() {
vman man/vsv.8
vlicense LICENSE
}
From 87ef00e4a396c4a74d4606a0d4da9573368b6401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 7 Feb 2023 18:09:29 +0100
Subject: [PATCH 279/356] openssl: update to 1.1.1t.
---
srcpkgs/openssl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 1461ffd2f7a2..79da0b051aad 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
# Template file for 'openssl'
pkgname=openssl
-version=1.1.1s
+version=1.1.1t
revision=1
bootstrap=yes
build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
license="OpenSSL"
homepage="https://www.openssl.org"
distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
+checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
conf_files="/etc/ssl/openssl.cnf"
replaces="libressl>=0"
From 379daaf935f5936910dbd88ffb25e293db0b3566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:33:08 +0200
Subject: [PATCH 280/356] haveged: update to 1.9.18.
---
srcpkgs/haveged/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/haveged/template b/srcpkgs/haveged/template
index be82467cf210..a7c59d276aa4 100644
--- a/srcpkgs/haveged/template
+++ b/srcpkgs/haveged/template
@@ -1,14 +1,15 @@
# Template file for 'haveged'
pkgname=haveged
-version=1.9.17
+version=1.9.18
revision=1
build_style=gnu-configure
short_desc="Entropy harvesting daemon using CPU timings"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.issihosts.com/haveged"
+homepage="https://www.issihosts.com/haveged"
+changelog="https://raw.githubusercontent.com/jirka-h/haveged/master/ChangeLog"
distfiles="https://github.com/jirka-h/haveged/archive/v${version}.tar.gz"
-checksum=02d9b7c801fbcf16bed43c27bf6ece570b79f4d94561f3eb30883fb5f89c526d
+checksum=b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7
post_install() {
vsv $pkgname
From db6b4afe2d05bd82abed6838f964b5b23bc13675 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 7 Feb 2023 22:36:36 +0100
Subject: [PATCH 281/356] google-chrome: update to 110.0.5481.77
---
srcpkgs/google-chrome/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index a4e4412568ad..6ce94d2e43b9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
# Template file for 'google-chrome'
pkgname=google-chrome
-version=109.0.5414.119
+version=110.0.5481.77
revision=1
_channel=stable
archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="custom:chrome"
homepage="https://www.google.com/chrome/"
distfiles="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-${_channel}_${version}-1_amd64.deb"
-checksum=7dfe9285ff6ee8bff7621a68bf66d33dbe016ee3769a20b52397bafa49345745
+checksum=f7f1ac37e8fb258dbfd8fa9ca60e4a765609e0dea3942c264c3e6aa3af7b4d4a
_license_checksum=8023b18fb5118ef65d586363e53909861bd1a9676e5eb83c20fd3ac6e33ea0be
skiprdeps="/opt/google/chrome/libqt5_shim.so"
From ea6d5d31db7578395fbb27a66bb5ff32c364870c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 13:11:53 -0500
Subject: [PATCH 282/356] dnscrypt-proxy: update to 2.1.4
---
srcpkgs/dnscrypt-proxy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index 4172fd0a9d5a..e06702e89b92 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,6 +1,6 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
-version=2.1.3
+version=2.1.4
revision=1
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
@@ -10,8 +10,8 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
license="ISC"
homepage="https://github.com/DNSCrypt/dnscrypt-proxy"
changelog="https://raw.githubusercontent.com/DNSCrypt/dnscrypt-proxy/master/ChangeLog"
-distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${version}.tar.gz"
-checksum=6163ab3169edd2158f585dff2ddba416b2d29fd4b44b4cc794365fca666a726a
+distfiles="https://github.com/DNSCrypt/dnscrypt-proxy/archive/refs/tags/${version}.tar.gz"
+checksum=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d
conf_files="/etc/dnscrypt-proxy.toml"
system_accounts="dnscrypt_proxy"
make_dirs="/var/log/dnscrypt-proxy 0750 dnscrypt_proxy dnscrypt_proxy"
From 7aff76da1866fd96cdab76ea2072443171246ca2 Mon Sep 17 00:00:00 2001
From: Ashlen <eurydice@riseup.net>
Date: Tue, 7 Feb 2023 23:14:51 -0700
Subject: [PATCH 283/356] xorg-server: update to 21.1.7.
Fix CVE-2023-0494
Closes: #42141 [via git-merge-pr]
---
srcpkgs/xorg-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index b0f87841ae16..b4d24434a24f 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server'
pkgname=xorg-server
-version=21.1.6
+version=21.1.7
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
@@ -24,7 +24,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT, BSD-3-Clause"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.xz"
-checksum=1eb86ed674d042b6c8b1f9135e59395cbbca35ed551b122f73a7d8bb3bb22484
+checksum=d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb
lib32disabled=yes
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-25_1 xf86-video-modesetting-1_1"
From 2cb91317690023ba87f124a72dbb73cefa7a7678 Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 8 Feb 2023 14:18:00 +0100
Subject: [PATCH 284/356] xorg-server-xwayland: update to 22.1.8.
---
srcpkgs/xorg-server-xwayland/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index c286192da72b..8aa7eda6f014 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
# Template file for 'xorg-server-xwayland'
pkgname=xorg-server-xwayland
-version=22.1.7
+version=22.1.8
revision=1
build_style=meson
configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
@@ -16,7 +16,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=7df1e8d0a7e510706dc103230c342e58cffe240867ecdce47fd381d33db08a4b
+checksum=7f51aa41f5ae588a5a8afebf29c19e76830a9f75bc4f0443974f012a42028c83
make_check=no # needs xtest repository
post_install() {
From fef668c8f4a95de51dd683078da1e448ec090a50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 14:28:35 +0100
Subject: [PATCH 285/356] dino: update to 0.4.0.
---
srcpkgs/dino/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 97aa601dbc70..1b1542906d7c 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,20 +1,20 @@
# Template file for 'dino'
pkgname=dino
-version=0.3.1
+version=0.4.0
revision=1
build_style=cmake
configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON -DUSE_SOUP3=ON"
hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel"
-makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee-devel
+makedepends="glib-devel qrencode-devel gtk4-devel gpgme-devel libgee-devel
libgcrypt-devel libsoup3-devel libsignal-protocol-c-devel sqlite-devel
libcanberra-devel gspell-devel libsrtp-devel libnice-devel gnutls-devel
- gst-plugins-base1-devel"
+ gst-plugins-base1-devel libadwaita-devel"
short_desc='Modern XMPP ("Jabber") Chat Client using GTK+/Vala'
maintainer="Anjandev Momi <anjan@momi.ca>"
license="GPL-3.0-or-later"
homepage="https://github.com/dino/dino"
distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz"
-checksum=7178fc6b5efcea4e4ab49a7cae58224b5236660816e247a23124466984a9fbf9
+checksum=ee201f4f58b4da269c18594b0960f66fa07519e0ead4a5951189ff3396f3976c
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTS=ON"
From ef0a0672fd28a71929d0a46f0bc06612e6e41ec0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 23:05:24 -0500
Subject: [PATCH 286/356] jdupes: update to 1.21.2
---
srcpkgs/jdupes/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/jdupes/template b/srcpkgs/jdupes/template
index 873b07da8a6f..f4baa0830987 100644
--- a/srcpkgs/jdupes/template
+++ b/srcpkgs/jdupes/template
@@ -1,6 +1,6 @@
# Template file for 'jdupes'
pkgname=jdupes
-version=1.21.1
+version=1.21.2
revision=1
build_style=gnu-makefile
make_build_args="ENABLE_BTRFS=1"
@@ -9,8 +9,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/jbruchon/jdupes"
changelog="https://raw.githubusercontent.com/jbruchon/jdupes/master/CHANGES"
-distfiles="https://github.com/jbruchon/jdupes/archive/v${version}.tar.gz"
-checksum=22de88d1963f70c8ed4d0aa40abe05b48aaa4cc08eed6a2c6c9747010f9f4eb7
+distfiles="https://github.com/jbruchon/jdupes/archive/refs/tags/v${version}.tar.gz"
+checksum=5c92333b06cefb1092bf398349218499c6aba94ae735316623a0114f9eda0f75
CFLAGS="-DENABLE_DEDUPE"
From f61c1a0a216f3514d6eab274797cced46a673e57 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 15:13:15 +0100
Subject: [PATCH 287/356] wiggle: update to 1.3
---
srcpkgs/wiggle/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wiggle/template b/srcpkgs/wiggle/template
index 5606c0491cb5..c09f8c7fda85 100644
--- a/srcpkgs/wiggle/template
+++ b/srcpkgs/wiggle/template
@@ -1,16 +1,17 @@
# Template file for 'wiggle'
pkgname=wiggle
-version=1.2
+version=1.3
revision=1
build_style=gnu-makefile
-make_build_args="CPPFLAGS=-I."
+make_build_args="CFLAGS=-I."
make_build_target="wiggle"
+make_check_target="test"
make_install_args="STRIP="
hostmakedepends="groff"
makedepends="ncurses-devel"
short_desc="Apply patches that patch rejects"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
-homepage="http://git.neil.brown.name/?p=wiggle.git;a=summary"
-distfiles="http://neil.brown.name/wiggle/wiggle-${version}.tar.gz"
-checksum=31375badb76a4a586f2113e49d13486dbc64844962ae80976a81c6542e901622
+homepage="https://github.com/neilbrown/wiggle"
+distfiles="https://github.com/neilbrown/wiggle/archive/refs/tags/v${version}.tar.gz"
+checksum=ff92cf0133c1f4dce33563e263cb30e7ddb6f4abdf86d427b1ec1490bec25afa
From 369670c56b06f5a177d12b43905cf047e714a519 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:25:53 -0500
Subject: [PATCH 288/356] python3: update to 3.11.2.
---
srcpkgs/python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 3b37f46a8a91..a07ddb08e0c4 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
# THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
#
pkgname=python3
-version=3.11.1
+version=3.11.2
revision=1
build_style="gnu-configure"
configure_args="--enable-shared --enable-ipv6
@@ -25,7 +25,7 @@ distfiles="
https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz
${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz
"
-checksum="85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f
+checksum="29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34"
skip_extraction="${_bluez}.tar.xz"
From 4696f6ace014b75d02631947e59659a69630ee34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:27:15 -0500
Subject: [PATCH 289/356] python3-tkinter: update to 3.11.2.
---
srcpkgs/python3-tkinter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 527642c8d805..3c653153eba3 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
_desc="Python programming language"
pkgname=python3-tkinter
-version=3.11.1
+version=3.11.2
revision=1
build_style="gnu-configure"
configure_args="--enable-shared --enable-ipv6
@@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
homepage="https://www.python.org"
license="Python-2.0"
distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"
-checksum=85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f
+checksum=29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3"
From f1ce4ac139db32ba8c9b1f9b51dc50bc780e3341 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:27:50 -0500
Subject: [PATCH 290/356] python3-setuptools: update to 67.2.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 28bd7143f18e..0d70f2b7255a 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=67.1.0
+version=67.2.0
revision=1
build_style=python3-module
hostmakedepends="python3-devel"
@@ -11,7 +11,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=e261cdf010c11a41cb5cb5f1bf3338a7433832029f559a6a7614bd42a967c300
+checksum=b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
# Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;
From 0556c6031d21f74ec7e065ffd0e4f0f09886547d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:28:10 -0500
Subject: [PATCH 291/356] python3-cryptography_vectors: update to 39.0.1.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index d87c82d86ed0..bf7d13b48dc7 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=39.0.0
+version=39.0.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=52e59670a0820b5bbfa85f724b8aebd61385787eb8b6607f64d533969124b2a0
+checksum=0cbaeb50bdb7f3c9d7a93b26a0462ef6e97c768ca78d902854fe045c30b680c6
post_install() {
vlicense LICENSE
From c5a5ead4f806309a42ccfedac986cb4c3fae4ff0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:24 -0500
Subject: [PATCH 292/356] python3-cryptography: update to 39.0.1.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 68349a14fa70..08aa24d5d126 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=39.0.0
+version=39.0.1
revision=1
build_style=python3-module
build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=f964c7dcf7802d133e8dbd1565914fa0194f9d683d82411989889ecd701e8adf
+checksum=d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From e9137a810d000e20bf00e10baa40962502b2451c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:32 -0500
Subject: [PATCH 293/356] python3-redis: update to 4.5.1.
---
srcpkgs/python3-redis/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template
index 91e1e68f6b37..ea50c6a0cfe3 100644
--- a/srcpkgs/python3-redis/template
+++ b/srcpkgs/python3-redis/template
@@ -1,6 +1,6 @@
# Template file for 'python3-redis'
pkgname=python3-redis
-version=4.4.2
+version=4.5.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/redis/redis-py"
changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES"
distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
-checksum=a010f6cb7378065040a02839c3f75c7e0fb37a87116fb4a95be82a95552776c7
+checksum=1eec3741cda408d3a5f84b78d089c8b8d895f21b3b050988351e925faf202864
replaces="python3-aioredis<=2.0.1_1"
make_check=no # tests require a running redis server
From 049ec664c25454abddedbe61835e0985c5ea7a20 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 8 Feb 2023 09:30:35 -0500
Subject: [PATCH 294/356] opencl2-headers: update to 2023.02.06.
---
srcpkgs/opencl2-headers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
index 75104e986795..637273a142e1 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl2-headers/template
@@ -1,13 +1,13 @@
# Template file for 'opencl2-headers'
pkgname=opencl2-headers
-version=2022.09.30
+version=2023.02.06
revision=1
short_desc="OpenCL 2.2 (Open Computing Language) header files"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://github.com/KhronosGroup/OpenCL-Headers"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ae857ecb28af95a420c800b21ed2d0f437503e104f841ab8db249df5f4fbe5c
+checksum=464d1b04a5e185739065b2d86e4cebf02c154c416d63e6067a5060d7c053c79a
provides="opencl-headers-${version}_${revision}"
replaces="opencl-headers>=0"
From de22beadbb50ca1c2d1b15266aac2b3797799621 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.eu>
Date: Sun, 22 Jan 2023 06:56:38 +0100
Subject: [PATCH 295/356] python3-sh: update to 1.14.3.
---
...n-some-systems.-Use-a-random-dir-ins.patch | 46 -------------------
srcpkgs/python3-sh/template | 8 ++--
2 files changed, 4 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
diff --git a/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch b/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
deleted file mode 100644
index 1c0063a411e0..000000000000
--- a/srcpkgs/python3-sh/patches/0001-CWD-may-be-tmp-on-some-systems.-Use-a-random-dir-ins.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6b9fc9ace0219fd7199cb0d0261b01e364e96fe2 Mon Sep 17 00:00:00 2001
-From: Erik Cederstrand <erik@cederstrand.dk>
-Date: Mon, 16 Aug 2021 08:18:31 +0200
-Subject: [PATCH] CWD may be /tmp on some systems. Use a random dir instead.
- Fixes #582
-
----
- test.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/test.py b/test.py
-index 4e9e8e0..d438e30 100644
---- a/test.py
-+++ b/test.py
-@@ -2261,13 +2261,15 @@ p.wait()
-
- def test_pushd(self):
- """ test basic pushd functionality """
-+ child = realpath(tempfile.mkdtemp())
-+
- old_wd1 = sh.pwd().strip()
- old_wd2 = os.getcwd()
-
- self.assertEqual(old_wd1, old_wd2)
-- self.assertNotEqual(old_wd1, tempdir)
-+ self.assertNotEqual(old_wd1, child)
-
-- with sh.pushd(tempdir):
-+ with sh.pushd(child):
- new_wd1 = sh.pwd().strip()
- new_wd2 = os.getcwd()
-
-@@ -2276,8 +2278,8 @@ p.wait()
- self.assertEqual(old_wd3, old_wd4)
- self.assertEqual(old_wd1, old_wd3)
-
-- self.assertEqual(new_wd1, tempdir)
-- self.assertEqual(new_wd2, tempdir)
-+ self.assertEqual(new_wd1, child)
-+ self.assertEqual(new_wd2, child)
-
- def test_pushd_cd(self):
- """ test that pushd works like pushd/popd with built-in cd correctly """
---
-2.32.0
-
diff --git a/srcpkgs/python3-sh/template b/srcpkgs/python3-sh/template
index 47e97a175991..a36c8805052b 100644
--- a/srcpkgs/python3-sh/template
+++ b/srcpkgs/python3-sh/template
@@ -1,17 +1,17 @@
# Template file for 'python3-sh'
pkgname=python3-sh
-version=1.14.2
-revision=4
+version=1.14.3
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
checkdepends="python3-Pygments python3-coverage python3-coveralls python3-docopt python3-docutils flake8"
short_desc="Python subprocess replacement (Python3)"
-maintainer="pulux <pulux@pf4sh.de>"
+maintainer="pulux <pulux@pf4sh.eu>"
license="MIT"
homepage="https://github.com/amoffat/sh"
distfiles="${PYPI_SITE}/s/sh/sh-${version}.tar.gz"
-checksum=9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d
+checksum=e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7
post_install() {
vlicense LICENSE.txt
From b7421a2dc4e785b688aca8909e2ef5d03050fb5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 20:16:23 +0100
Subject: [PATCH 296/356] racket: update to 8.8.
---
srcpkgs/racket/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 0f22d6c04649..2d96716c8afe 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,6 +1,6 @@
# Template file for 'racket'
pkgname=racket
-version=8.7
+version=8.8
revision=1
archs="aarch64* armv6* armv7* i686* x86_64*"
build_wrksrc=src
@@ -15,7 +15,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="LGPL-3.0-only, MIT"
homepage="http://racket-lang.org/"
distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${version}-src.tgz"
-checksum=76a7e66d47e73eb0dc3fca27fc818e36e1d4bffe74da263c5efe3b8801a30a01
+checksum=398422e2b42373e14e4e0f96da3d95cb5744247ba3f73ea99815fb693c2714ab
nostrip=yes
patch_args="-Np2"
From 2901eea3e39e18b7bdf7ccdd7a5b48e661401a8d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 8 Feb 2023 21:08:31 +0100
Subject: [PATCH 297/356] New package: rdrview-0.1
---
srcpkgs/rdrview/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/rdrview/template
diff --git a/srcpkgs/rdrview/template b/srcpkgs/rdrview/template
new file mode 100644
index 000000000000..7be70b9b09d5
--- /dev/null
+++ b/srcpkgs/rdrview/template
@@ -0,0 +1,12 @@
+# Template file for 'rdrview'
+pkgname=rdrview
+version=0.1
+revision=1
+build_style=gnu-makefile
+makedepends="libcurl-devel libseccomp-devel libxml2-devel"
+short_desc="Firefox Reader View as a command line tool"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="Apache-2.0"
+homepage="https://github.com/eafer/rdrview"
+distfiles="https://github.com/eafer/rdrview/archive/refs/tags/v${version}.tar.gz"
+checksum=6cb6688b3465f71ced13b889708cbd728193d7137f4108511a3fd2d4331d7f0c
From c989e82b1ac34d2240e2657cac018985589b0da8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 3 Feb 2023 15:33:19 +0100
Subject: [PATCH 298/356] AppStream: update to 0.16.0.
---
srcpkgs/AppStream/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 5eca5e52e637..d6ccdfffeab8 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,11 +1,11 @@
# Template file for 'AppStream'
pkgname=AppStream
-version=0.15.6
+version=0.16.0
revision=1
build_style=meson
build_helper="gir qemu"
configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
- -Dstemming=false -Dapidocs=false -Dqt=true"
+ -Dstemming=false -Dapidocs=false -Dqt=true -Dsystemd=false"
hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
qt5-host-tools $(vopt_if vala vala) itstool"
makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
homepage="https://github.com/ximion/appstream"
changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=d46a6689f57aaefb587f01bf91071966b3e65de15b833d11e1911ce07a1350f2
+checksum=ffbd4af94aafd3edd8f965391b95a49b385918ed8633b96406e2c225baffec9b
conf_files="/etc/appstream.conf"
triggers="appstream-cache"
@@ -24,7 +24,7 @@ build_options="gir vala"
build_options_default="gir vala"
AppStream-devel_package() {
- depends="AppStream-${version}_${revision} AppStream-qt-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} AppStream-qt>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 863f74fb91e39ae68e252fbd7390d21d5a3d2c5c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 21:43:34 +0100
Subject: [PATCH 299/356] less: fix update-check, add changelog
---
srcpkgs/less/template | 1 +
srcpkgs/less/update | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index b700271611e2..3a6680224b55 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -9,5 +9,6 @@ short_desc="Pager program similar to more(1)"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.greenwoodsoftware.com/less"
+changelog="https://raw.githubusercontent.com/gwsw/less/master/NEWS"
distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
checksum=a69abe2e0a126777e021d3b73aa3222e1b261f10e64624d41ec079685a6ac209
diff --git a/srcpkgs/less/update b/srcpkgs/less/update
index 50cae37e4fa6..582a7ed6c740 100644
--- a/srcpkgs/less/update
+++ b/srcpkgs/less/update
@@ -1,2 +1 @@
-site='https://greenwoodsoftware.com/less/release.txt'
-pattern='\d+'
+site="https://greenwoodsoftware.com/less/download.html"
From 90f01f909c6b38300d0587e0f5ed620cd76893a4 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 6 Feb 2023 12:22:00 +0530
Subject: [PATCH 300/356] noto-fonts-ttf: update to 23.2.1.
Fix update reporting.
---
srcpkgs/noto-fonts-ttf/template | 18 +++++++-----------
srcpkgs/noto-fonts-ttf/update | 1 +
2 files changed, 8 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/noto-fonts-ttf/update
diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index c676d1773e31..d3ac05ed8dfb 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,25 +1,21 @@
# Template file for 'noto-fonts-ttf'
pkgname=noto-fonts-ttf
-version=20220810
+reverts="20220810_1 20190926_2 20190926_1 20181202_1 20181106_1"
+version=23.2.1
revision=1
-_githash=2725c70baa8b0176c7577093ba1fc6179aa79478
depends="font-util"
short_desc="Google Noto TTF Fonts"
maintainer="classabbyamp <void@placeviolette.net>"
license="OFL-1.1"
-homepage="https://www.google.com/get/noto/"
-# XXX: change to https://github.com/notofonts/notofonts.github.io/tree/main/fonts when migration is complete
-# also see https://github.com/notofonts/noto-fonts/issues/2388
-distfiles="https://github.com/notofonts/noto-fonts/archive/${_githash}.tar.gz"
-checksum=c1238ca0fc1e954ee2be444cafd53c033b13fa93f8a1e88f7137e9e028e6891e
+homepage="https://notofonts.github.io/"
+distfiles="https://github.com/notofonts/notofonts.github.io/archive/refs/tags/noto-monthly-release-${version}.tar.gz"
+checksum=af1c9b5e2ea768da792b1a95a5aabd36afc8b76131f04e7adc5ea7857b0c4791
font_dirs="/usr/share/fonts/noto"
do_install() {
- # remove duplicates
- rm hinted/ttf/NotoSansTifinagh/NotoSansTifinagh[AGHRST]*.ttf
+ vlicense fonts/LICENSE
vmkdir usr/share/fonts/noto
- vcopy "hinted/ttf/Noto*/*" usr/share/fonts/noto
- vlicense LICENSE
+ vcopy "fonts/Noto*/hinted/ttf/*.ttf" usr/share/fonts/noto
}
noto-fonts-ttf-extra_package() {
diff --git a/srcpkgs/noto-fonts-ttf/update b/srcpkgs/noto-fonts-ttf/update
new file mode 100644
index 000000000000..f5a25386ba8b
--- /dev/null
+++ b/srcpkgs/noto-fonts-ttf/update
@@ -0,0 +1 @@
+pattern="/archive/refs/tags/noto-monthly-release-\K[\d.]+(?=\.tar\.gz)"
From 90808a5787590cc34ccaa9db69b8b64294a90983 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 8 Feb 2023 17:15:36 +0100
Subject: [PATCH 301/356] chromium: update to 110.0.5481.77.
---
...chromium-110-CredentialUIEntry-const.patch | 41 ++++
...romium-110-DarkModeLABColorSpace-pow.patch | 37 ++++
.../chromium-110-NativeThemeBase-fabs.patch | 29 +++
...the-Stack-object-from-ThreadLocalTop.patch | 205 ++++++++++++++++++
srcpkgs/chromium/template | 11 +-
5 files changed, 317 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
create mode 100644 srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
create mode 100644 srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
create mode 100644 srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
diff --git a/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch b/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
new file mode 100644
index 000000000000..eb68aa27aca4
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-CredentialUIEntry-const.patch
@@ -0,0 +1,41 @@
+From b4e56d22275cae5a910463a966a96345430a83ea Mon Sep 17 00:00:00 2001
+From: Ivan Murashov <ivan.murashov@lge.com>
+Date: Sat, 17 Dec 2022 12:06:01 +0000
+Subject: [PATCH] libstdc++: Don't use const members in std::vector in password_manager::CredentialUIEntry
+
+Otherwise build fails when building with use_custom_libcxx=false.
+The error example:
+std::vector must have a non-const, non-volatile value_type
+
+Implementation of std::vector in libstdc++ does not allow const.
+
+Bug: 957519
+Change-Id: I089de2d52df25138d74dbf01fdf61d6301b4d871
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4111037
+Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
+Commit-Queue: Mohamed Amir Yosef <mamir@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1084697}
+---
+
+diff --git a/components/password_manager/core/browser/ui/credential_ui_entry.cc b/components/password_manager/core/browser/ui/credential_ui_entry.cc
+index 1e0766a..a9a34f7 100644
+--- a/components/password_manager/core/browser/ui/credential_ui_entry.cc
++++ b/components/password_manager/core/browser/ui/credential_ui_entry.cc
+@@ -97,7 +97,7 @@
+ // For cases when the notes differ within grouped passwords (e.g: a
+ // credential exists in both account and profile stores), respective notes
+ // should be concatenated and linebreak used as a delimiter.
+- std::vector<const std::u16string> notes_with_duplicates;
++ std::vector<std::u16string> notes_with_duplicates;
+ for (const auto& form : forms) {
+ // Only notes with an empty `unique_display_name` are supported in the
+ // settings UI.
+@@ -109,7 +109,7 @@
+ }
+ auto unique_notes =
+ base::MakeFlatSet<std::u16string>(std::move(notes_with_duplicates));
+- note = base::JoinString(std::vector<const std::u16string>(
++ note = base::JoinString(std::vector<std::u16string>(
+ unique_notes.begin(), unique_notes.end()),
+ u"\n");
+
diff --git a/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch b/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
new file mode 100644
index 000000000000..91f1aee073e6
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-DarkModeLABColorSpace-pow.patch
@@ -0,0 +1,37 @@
+From 795c311aae4b718585bc6194189f061000c823a1 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 23 Dec 2022 14:28:55 +0000
+Subject: [PATCH] libstdc++: fix narrowing in blink::DarkModeLABColorSpace
+
+Clang-14 errors out with narrowing from double to float. Use std::pow
+instead.
+---
+ .../renderer/platform/graphics/dark_mode_lab_color_space.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h b/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
+index 999c3e5..c18ea7b 100644
+--- a/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
++++ b/third_party/blink/renderer/platform/graphics/dark_mode_lab_color_space.h
+@@ -125,7 +125,7 @@ class DarkModeLABColorSpace {
+ // https://en.wikipedia.org/wiki/CIELAB_color_space#Reverse_transformation.
+ SkV3 FromXYZ(const SkV3& v) const {
+ auto f = [](float x) {
+- return x > kSigma3 ? pow(x, 1.0f / 3.0f)
++ return x > kSigma3 ? std::pow(x, 1.0f / 3.0f)
+ : x / (3 * kSigma2) + 4.0f / 29.0f;
+ };
+
+@@ -145,7 +145,8 @@ class DarkModeLABColorSpace {
+ // https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
+ SkV3 ToXYZ(const SkV3& lab) const {
+ auto invf = [](float x) {
+- return x > kSigma ? pow(x, 3.0f) : 3.0f * kSigma2 * (x - 4.0f / 29.0f);
++ return x > kSigma ? std::pow(x, 3.0f)
++ : 3.0f * kSigma2 * (x - 4.0f / 29.0f);
+ };
+
+ SkV3 v = {Clamp(lab.x, 0.0f, 100.0f), Clamp(lab.y, -128.0f, 128.0f),
+--
+2.38.2
+
diff --git a/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch b/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
new file mode 100644
index 000000000000..c7d0e8b1de8d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-110-NativeThemeBase-fabs.patch
@@ -0,0 +1,29 @@
+From 07f0a87e4409f27854b3a1d17f270a3497f38947 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 19 Dec 2022 19:07:37 +0000
+Subject: [PATCH] GCC: use fabsf in ui::NativeThemeBase::OutlineColor
+
+Template deduction fails for base::clamp, because return type of
+fabs is double and all other parameters are float.
+
+Bug: 819294
+Change-Id: I34f1c9c99d13f69097d899bfcb0526cbdf4fe1c1
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4110869
+Reviewed-by: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#1085034}
+---
+
+diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc
+index 169c60c..36db49a 100644
+--- a/ui/native_theme/native_theme_base.cc
++++ b/ui/native_theme/native_theme_base.cc
+@@ -1336,7 +1336,7 @@
+ // The following code has been tested to look OK with all of the
+ // default GTK themes.
+ SkScalar min_diff = base::clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
+- SkScalar diff = base::clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
++ SkScalar diff = base::clamp(fabsf(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
+
+ if (hsv1[2] + hsv2[2] > 1.0)
+ diff = -diff;
diff --git a/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch b/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
new file mode 100644
index 000000000000..73e042cf5562
--- /dev/null
+++ b/srcpkgs/chromium/patches/v8-move-the-Stack-object-from-ThreadLocalTop.patch
@@ -0,0 +1,205 @@
+From 7b6fbcd0a6700db498ad55db046ecda92c8ee8c1 Mon Sep 17 00:00:00 2001
+From: Nikolaos Papaspyrou <nikolaos@chromium.org>
+Date: Sun, 29 Jan 2023 17:18:08 +0100
+Subject: [PATCH] Merge: [heap] Move the Stack object from ThreadLocalTop to
+ Isolate
+
+This is just for nodejs, do not backmerge to 11.0.
+(cherry picked from commit 1e4b71d99fea5ea6bb4bf6420585a7819872bb0f)
+
+> Change-Id: I026a35af3bc6999a09b21f277756d4454c086343
+> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4152476
+> Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
+> Reviewed-by: Omer Katz <omerkatz@chromium.org>
+> Commit-Queue: Nikolaos Papaspyrou <nikolaos@chromium.org>
+> Cr-Commit-Position: refs/heads/main@{#85445}
+
+Stack information is thread-specific and, until now, it was stored in a
+field in ThreadLocalTop. This CL moves stack information to the isolate
+and makes sure to update the stack start whenever a main thread enters
+the isolate. At the same time, the Stack object is refactored and
+simplified.
+
+As a side effect, after removing the Stack object, ThreadLocalTop
+satisfies the std::standard_layout trait; this fixes some issues
+observed with different C++ compilers.
+
+Bug: v8:13630
+Bug: v8:13257
+Change-Id: I4be1f04fe90699e1a6e456dad3e0dd623851acce
+---
+ src/execution/isolate.cc | 36 +++++++++++++++----------------
+ src/execution/isolate.h | 6 ++++++
+ src/execution/thread-local-top.cc | 2 --
+ src/execution/thread-local-top.h | 6 +-----
+ src/heap/heap.cc | 4 +---
+ 5 files changed, 25 insertions(+), 29 deletions(-)
+
+diff --git a/src/execution/isolate.cc b/src/execution/isolate.cc
+index 4edf364e0a..be4fd400d2 100644
+--- a/v8/src/execution/isolate.cc
++++ b/v8/src/execution/isolate.cc
+@@ -3074,22 +3074,23 @@ void Isolate::AddSharedWasmMemory(Handle<WasmMemoryObject> memory_object) {
+ void Isolate::RecordStackSwitchForScanning() {
+ Object current = root(RootIndex::kActiveContinuation);
+ DCHECK(!current.IsUndefined());
+- thread_local_top()->stack_.ClearStackSegments();
+- wasm::StackMemory* stack = Managed<wasm::StackMemory>::cast(
+- WasmContinuationObject::cast(current).stack())
+- .get()
+- .get();
++ stack().ClearStackSegments();
++ wasm::StackMemory* wasm_stack =
++ Managed<wasm::StackMemory>::cast(
++ WasmContinuationObject::cast(current).stack())
++ .get()
++ .get();
+ current = WasmContinuationObject::cast(current).parent();
+- thread_local_top()->stack_.SetStackStart(
+- reinterpret_cast<void*>(stack->base()));
++ heap()->SetStackStart(reinterpret_cast<void*>(wasm_stack->base()));
+ // We don't need to add all inactive stacks. Only the ones in the active chain
+ // may contain cpp heap pointers.
+ while (!current.IsUndefined()) {
+ auto cont = WasmContinuationObject::cast(current);
+- auto* stack = Managed<wasm::StackMemory>::cast(cont.stack()).get().get();
+- thread_local_top()->stack_.AddStackSegment(
+- reinterpret_cast<const void*>(stack->base()),
+- reinterpret_cast<const void*>(stack->jmpbuf()->sp));
++ auto* wasm_stack =
++ Managed<wasm::StackMemory>::cast(cont.stack()).get().get();
++ stack().AddStackSegment(
++ reinterpret_cast<const void*>(wasm_stack->base()),
++ reinterpret_cast<const void*>(wasm_stack->jmpbuf()->sp));
+ current = cont.parent();
+ }
+ }
+@@ -3377,20 +3378,13 @@ void Isolate::Delete(Isolate* isolate) {
+ Isolate* saved_isolate = isolate->TryGetCurrent();
+ SetIsolateThreadLocals(isolate, nullptr);
+ isolate->set_thread_id(ThreadId::Current());
+- isolate->thread_local_top()->stack_ =
+- saved_isolate ? std::move(saved_isolate->thread_local_top()->stack_)
+- : ::heap::base::Stack(base::Stack::GetStackStart());
++ isolate->heap()->SetStackStart(base::Stack::GetStackStart());
+
+ bool owns_shared_isolate = isolate->owns_shared_isolate_;
+ Isolate* maybe_shared_isolate = isolate->shared_isolate_;
+
+ isolate->Deinit();
+
+- // Restore the saved isolate's stack.
+- if (saved_isolate)
+- saved_isolate->thread_local_top()->stack_ =
+- std::move(isolate->thread_local_top()->stack_);
+-
+ #ifdef DEBUG
+ non_disposed_isolates_--;
+ #endif // DEBUG
+@@ -4647,6 +4641,10 @@ bool Isolate::Init(SnapshotData* startup_snapshot_data,
+ void Isolate::Enter() {
+ Isolate* current_isolate = nullptr;
+ PerIsolateThreadData* current_data = CurrentPerIsolateThreadData();
++
++ // Set the stack start for the main thread that enters the isolate.
++ heap()->SetStackStart(base::Stack::GetStackStart());
++
+ if (current_data != nullptr) {
+ current_isolate = current_data->isolate_;
+ DCHECK_NOT_NULL(current_isolate);
+diff --git a/src/execution/isolate.h b/src/execution/isolate.h
+index a32f999fe5..1cb6e10661 100644
+--- a/v8/src/execution/isolate.h
++++ b/v8/src/execution/isolate.h
+@@ -32,6 +32,7 @@
+ #include "src/execution/stack-guard.h"
+ #include "src/handles/handles.h"
+ #include "src/handles/traced-handles.h"
++#include "src/heap/base/stack.h"
+ #include "src/heap/factory.h"
+ #include "src/heap/heap.h"
+ #include "src/heap/read-only-heap.h"
+@@ -2022,6 +2023,8 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
+ SimulatorData* simulator_data() { return simulator_data_; }
+ #endif
+
++ ::heap::base::Stack& stack() { return stack_; }
++
+ #ifdef V8_ENABLE_WEBASSEMBLY
+ wasm::StackMemory*& wasm_stacks() { return wasm_stacks_; }
+ // Update the thread local's Stack object so that it is aware of the new stack
+@@ -2520,6 +2523,9 @@ class V8_EXPORT_PRIVATE Isolate final : private HiddenFactory {
+ // The mutex only guards adding pages, the retrieval is signal safe.
+ base::Mutex code_pages_mutex_;
+
++ // Stack information for the main thread.
++ ::heap::base::Stack stack_;
++
+ #ifdef V8_ENABLE_WEBASSEMBLY
+ wasm::StackMemory* wasm_stacks_;
+ #endif
+diff --git a/src/execution/thread-local-top.cc b/src/execution/thread-local-top.cc
+index 0d7071ddda..05cc20b8e4 100644
+--- a/v8/src/execution/thread-local-top.cc
++++ b/v8/src/execution/thread-local-top.cc
+@@ -37,14 +37,12 @@ void ThreadLocalTop::Clear() {
+ current_embedder_state_ = nullptr;
+ failed_access_check_callback_ = nullptr;
+ thread_in_wasm_flag_address_ = kNullAddress;
+- stack_ = ::heap::base::Stack();
+ }
+
+ void ThreadLocalTop::Initialize(Isolate* isolate) {
+ Clear();
+ isolate_ = isolate;
+ thread_id_ = ThreadId::Current();
+- stack_.SetStackStart(base::Stack::GetStackStart());
+ #if V8_ENABLE_WEBASSEMBLY
+ thread_in_wasm_flag_address_ = reinterpret_cast<Address>(
+ trap_handler::GetThreadInWasmThreadLocalAddress());
+diff --git a/src/execution/thread-local-top.h b/src/execution/thread-local-top.h
+index 43fec0a7df..989c817f31 100644
+--- a/v8/src/execution/thread-local-top.h
++++ b/v8/src/execution/thread-local-top.h
+@@ -10,7 +10,6 @@
+ #include "include/v8-unwinder.h"
+ #include "src/common/globals.h"
+ #include "src/execution/thread-id.h"
+-#include "src/heap/base/stack.h"
+ #include "src/objects/contexts.h"
+ #include "src/utils/utils.h"
+
+@@ -30,7 +29,7 @@ class ThreadLocalTop {
+ // TODO(all): This is not particularly beautiful. We should probably
+ // refactor this to really consist of just Addresses and 32-bit
+ // integer fields.
+- static constexpr uint32_t kSizeInBytes = 30 * kSystemPointerSize;
++ static constexpr uint32_t kSizeInBytes = 25 * kSystemPointerSize;
+
+ // Does early low-level initialization that does not depend on the
+ // isolate being present.
+@@ -147,9 +146,6 @@ class ThreadLocalTop {
+
+ // Address of the thread-local "thread in wasm" flag.
+ Address thread_in_wasm_flag_address_;
+-
+- // Stack information.
+- ::heap::base::Stack stack_;
+ };
+
+ } // namespace internal
+diff --git a/src/heap/heap.cc b/src/heap/heap.cc
+index 51a90ddcab..b5722ab6ec 100644
+--- a/v8/src/heap/heap.cc
++++ b/v8/src/heap/heap.cc
+@@ -5851,9 +5851,7 @@ void Heap::SetStackStart(void* stack_start) {
+ stack().SetStackStart(stack_start);
+ }
+
+-::heap::base::Stack& Heap::stack() {
+- return isolate_->thread_local_top()->stack_;
+-}
++::heap::base::Stack& Heap::stack() { return isolate_->stack(); }
+
+ void Heap::RegisterExternallyReferencedObject(Address* location) {
+ Object object = TracedHandles::Mark(location, TracedHandles::MarkMode::kAll);
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 54b2bc4fd3a3..b4b03f3b1410 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,14 +1,14 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=109.0.5414.119
+version=110.0.5481.77
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm12")
$(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
- libatomic-devel libepoxy-devel libevent-devel libglib-devel wayland-devel"
+ libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel
fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel
@@ -18,7 +18,7 @@ makedepends="
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,7 +28,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=cbcdef5ee71acb53790ded3adef86871812b46e9f208dce8ec3f8ab04958be2d
+checksum=e348ab2dc4311083e729d714a81e95dd9db108ff71437dde451c97ac939881ce
lib32disabled=yes
@@ -213,8 +213,7 @@ do_configure() {
'enable_hangout_services_extension=true'
'use_system_harfbuzz=false'
- 'use_system_libwayland=true'
- 'use_system_wayland_scanner=true'
+ 'use_system_libffi=true'
'use_qt=false'
From dfd9b1c1ade601f7dc12d4a29f72a4c06053bb23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 2 Feb 2023 19:54:31 +0100
Subject: [PATCH 302/356] domain_exporter: update to 0.1.24.
---
srcpkgs/domain_exporter/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/domain_exporter/template b/srcpkgs/domain_exporter/template
index 5035a3b4240c..b122720b0c71 100644
--- a/srcpkgs/domain_exporter/template
+++ b/srcpkgs/domain_exporter/template
@@ -1,13 +1,12 @@
# Template file for 'domain_exporter'
pkgname=domain_exporter
-version=0.1.8
+version=0.1.24
revision=1
build_style=go
go_import_path="github.com/shift/domain_exporter"
-hostmakedepends="git"
short_desc="Prometheus WHOIS domain details exporter"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="Apache-2.0"
homepage="https://github.com/shift/domain_exporter"
distfiles="https://github.com/shift/domain_exporter/archive/v${version}.tar.gz"
-checksum=f45a60f75832cf6b2df8943b570a636956901399d01f10b2d6bbf7e5ed24077d
+checksum=62262d3234f7404859b21647dbb3661e425eeb44b9fad8e5368ddc4bd91364f2
From fd5444bb2574a5fc2d5fc002876af1d4afa55df2 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 9 Feb 2023 05:04:14 -0500
Subject: [PATCH 303/356] discord-ptb: update to 0.0.39.
---
srcpkgs/discord-ptb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template
index eb92370a7d8e..86351339a372 100644
--- a/srcpkgs/discord-ptb/template
+++ b/srcpkgs/discord-ptb/template
@@ -1,6 +1,6 @@
# Template file for 'discord-ptb'
pkgname=discord-ptb
-version=0.0.38
+version=0.0.39
revision=1
archs="x86_64"
depends="alsa-lib dbus-glib gtk+3 libnotify nss libXtst libcxx libatomic
@@ -10,7 +10,7 @@ maintainer="0x5c <dev@0x5c.io>"
license="custom:Proprietary"
homepage="https://discord.com/"
distfiles="https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"
-checksum=6cf83b64d410c44a514a9a7c8f9fd72c10c427221df260c6c52eadaa4cf3235b
+checksum=2e80e0de2c0ad7cac3b3353f75010ad3f27c0c8c6bab276c7df959a3c200464b
nopie=yes
restricted=yes
repository=nonfree
From 8087666b296c2789f17dda23ca0ad9ad6a660a92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 2 Feb 2023 19:54:31 +0100
Subject: [PATCH 304/356] element-desktop: add Proper MimeType to .desktop
---
srcpkgs/element-desktop/files/element-desktop.desktop | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/element-desktop/files/element-desktop.desktop b/srcpkgs/element-desktop/files/element-desktop.desktop
index e8ab06a41aaa..640f029499c9 100644
--- a/srcpkgs/element-desktop/files/element-desktop.desktop
+++ b/srcpkgs/element-desktop/files/element-desktop.desktop
@@ -7,3 +7,4 @@ Type=Application
Icon=element
StartupWMClass=element
Categories=Network;InstantMessaging;Chat;IRCClient
+MimeType=x-scheme-handler/element;
From a2dc1f68bf98217d51c2ffb3697b74c03694e40a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Feb 2023 09:12:51 +0100
Subject: [PATCH 305/356] uchardet: update to 0.0.8.
---
srcpkgs/uchardet/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uchardet/template b/srcpkgs/uchardet/template
index 1a2f1e2f6d74..8b7e4a2f870f 100644
--- a/srcpkgs/uchardet/template
+++ b/srcpkgs/uchardet/template
@@ -1,6 +1,6 @@
# Template file for 'uchardet'
pkgname=uchardet
-version=0.0.7
+version=0.0.8
revision=1
build_style=cmake
short_desc="Encoding detector library ported from Mozilla"
@@ -9,7 +9,7 @@ license="MPL-1.1"
homepage="https://www.freedesktop.org/wiki/Software/uchardet"
changelog="https://cgit.freedesktop.org/uchardet/uchardet/tag/?id=v${version}"
distfiles="$FREEDESKTOP_SITE/uchardet/releases/uchardet-${version}.tar.xz"
-checksum=3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1
+checksum=e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0
uchardet-devel_package() {
short_desc+=" - development files"
From b7cade31e99fd76563eec55ee59d87feba7ffcc1 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Mon, 6 Feb 2023 10:31:09 +0100
Subject: [PATCH 306/356] python3-PGPy: update to 0.6.0.
---
srcpkgs/python3-PGPy/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index 5268c19777ad..ee059076e373 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,18 +1,17 @@
# Template file for 'python3-PGPy'
pkgname=python3-PGPy
-version=0.5.4
-revision=2
+version=0.6.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-cryptography python3-pyasn1 python3-six"
+checkdepends="python3-pytest python3-progressbar $depends"
short_desc="Pretty Good Privacy for Python"
maintainer="Anjandev Momi <anjan@momi.ca>"
license="BSD-3-Clause"
homepage="https://github.com/SecurityInnovation/PGPy"
distfiles="https://github.com/SecurityInnovation/PGPy/archive/v${version}.tar.gz"
-checksum=beb2e7745ddebf85a24239aa681fa83a9ab8f8867d7ac55351fb0732279ac4fa
-# requires progressbar
-make_check=no
+checksum=33028fc2c47718a9215311bb22d6fed042074afbc91bf4e9764fdf0df54fc2b3
post_install() {
vlicense LICENSE
From 49b1990df1d3b0537eb9c217eaf342d48613a706 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:04:30 +0100
Subject: [PATCH 307/356] byacc: update to 20230201.
---
srcpkgs/byacc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/byacc/template b/srcpkgs/byacc/template
index 5f9d13aed378..c4165b043ced 100644
--- a/srcpkgs/byacc/template
+++ b/srcpkgs/byacc/template
@@ -1,6 +1,6 @@
# Template file for 'byacc'
pkgname=byacc
-version=20221229
+version=20230201
revision=1
build_style=gnu-configure
configure_args="--program-transform=s,^,b,"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="https://invisible-island.net/byacc/"
distfiles="ftp://ftp.invisible-island.net/byacc/byacc-${version}.tgz"
-checksum=1316c6f790fafa6688427f1ff91267b61d8b7873b443c620eef69a6eff0503bc
+checksum=576cc9d9ae5e22503ed5e3582498cf2cccacef401969106420547b4d05c87d76
alternatives="
yacc:yacc:/usr/bin/byacc
From 3eecf04b518447ba4203308c9a412a8cba7a2a5c Mon Sep 17 00:00:00 2001
From: Krul Ceter <kruceter@proton.me>
Date: Sun, 5 Feb 2023 10:33:31 +0300
Subject: [PATCH 308/356] darkhttpd: update to 1.14.
Closes: #42087 [via git-merge-pr]
---
srcpkgs/darkhttpd/template | 20 +++++++++-----------
srcpkgs/darkhttpd/update | 1 -
2 files changed, 9 insertions(+), 12 deletions(-)
delete mode 100644 srcpkgs/darkhttpd/update
diff --git a/srcpkgs/darkhttpd/template b/srcpkgs/darkhttpd/template
index 4a07f0c0ae51..9168438d17c7 100644
--- a/srcpkgs/darkhttpd/template
+++ b/srcpkgs/darkhttpd/template
@@ -1,27 +1,25 @@
# Template file for 'darkhttpd'
pkgname=darkhttpd
-version=1.13
+version=1.14
revision=1
short_desc="Small and secure static webserver"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="ISC"
homepage="https://unix4lyfe.org/darkhttpd/"
-distfiles="https://github.com/emikulic/darkhttpd/archive/v${version}.tar.gz"
-checksum=1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2
-CFLAGS="$CFLAGS $LDFLAGS"
+distfiles="https://github.com/emikulic/darkhttpd/archive/refs/tags/v${version}.tar.gz"
+checksum=e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195
# Create darkhttpd system user/group
system_accounts="_darkhttpd"
-make_dirs="/srv/www/${pkgname} 0755 _${pkgname} _${pkgname}
- /var/log/${pkgname} 0755 _${pkgname} _${pkgname}"
+make_dirs="/srv/www/darkhttpd 0755 _darkhttpd _darkhttpd
+ /var/log/darkhttpd 0755 _darkhttpd _darkhttpd"
do_build() {
- ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${pkgname}.c -o ${pkgname}
+ ${CC} ${CFLAGS} ${LDFLAGS} darkhttpd.c -o darkhttpd
}
do_install() {
- vsv ${pkgname}
- vbin ${pkgname}
- sed -n '0,/^$/p' darkhttpd.c > LICENSE
- vlicense LICENSE
+ vsv darkhttpd
+ vbin darkhttpd
+ vlicense COPYING LICENSE
}
diff --git a/srcpkgs/darkhttpd/update b/srcpkgs/darkhttpd/update
deleted file mode 100644
index 2c906cdbfdeb..000000000000
--- a/srcpkgs/darkhttpd/update
+++ /dev/null
@@ -1 +0,0 @@
-site=https://unix4lyfe.org/darkhttpd/
From 53e3703b84c12f8df37f9eef137611dc9581d7fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:18:18 +0100
Subject: [PATCH 309/356] acpid: don't generate events for cursor keys and
keypad enter.
Closes #41994.
---
srcpkgs/acpid/patches/no-cursor-events.patch | 16 ++++++++++++++++
srcpkgs/acpid/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/acpid/patches/no-cursor-events.patch
diff --git a/srcpkgs/acpid/patches/no-cursor-events.patch b/srcpkgs/acpid/patches/no-cursor-events.patch
new file mode 100644
index 000000000000..983c291153c2
--- /dev/null
+++ b/srcpkgs/acpid/patches/no-cursor-events.patch
@@ -0,0 +1,16 @@
+--- a/input_layer.c
++++ b/input_layer.c
+@@ -181,11 +181,13 @@
+ "button/kbdillumdown KBILLUMDOWN 00000080 00000000" },
+ { EV_KEY, KEY_COPY, 1, "button/copy COPY 00000080 00000000" },
+ { EV_KEY, KEY_RESTART, 1, "button/restart RSTR 00000080 00000000" },
++#if 0
+ { EV_KEY, KEY_KPENTER, 1, "button/kpenter KPENTER 00000080 00000000" },
+ { EV_KEY, KEY_UP, 1, "button/up UP 00000080 00000000" },
+ { EV_KEY, KEY_LEFT, 1, "button/left LEFT 00000080 00000000" },
+ { EV_KEY, KEY_RIGHT, 1, "button/right RIGHT 00000080 00000000" },
+ { EV_KEY, KEY_DOWN, 1, "button/down DOWN 00000080 00000000" },
++#endif
+ { EV_KEY, KEY_MENU, 1, "button/menu MENU 00000080 00000000" },
+ { EV_KEY, KEY_BACK, 1, "button/back BACK 00000080 00000000" },
+ { EV_KEY, KEY_HOMEPAGE, 1, "button/homepage HOMEPAGE 00000080 00000000" },
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 6e066b9409ba..1c498a233322 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,7 @@
# Template file for 'acpid'
pkgname=acpid
version=2.0.34
-revision=1
+revision=2
build_style=gnu-configure
short_desc="ACPI Daemon (acpid) With Netlink Support"
maintainer="Enno Boland <gottox@voidlinux.org>"
From bdef53b8838f51a7d6edd1ae50c955df775eaabd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:24:57 +0100
Subject: [PATCH 310/356] collectl: update to 4.3.8.
---
srcpkgs/collectl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 8eb6009ab822..0bb564862bfe 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,6 +1,6 @@
# Template file for 'collectl'
pkgname=collectl
-version=4.3.7
+version=4.3.8
revision=1
conf_files="/etc/collectl.conf"
depends="perl perl-Term-ReadKey"
@@ -10,7 +10,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
homepage="https://collectl.sourceforge.net/"
changelog="https://collectl.sourceforge.net/Releases.html"
distfiles="${SOURCEFORGE_SITE}/collectl/collectl-${version}.src.tar.gz"
-checksum=36a4cdf61c6880cc77fedf19a3bf10503e3f0783d77f589ba570a3006d501d5e
+checksum=6831de65a0af377b7dc92bd6439253f4f5d06cd77752d7ec5b8d92bfaa28240a
do_install() {
export DESTDIR
From c9e9b9131b49d2f540594b0c9203dbc9ff99e23a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:25:57 +0100
Subject: [PATCH 311/356] python3-pipenv: update to 2023.2.4.
---
srcpkgs/python3-pipenv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 5f819ac2c958..c619da985ef8 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pipenv'
pkgname=python3-pipenv
-version=2022.12.19
+version=2023.2.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel"
@@ -11,7 +11,7 @@ license="MIT"
homepage="https://github.com/pypa/pipenv"
changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=56a0e9305912293a8205e23b836b4abb9bca912fd5ef131214cdcdbc1861a1cc
+checksum=18a3eba519e36d59f0d5a7f9c42bd268521e4b9b7b3d1bd6adcf131569323275
conflicts="python-pipenv>=0"
make_check=no # tests are not contained in release tarball
From 2e0654ebb059d1ac281146d45cd3e6c6550f0cdd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:30:21 +0100
Subject: [PATCH 312/356] tig: update to 2.5.8.
---
srcpkgs/tig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index dbaae5bc2c3d..ee1ffcd00619 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -1,6 +1,6 @@
# Template file for 'tig'
pkgname=tig
-version=2.5.7
+version=2.5.8
revision=1
build_style=gnu-configure
make_install_args="install-doc-man"
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
homepage="https://jonas.github.io/tig/"
changelog="https://github.com/jonas/tig/blob/master/NEWS.adoc"
distfiles="https://github.com/jonas/tig/archive/tig-${version}.tar.gz"
-checksum=60a1acfda3238df28dfbe309adc1892a8c9b35138c738f1567c6c3c65c81fb72
+checksum=d8cbfe4ede9d79b0da93d9002e79e8e466d5b4d2eee3dfa3dabf9cd5551a51c9
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
From 18efd0bd1d32dc9a86f69ec6f89571fe81b33c1f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 13:48:55 +0100
Subject: [PATCH 313/356] qemacs: update to 5.4.1c.
Upstream moved to Github.
---
srcpkgs/qemacs/template | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/qemacs/template b/srcpkgs/qemacs/template
index a82bd65e0d37..dd6101eb9ac2 100644
--- a/srcpkgs/qemacs/template
+++ b/srcpkgs/qemacs/template
@@ -1,34 +1,29 @@
# Template file for 'qemacs'
pkgname=qemacs
-version=0.5.0.20170701
-revision=3
-create_wrksrc=yes
-build_wrksrc=qemacs
+version=5.4.1c
+revision=1
+_githash=216b3ff8b77ff138aec22045522d5601b7390e58
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man
--disable-x11 --disable-plugins"
-hostmakedepends="cvs"
short_desc="Small but powerful Emacs clone (with UTF-8, HTML, shell, dired)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
-homepage="https://bellard.org/qemacs/"
+homepage="https://github.com/qemacs/qemacs"
+distfiles="https://github.com/qemacs/qemacs/archive/${_githash}.tar.gz"
+checksum=cacf12beb925c427204db8e828f1c5bad41cff3439293d03e28631b6a9e66869
-do_fetch() {
- cd ${wrksrc}
- cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs \
- co -D ${version##*.} qemacs
-}
do_build() {
sed -i -e /HOST_CC/s/CFLAGS/HOST_CFLAGS/ -e /INSTALL/s/-s// \
Makefile */Makefile
echo CONFIG_HTML=yes >>config.mak
echo '#define CONFIG_HTML 1' >>config.h
- make V=1 TARGETS=qe STRIP=echo CC="$CC" \
- CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
+ make ${makejobs} V=1 TARGETS=qe STRIP=true CC="$CC" \
+ CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.. -I." \
LDFLAGS="$LDFLAGS"
}
do_install() {
- make V=1 TARGETS=qe STRIP=echo CC="$CC" \
+ make V=1 TARGETS=qe STRIP=true CC="$CC" \
CFLAGS="$CFLAGS -funsigned-char -Ilibqhtml -I.." \
LDFLAGS="$LDFLAGS" CONFIG_HTML= DESTDIR="$DESTDIR" install
vdoc qe-doc.html
From 305a39591ef5a918c9afa5d3982a91b3e02c868b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 9 Feb 2023 16:19:21 +0100
Subject: [PATCH 314/356] bpftrace: update to 0.17.0.
---
srcpkgs/bpftrace/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 857815d29eef..952682662128 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,10 +1,10 @@
# Template file for 'bpftrace'
pkgname=bpftrace
-version=0.16.0
+version=0.17.0
revision=1
archs="x86_64* aarch64* ppc64*"
build_style=cmake
-configure_args="-DBUILD_TESTING=OFF" # needs root to run
+configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run
hostmakedepends="flex pkg-config ruby-asciidoctor"
makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
@@ -12,12 +12,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/iovisor/bpftrace/"
distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz"
-checksum=89456dee3a20ec6c21ece345d4bf9a16a06af0f63cc5dffa9f5c7eea7916e21d
+checksum=ccc853205b081fd7e4270016065ccc04764286644bf8e0eee9bd7f344cad63e5
nostrip=yes # needs to read own symbol table
-post_extract() {
- vsed -i -e 's:<linux/btf.h>:<bpf/linux/btf.h>:g' src/btf.cpp
-}
+CXXFLAGS="-isystem ${XBPS_CROSS_BASE}/usr/include/bcc/compat"
post_install() {
# clashes with bcc-tools
From ad2c5064d8595cbbf3b759fda52577984989d761 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Feb 2023 19:21:18 +0100
Subject: [PATCH 315/356] qemacs: disable parallel build
---
srcpkgs/qemacs/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/qemacs/template b/srcpkgs/qemacs/template
index dd6101eb9ac2..25b37fcdf1cb 100644
--- a/srcpkgs/qemacs/template
+++ b/srcpkgs/qemacs/template
@@ -12,6 +12,8 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/qemacs/qemacs"
distfiles="https://github.com/qemacs/qemacs/archive/${_githash}.tar.gz"
checksum=cacf12beb925c427204db8e828f1c5bad41cff3439293d03e28631b6a9e66869
+# make: *** No rule to make target '.objs/Linux-x86_64-riscv64-linux-gnu-gcc/libqhtml.a', needed by 'qe_g'. Stop.
+disable_parallel_build=yes
do_build() {
sed -i -e /HOST_CC/s/CFLAGS/HOST_CFLAGS/ -e /INSTALL/s/-s// \
From 989c83bb812a897332c19e27c6d3f1f89da739a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 8 Feb 2023 22:00:03 +0100
Subject: [PATCH 316/356] caddy: update to 2.6.3.
---
srcpkgs/caddy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 8a52cdf5933b..5fd43bb04758 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
# Template file for 'caddy'
pkgname=caddy
-version=2.6.2
-revision=2
+version=2.6.3
+revision=1
build_style=go
go_import_path=github.com/caddyserver/caddy/v2
go_package="${go_import_path}/cmd/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="Apache-2.0"
homepage="https://caddyserver.com"
distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=563d027a78919f859188fb894ae5f3669508a3430db347aa726cd73c19fb7038
+checksum=86d6bb9b90fb21b223dc570eb2ccc8cf917750d70fb0d9c4a86d3ec6c13c712c
system_accounts="caddy"
caddy_homedir="/var/lib/caddy"
From 29333991805b1ebb52484ef2804fb90e07aa0e6f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 9 Feb 2023 20:12:43 +0100
Subject: [PATCH 317/356] youtube-viewer: update to 3.10.6.
---
srcpkgs/youtube-viewer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index c7efbf8d0213..d4016db082c8 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
# Template file for 'youtube-viewer'
pkgname=youtube-viewer
-version=3.10.5
+version=3.10.6
revision=1
build_style=perl-ModuleBuild
configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
homepage="https://github.com/trizen/youtube-viewer"
changelog="https://github.com/trizen/youtube-viewer/releases"
distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=5b2c2cf14ecd6aa18a681e3c25ca64720ec4c56cfd179f07d64d84ec4c5054ff
+checksum=4a01984b6b6fd870eb873dd3838411119a23c46950ec10f8f1c460513c218ac4
gtk-youtube-viewer_package() {
depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"
From 5d5f5a6ef4fe28e80cb8baa3909ba3be70185b9f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 9 Feb 2023 16:48:06 -0500
Subject: [PATCH 318/356] python3-pyzbar: update to 0.1.9.
---
srcpkgs/python3-pyzbar/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template
index 2e982852c090..7bf276853321 100644
--- a/srcpkgs/python3-pyzbar/template
+++ b/srcpkgs/python3-pyzbar/template
@@ -1,16 +1,17 @@
# Template file for 'python3-pyzbar'
pkgname=python3-pyzbar
-version=0.1.8
-revision=6
+version=0.1.9
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="libzbar python3"
+checkdepends="python3-pytest-xdist python3-Pillow python3-numpy $depends"
short_desc="Read one-dimensional barcodes and QR codes"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://github.com/NaturalHistoryMuseum/pyzbar/"
distfiles="https://github.com/NaturalHistoryMuseum/pyzbar/archive/v${version}.tar.gz"
-checksum=f51c82c2864f8e5a8d44f55853e027f8cbc592324b7afffa62100f2f9c54cbdb
+checksum=6b84ec4c1f36df590c65b610a7757ef8829f202a7df210d2891e6592a8bee8bb
conflicts="python-pyzbar>=0"
post_install() {
From 1f4b76a8b684e0425572ea2922d9c3573233e596 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:02:12 -0500
Subject: [PATCH 319/356] common/environment/setup/install.sh: always add log
service
- overridable by having a log service at `$pkgname/files/$service/log`
- warns if stderr is not redirected in the main service
- uses a sane default run script with the service name set as tag and
daemon facility
---
common/environment/setup/install.sh | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh
index 5f0571de14ae..b0c5b22f4c2a 100644
--- a/common/environment/setup/install.sh
+++ b/common/environment/setup/install.sh
@@ -19,11 +19,12 @@ done
_vsv() {
local service="$1"
+ local facility="${2:-daemon}"
local LN_OPTS="-s"
local svdir="${PKGDESTDIR}/etc/sv/${service}"
- if [ $# -lt 1 ]; then
- msg_red "$pkgver: vsv: 1 argument expected: <service>\n"
+ if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+ msg_red "$pkgver: vsv: up to 2 arguments expected: <service> [<log facility>]\n"
return 1
fi
@@ -34,17 +35,25 @@ _vsv() {
vmkdir etc/sv
vcopy "${FILESDIR}/$service" etc/sv
if [ ! -L $svdir/run ]; then
+ grep -Fq 'exec 2>&1' $svdir/run || msg_warn "$pkgver: vsv: service '$service' does not contain 'exec 2>&1' to log stderr\n"
chmod 755 $svdir/run
fi
if [ -e $svdir/finish ] && [ ! -L $svdir/finish ]; then
chmod 755 $svdir/finish
fi
ln ${LN_OPTS} /run/runit/supervise.${service} $svdir/supervise
- if [ -d $svdir/log ]; then
- ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
- if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
- chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
- fi
+ if [ -d $svdir/log ] || [ -L $svdir/log ]; then
+ msg_warn "$pkgver: vsv: overriding default log service\n"
+ else
+ mkdir $svdir/log
+ cat <<-EOF > $svdir/log/run
+ #!/bin/sh
+ exec vlogger -t $service -p $facility
+ EOF
+ fi
+ ln ${LN_OPTS} /run/runit/supervise.${service}-log $svdir/log/supervise
+ if [ -e $svdir/log/run ] && [ ! -L $svdir/log/run ]; then
+ chmod 755 ${PKGDESTDIR}/etc/sv/${service}/log/run
fi
}
From a8e751194d0249b2d45815f16ca4c0dea3e219a5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:09:42 -0500
Subject: [PATCH 320/356] Manual.md: document vsv log autocreation
---
Manual.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index a5e99d29fe4c..31494036d5e2 100644
--- a/Manual.md
+++ b/Manual.md
@@ -304,7 +304,7 @@ The following functions are defined by `xbps-src` and can be used on any templat
`$DESTDIR`. The optional 2nd argument can be used to change the
`file name`. See [license](#var_license) for when to use it.
-- *vsv()* `vsv <service>`
+- *vsv()* `vsv <service> [<facility>]`
Installs `service` from `${FILESDIR}` to /etc/sv. The service must
be a directory containing at least a run script. Note the `supervise`
@@ -312,6 +312,11 @@ The following functions are defined by `xbps-src` and can be used on any templat
is automatically made executable by this function.
For further information on how to create a new service directory see
[The corresponding section the FAQ](http://smarden.org/runit/faq.html#create).
+ A `log` sub-service will be automatically created if one does not exist in
+ `${FILESDIR}/$service`, containing `exec vlogger -t $service -p $facility`.
+ if a second argument is not specified, the `daemon` facility is used.
+ For more information about `vlogger` and available values for the facility,
+ see [vlogger(1)](https://man.voidlinux.org/vlogger.1).
- *vsed()* `vsed -i <file> -e <regex>`
From c07f8d13a1be73c0974c65772da7ab7f33729bd8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 2 Feb 2023 03:10:03 -0500
Subject: [PATCH 321/356] *: remove log dir en-masse
---
srcpkgs/Clightd/files/Clightd/log/run | 3 ---
srcpkgs/Gokapi/files/gokapi/log/run | 3 ---
srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run | 4 ----
srcpkgs/NetAuth/files/netauthd/log/run | 4 ----
srcpkgs/PopCorn/files/popcorn/log/run | 2 --
srcpkgs/TerraState/files/terrastate/log/run | 4 ----
srcpkgs/activityrelay/files/activityrelay/log/run | 1 -
srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run | 2 --
srcpkgs/apache-kafka/files/apache-kafka/log/run | 2 --
srcpkgs/autofs/files/autofs/log/run | 2 --
srcpkgs/beanstalkd/files/beanstalkd/log/run | 2 --
srcpkgs/bind/files/named/log/run | 2 --
srcpkgs/bluez/files/bluetooth-meshd/log/run | 1 -
srcpkgs/bluez/files/bluetoothd/log/run | 1 -
srcpkgs/boinc/files/boinc/log/run | 1 -
srcpkgs/busybox/files/busybox-ntpd/log/run | 2 --
srcpkgs/caddy/files/caddy/log/run | 1 -
srcpkgs/ckb-next/files/ckb-next-daemon/log/run | 2 --
srcpkgs/conduit/files/conduit/log/run | 1 -
srcpkgs/coredns/files/coredns/log/run | 3 ---
srcpkgs/coturn/files/coturnserver/log/run | 1 -
srcpkgs/cronie/files/cronie/log/run | 2 --
srcpkgs/dcron/files/dcron/log/run | 2 --
srcpkgs/dendrite/files/dendrite-monolith-server/log/run | 1 -
srcpkgs/dhcp/files/dhclient/log/run | 1 -
srcpkgs/dhcp/files/dhcpd4/log/run | 1 -
srcpkgs/dhcp/files/dhcpd6/log/run | 1 -
srcpkgs/dkimproxy/files/dkimproxy_in/log/run | 2 --
srcpkgs/dkimproxy/files/dkimproxy_out/log/run | 2 --
srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run | 2 --
srcpkgs/dotool/files/dotoold/log/run | 2 --
srcpkgs/dq/files/dqcache/log/run | 2 --
srcpkgs/duiadns/files/duiadns/log/run | 3 ---
srcpkgs/earlyoom/files/earlyoom/log/run | 2 --
srcpkgs/espeakup/files/espeakup/log/run | 2 --
srcpkgs/gerbera/files/gerbera/log/run | 1 -
srcpkgs/gitea/files/gitea/log/run | 1 -
srcpkgs/go-ipfs/files/ipfs/log/run | 1 -
srcpkgs/goatcounter/files/goatcounter/log/run | 2 --
srcpkgs/gotify-server/files/gotify-server/log/run | 1 -
srcpkgs/grafana/files/grafana/log/run | 2 --
srcpkgs/grub-btrfs/files/grub-btrfs/log/run | 2 --
srcpkgs/i2pd/files/i2pd/log/run | 1 -
srcpkgs/incron/files/incron/log/run | 2 --
srcpkgs/influxdb/files/influxdb/log/run | 2 --
srcpkgs/iwd/files/ead/log/run | 2 --
srcpkgs/iwd/files/iwd/log/run | 2 --
srcpkgs/libvirt/files/libvirt-generic/log/run | 7 -------
srcpkgs/libvirt/files/libvirtd/log/run | 1 -
srcpkgs/libvirt/files/virtinterfaced/log/run | 1 -
srcpkgs/libvirt/files/virtlockd/log/run | 1 -
srcpkgs/libvirt/files/virtlogd/log/run | 1 -
srcpkgs/libvirt/files/virtlxcd/log/run | 1 -
srcpkgs/libvirt/files/virtnetworkd/log/run | 1 -
srcpkgs/libvirt/files/virtnodedevd/log/run | 1 -
srcpkgs/libvirt/files/virtnwfilterd/log/run | 1 -
srcpkgs/libvirt/files/virtproxyd/log/run | 1 -
srcpkgs/libvirt/files/virtqemud/log/run | 1 -
srcpkgs/libvirt/files/virtsecretd/log/run | 1 -
srcpkgs/libvirt/files/virtstoraged/log/run | 1 -
srcpkgs/libvirt/files/virtvboxd/log/run | 1 -
srcpkgs/libvirt/files/virtxend/log/run | 1 -
srcpkgs/lldpd/files/lldpd/log/run | 1 -
srcpkgs/lsyncd/files/lsyncd/log/run | 2 --
srcpkgs/lxd/files/lxd/log/run | 2 --
srcpkgs/mariadb/files/mysqld/log/run | 2 --
srcpkgs/minidlna/files/minidlnad/log/run | 1 -
srcpkgs/miniflux/files/miniflux/log/run | 1 -
srcpkgs/minio/files/minio/log/run | 2 --
srcpkgs/moby/files/docker/log/run | 1 -
srcpkgs/monero/files/monerod/log/run | 3 ---
srcpkgs/mumble/files/mumble-server/log/run | 3 ---
srcpkgs/ndhc/files/ndhc/log/run | 2 --
srcpkgs/ndppd/files/ndppd/log/run | 3 ---
srcpkgs/neard/files/neard/log/run | 1 -
srcpkgs/neard/files/seeld/log/run | 1 -
srcpkgs/nebula/files/nebula/log/run | 2 --
srcpkgs/net-snmp/files/snmpd/log/run | 1 -
srcpkgs/node_exporter/files/node_exporter/log/run | 2 --
srcpkgs/openntpd/files/openntpd/log/run | 2 --
srcpkgs/openrgb/files/openrgb/log/run | 2 --
srcpkgs/oragono/files/oragono/log/run | 2 --
srcpkgs/podman/files/podman/log/run | 1 -
srcpkgs/postgresql14/files/postgresql14/log/run | 2 --
srcpkgs/postgresql15/files/postgresql15/log/run | 2 --
srcpkgs/preload/files/preload/log/run | 2 --
srcpkgs/privoxy/files/privoxy/log/run | 2 --
srcpkgs/prometheus/files/prometheus/log/run | 2 --
srcpkgs/qrtr-ns/files/qrtr-ns/log/run | 1 -
srcpkgs/radicale/files/radicale/log/run | 2 --
srcpkgs/routinator/files/routinator/log/run | 1 -
srcpkgs/samba/files/ctdbd/log/run | 2 --
srcpkgs/samba/files/nmbd/log/run | 2 --
srcpkgs/samba/files/smbd/log/run | 2 --
srcpkgs/sklogw/files/sklogw/log/run | 5 -----
srcpkgs/snapcast/files/snapclient/log/run | 2 --
srcpkgs/snapcast/files/snapserver/log/run | 2 --
srcpkgs/sndio/files/sndiod/log/run | 2 --
srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run | 3 ---
srcpkgs/soju/files/soju/log/run | 2 --
srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run | 2 --
srcpkgs/sqmail/files/qmail-send/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpd/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpsd/log/run | 2 --
srcpkgs/sqmail/files/qmail-smtpsub/log/run | 2 --
srcpkgs/stubby/files/stubby/log/run | 2 --
srcpkgs/syncthing/files/discosrv/log/run | 3 ---
srcpkgs/syncthing/files/relaysrv/log/run | 3 ---
srcpkgs/tailscale/files/tailscaled/log/run | 4 ----
srcpkgs/thermald/files/thermald/log/run | 1 -
srcpkgs/tqftpserv/files/tqftpserv/log/run | 1 -
srcpkgs/trousers/files/tcsd/log/run | 2 --
srcpkgs/umurmur/files/umurmurd/log/run | 3 ---
srcpkgs/up_rewrite/files/up_rewrite/log/run | 1 -
srcpkgs/upmpdcli/files/upmpdcli/log/run | 2 --
srcpkgs/varnish/files/varnishd/log/run | 2 --
srcpkgs/vaultwarden/files/vaultwarden/log/run | 1 -
srcpkgs/vnstat/files/vnstatd/log/run | 1 -
srcpkgs/waydroid/files/waydroid-container/log/run | 1 -
srcpkgs/webhook/files/webhook/log/run | 2 --
srcpkgs/wireplumber/files/wireplumber/log/run | 3 ---
srcpkgs/x2goserver/files/x2gocleansessions/log/run | 2 --
srcpkgs/yggdrasil/files/yggdrasil/log/run | 1 -
srcpkgs/znc/files/znc/log/run | 1 -
124 files changed, 228 deletions(-)
delete mode 100644 srcpkgs/Clightd/files/Clightd/log/run
delete mode 100644 srcpkgs/Gokapi/files/gokapi/log/run
delete mode 100644 srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
delete mode 100644 srcpkgs/NetAuth/files/netauthd/log/run
delete mode 100644 srcpkgs/PopCorn/files/popcorn/log/run
delete mode 100644 srcpkgs/TerraState/files/terrastate/log/run
delete mode 120000 srcpkgs/activityrelay/files/activityrelay/log/run
delete mode 100644 srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
delete mode 100644 srcpkgs/apache-kafka/files/apache-kafka/log/run
delete mode 100644 srcpkgs/autofs/files/autofs/log/run
delete mode 100755 srcpkgs/beanstalkd/files/beanstalkd/log/run
delete mode 100644 srcpkgs/bind/files/named/log/run
delete mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
delete mode 120000 srcpkgs/bluez/files/bluetoothd/log/run
delete mode 120000 srcpkgs/boinc/files/boinc/log/run
delete mode 100755 srcpkgs/busybox/files/busybox-ntpd/log/run
delete mode 120000 srcpkgs/caddy/files/caddy/log/run
delete mode 100644 srcpkgs/ckb-next/files/ckb-next-daemon/log/run
delete mode 120000 srcpkgs/conduit/files/conduit/log/run
delete mode 100755 srcpkgs/coredns/files/coredns/log/run
delete mode 120000 srcpkgs/coturn/files/coturnserver/log/run
delete mode 100755 srcpkgs/cronie/files/cronie/log/run
delete mode 100755 srcpkgs/dcron/files/dcron/log/run
delete mode 120000 srcpkgs/dendrite/files/dendrite-monolith-server/log/run
delete mode 120000 srcpkgs/dhcp/files/dhclient/log/run
delete mode 120000 srcpkgs/dhcp/files/dhcpd4/log/run
delete mode 120000 srcpkgs/dhcp/files/dhcpd6/log/run
delete mode 100644 srcpkgs/dkimproxy/files/dkimproxy_in/log/run
delete mode 100644 srcpkgs/dkimproxy/files/dkimproxy_out/log/run
delete mode 100755 srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
delete mode 100755 srcpkgs/dotool/files/dotoold/log/run
delete mode 100644 srcpkgs/dq/files/dqcache/log/run
delete mode 100755 srcpkgs/duiadns/files/duiadns/log/run
delete mode 100755 srcpkgs/earlyoom/files/earlyoom/log/run
delete mode 100755 srcpkgs/espeakup/files/espeakup/log/run
delete mode 120000 srcpkgs/gerbera/files/gerbera/log/run
delete mode 120000 srcpkgs/gitea/files/gitea/log/run
delete mode 120000 srcpkgs/go-ipfs/files/ipfs/log/run
delete mode 100755 srcpkgs/goatcounter/files/goatcounter/log/run
delete mode 120000 srcpkgs/gotify-server/files/gotify-server/log/run
delete mode 100755 srcpkgs/grafana/files/grafana/log/run
delete mode 100755 srcpkgs/grub-btrfs/files/grub-btrfs/log/run
delete mode 120000 srcpkgs/i2pd/files/i2pd/log/run
delete mode 100644 srcpkgs/incron/files/incron/log/run
delete mode 100755 srcpkgs/influxdb/files/influxdb/log/run
delete mode 100755 srcpkgs/iwd/files/ead/log/run
delete mode 100755 srcpkgs/iwd/files/iwd/log/run
delete mode 100644 srcpkgs/libvirt/files/libvirt-generic/log/run
delete mode 120000 srcpkgs/libvirt/files/libvirtd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtinterfaced/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlockd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlogd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtlxcd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnetworkd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnodedevd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtnwfilterd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtproxyd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtqemud/log/run
delete mode 120000 srcpkgs/libvirt/files/virtsecretd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtstoraged/log/run
delete mode 120000 srcpkgs/libvirt/files/virtvboxd/log/run
delete mode 120000 srcpkgs/libvirt/files/virtxend/log/run
delete mode 120000 srcpkgs/lldpd/files/lldpd/log/run
delete mode 100755 srcpkgs/lsyncd/files/lsyncd/log/run
delete mode 100644 srcpkgs/lxd/files/lxd/log/run
delete mode 100755 srcpkgs/mariadb/files/mysqld/log/run
delete mode 120000 srcpkgs/minidlna/files/minidlnad/log/run
delete mode 120000 srcpkgs/miniflux/files/miniflux/log/run
delete mode 100644 srcpkgs/minio/files/minio/log/run
delete mode 120000 srcpkgs/moby/files/docker/log/run
delete mode 100644 srcpkgs/monero/files/monerod/log/run
delete mode 100644 srcpkgs/mumble/files/mumble-server/log/run
delete mode 100755 srcpkgs/ndhc/files/ndhc/log/run
delete mode 100755 srcpkgs/ndppd/files/ndppd/log/run
delete mode 120000 srcpkgs/neard/files/neard/log/run
delete mode 120000 srcpkgs/neard/files/seeld/log/run
delete mode 100755 srcpkgs/nebula/files/nebula/log/run
delete mode 120000 srcpkgs/net-snmp/files/snmpd/log/run
delete mode 100755 srcpkgs/node_exporter/files/node_exporter/log/run
delete mode 100644 srcpkgs/openntpd/files/openntpd/log/run
delete mode 100644 srcpkgs/openrgb/files/openrgb/log/run
delete mode 100644 srcpkgs/oragono/files/oragono/log/run
delete mode 120000 srcpkgs/podman/files/podman/log/run
delete mode 100755 srcpkgs/postgresql14/files/postgresql14/log/run
delete mode 100755 srcpkgs/postgresql15/files/postgresql15/log/run
delete mode 100644 srcpkgs/preload/files/preload/log/run
delete mode 100755 srcpkgs/privoxy/files/privoxy/log/run
delete mode 100755 srcpkgs/prometheus/files/prometheus/log/run
delete mode 120000 srcpkgs/qrtr-ns/files/qrtr-ns/log/run
delete mode 100755 srcpkgs/radicale/files/radicale/log/run
delete mode 120000 srcpkgs/routinator/files/routinator/log/run
delete mode 100644 srcpkgs/samba/files/ctdbd/log/run
delete mode 100755 srcpkgs/samba/files/nmbd/log/run
delete mode 100755 srcpkgs/samba/files/smbd/log/run
delete mode 100755 srcpkgs/sklogw/files/sklogw/log/run
delete mode 100644 srcpkgs/snapcast/files/snapclient/log/run
delete mode 100644 srcpkgs/snapcast/files/snapserver/log/run
delete mode 100755 srcpkgs/sndio/files/sndiod/log/run
delete mode 100644 srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
delete mode 100755 srcpkgs/soju/files/soju/log/run
delete mode 100755 srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-send/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpd/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpsd/log/run
delete mode 100755 srcpkgs/sqmail/files/qmail-smtpsub/log/run
delete mode 100644 srcpkgs/stubby/files/stubby/log/run
delete mode 100755 srcpkgs/syncthing/files/discosrv/log/run
delete mode 100755 srcpkgs/syncthing/files/relaysrv/log/run
delete mode 100755 srcpkgs/tailscale/files/tailscaled/log/run
delete mode 120000 srcpkgs/thermald/files/thermald/log/run
delete mode 120000 srcpkgs/tqftpserv/files/tqftpserv/log/run
delete mode 100644 srcpkgs/trousers/files/tcsd/log/run
delete mode 100644 srcpkgs/umurmur/files/umurmurd/log/run
delete mode 120000 srcpkgs/up_rewrite/files/up_rewrite/log/run
delete mode 100644 srcpkgs/upmpdcli/files/upmpdcli/log/run
delete mode 100755 srcpkgs/varnish/files/varnishd/log/run
delete mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run
delete mode 120000 srcpkgs/vnstat/files/vnstatd/log/run
delete mode 120000 srcpkgs/waydroid/files/waydroid-container/log/run
delete mode 100644 srcpkgs/webhook/files/webhook/log/run
delete mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run
delete mode 100644 srcpkgs/x2goserver/files/x2gocleansessions/log/run
delete mode 120000 srcpkgs/yggdrasil/files/yggdrasil/log/run
delete mode 120000 srcpkgs/znc/files/znc/log/run
diff --git a/srcpkgs/Clightd/files/Clightd/log/run b/srcpkgs/Clightd/files/Clightd/log/run
deleted file mode 100644
index bfcfbef2823b..000000000000
--- a/srcpkgs/Clightd/files/Clightd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/vlogger -t Clightd
diff --git a/srcpkgs/Gokapi/files/gokapi/log/run b/srcpkgs/Gokapi/files/gokapi/log/run
deleted file mode 100644
index cb759c1f80d7..000000000000
--- a/srcpkgs/Gokapi/files/gokapi/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t gokapi -p daemon.info
diff --git a/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run b/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
deleted file mode 100644
index 29dc909b4d8d..000000000000
--- a/srcpkgs/NetAuth-ldap/files/netauth-ldap/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t netauth-ldap
diff --git a/srcpkgs/NetAuth/files/netauthd/log/run b/srcpkgs/NetAuth/files/netauthd/log/run
deleted file mode 100644
index c128c8e303a2..000000000000
--- a/srcpkgs/NetAuth/files/netauthd/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t netauthd
diff --git a/srcpkgs/PopCorn/files/popcorn/log/run b/srcpkgs/PopCorn/files/popcorn/log/run
deleted file mode 100644
index 35f950bef681..000000000000
--- a/srcpkgs/PopCorn/files/popcorn/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t popcorn
diff --git a/srcpkgs/TerraState/files/terrastate/log/run b/srcpkgs/TerraState/files/terrastate/log/run
deleted file mode 100644
index 8ea6f0f74369..000000000000
--- a/srcpkgs/TerraState/files/terrastate/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec vlogger -t terrastate
diff --git a/srcpkgs/activityrelay/files/activityrelay/log/run b/srcpkgs/activityrelay/files/activityrelay/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/activityrelay/files/activityrelay/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
deleted file mode 100644
index 043340b61258..000000000000
--- a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t apache-kafka-zookeeper -p 'daemon.info'
diff --git a/srcpkgs/apache-kafka/files/apache-kafka/log/run b/srcpkgs/apache-kafka/files/apache-kafka/log/run
deleted file mode 100644
index 94f6f1f9164e..000000000000
--- a/srcpkgs/apache-kafka/files/apache-kafka/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t apache-kafka -p 'daemon.info'
diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
deleted file mode 100644
index a2abfe61e846..000000000000
--- a/srcpkgs/autofs/files/autofs/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/beanstalkd/files/beanstalkd/log/run b/srcpkgs/beanstalkd/files/beanstalkd/log/run
deleted file mode 100755
index 4eb11581262c..000000000000
--- a/srcpkgs/beanstalkd/files/beanstalkd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t beanstalkd -p daemon.info
diff --git a/srcpkgs/bind/files/named/log/run b/srcpkgs/bind/files/named/log/run
deleted file mode 100644
index 142fbd4af3f9..000000000000
--- a/srcpkgs/bind/files/named/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t named
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/bluez/files/bluetooth-meshd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/bluez/files/bluetoothd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/boinc/files/boinc/log/run b/srcpkgs/boinc/files/boinc/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/boinc/files/boinc/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/busybox/files/busybox-ntpd/log/run b/srcpkgs/busybox/files/busybox-ntpd/log/run
deleted file mode 100755
index 077ea46d31d4..000000000000
--- a/srcpkgs/busybox/files/busybox-ntpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t busybox-ntpd
diff --git a/srcpkgs/caddy/files/caddy/log/run b/srcpkgs/caddy/files/caddy/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/caddy/files/caddy/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ckb-next/files/ckb-next-daemon/log/run b/srcpkgs/ckb-next/files/ckb-next-daemon/log/run
deleted file mode 100644
index 778760156ff0..000000000000
--- a/srcpkgs/ckb-next/files/ckb-next-daemon/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t ckb-next-daemon -p daemon.notice
diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/conduit/files/conduit/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/coredns/files/coredns/log/run b/srcpkgs/coredns/files/coredns/log/run
deleted file mode 100755
index f0680f7cfe3d..000000000000
--- a/srcpkgs/coredns/files/coredns/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec vlogger -t coredns
diff --git a/srcpkgs/coturn/files/coturnserver/log/run b/srcpkgs/coturn/files/coturnserver/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/coturn/files/coturnserver/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/cronie/files/cronie/log/run b/srcpkgs/cronie/files/cronie/log/run
deleted file mode 100755
index 6ff79ce509cb..000000000000
--- a/srcpkgs/cronie/files/cronie/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p cron.notice
diff --git a/srcpkgs/dcron/files/dcron/log/run b/srcpkgs/dcron/files/dcron/log/run
deleted file mode 100755
index 481c04d62077..000000000000
--- a/srcpkgs/dcron/files/dcron/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p cron.notice
diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/log/run b/srcpkgs/dendrite/files/dendrite-monolith-server/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dendrite/files/dendrite-monolith-server/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhclient/log/run b/srcpkgs/dhcp/files/dhclient/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhclient/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd4/log/run b/srcpkgs/dhcp/files/dhcpd4/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhcpd4/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dhcp/files/dhcpd6/log/run b/srcpkgs/dhcp/files/dhcpd6/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/dhcp/files/dhcpd6/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_in/log/run b/srcpkgs/dkimproxy/files/dkimproxy_in/log/run
deleted file mode 100644
index a4a63ef73234..000000000000
--- a/srcpkgs/dkimproxy/files/dkimproxy_in/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t dkimproxy_in -p mail.info
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_out/log/run b/srcpkgs/dkimproxy/files/dkimproxy_out/log/run
deleted file mode 100644
index 45736fa75504..000000000000
--- a/srcpkgs/dkimproxy/files/dkimproxy_out/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t dkimproxy_out -p mail.info
diff --git a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run b/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
deleted file mode 100755
index d6ba4e8a0b48..000000000000
--- a/srcpkgs/dnscrypt-proxy/files/dnscrypt-proxy/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec chpst -u dnscrypt_proxy:dnscrypt_proxy svlogd -t /var/log/dnscrypt-proxy
diff --git a/srcpkgs/dotool/files/dotoold/log/run b/srcpkgs/dotool/files/dotoold/log/run
deleted file mode 100755
index 762ba9e6cc26..000000000000
--- a/srcpkgs/dotool/files/dotoold/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t dotoold
diff --git a/srcpkgs/dq/files/dqcache/log/run b/srcpkgs/dq/files/dqcache/log/run
deleted file mode 100644
index ffcdcdb3736c..000000000000
--- a/srcpkgs/dq/files/dqcache/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec chpst -u _dqcache svlogd -t /var/log/dqcache
diff --git a/srcpkgs/duiadns/files/duiadns/log/run b/srcpkgs/duiadns/files/duiadns/log/run
deleted file mode 100755
index 94a82bf82dac..000000000000
--- a/srcpkgs/duiadns/files/duiadns/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec vlogger -t duiadns
diff --git a/srcpkgs/earlyoom/files/earlyoom/log/run b/srcpkgs/earlyoom/files/earlyoom/log/run
deleted file mode 100755
index 33d072e97ca1..000000000000
--- a/srcpkgs/earlyoom/files/earlyoom/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t earlyoom
diff --git a/srcpkgs/espeakup/files/espeakup/log/run b/srcpkgs/espeakup/files/espeakup/log/run
deleted file mode 100755
index 6d6f481c3794..000000000000
--- a/srcpkgs/espeakup/files/espeakup/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.debug -t espeakup
diff --git a/srcpkgs/gerbera/files/gerbera/log/run b/srcpkgs/gerbera/files/gerbera/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gerbera/files/gerbera/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gitea/files/gitea/log/run b/srcpkgs/gitea/files/gitea/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gitea/files/gitea/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/go-ipfs/files/ipfs/log/run b/srcpkgs/go-ipfs/files/ipfs/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/go-ipfs/files/ipfs/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/goatcounter/files/goatcounter/log/run b/srcpkgs/goatcounter/files/goatcounter/log/run
deleted file mode 100755
index 0713d90a612e..000000000000
--- a/srcpkgs/goatcounter/files/goatcounter/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t goatcounter
diff --git a/srcpkgs/gotify-server/files/gotify-server/log/run b/srcpkgs/gotify-server/files/gotify-server/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/gotify-server/files/gotify-server/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/grafana/files/grafana/log/run b/srcpkgs/grafana/files/grafana/log/run
deleted file mode 100755
index 422fc14b90d7..000000000000
--- a/srcpkgs/grafana/files/grafana/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t grafana
diff --git a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run b/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
deleted file mode 100755
index 267659045cda..000000000000
--- a/srcpkgs/grub-btrfs/files/grub-btrfs/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t grub-btrfs
diff --git a/srcpkgs/i2pd/files/i2pd/log/run b/srcpkgs/i2pd/files/i2pd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/i2pd/files/i2pd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/incron/files/incron/log/run b/srcpkgs/incron/files/incron/log/run
deleted file mode 100644
index 481c04d62077..000000000000
--- a/srcpkgs/incron/files/incron/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p cron.notice
diff --git a/srcpkgs/influxdb/files/influxdb/log/run b/srcpkgs/influxdb/files/influxdb/log/run
deleted file mode 100755
index 642fc2657098..000000000000
--- a/srcpkgs/influxdb/files/influxdb/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t influxdb
diff --git a/srcpkgs/iwd/files/ead/log/run b/srcpkgs/iwd/files/ead/log/run
deleted file mode 100755
index 22cce06edfd9..000000000000
--- a/srcpkgs/iwd/files/ead/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t ead
diff --git a/srcpkgs/iwd/files/iwd/log/run b/srcpkgs/iwd/files/iwd/log/run
deleted file mode 100755
index 1e182b5a754e..000000000000
--- a/srcpkgs/iwd/files/iwd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t iwd
diff --git a/srcpkgs/libvirt/files/libvirt-generic/log/run b/srcpkgs/libvirt/files/libvirt-generic/log/run
deleted file mode 100644
index fe803f0a723c..000000000000
--- a/srcpkgs/libvirt/files/libvirt-generic/log/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Take daemon name from parent of the log subservice
-daemon="${PWD%/*}"
-daemon="${daemon##*/}"
-
-exec logger -t "$daemon" -p daemon.info
diff --git a/srcpkgs/libvirt/files/libvirtd/log/run b/srcpkgs/libvirt/files/libvirtd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/libvirtd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtinterfaced/log/run b/srcpkgs/libvirt/files/virtinterfaced/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtinterfaced/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlockd/log/run b/srcpkgs/libvirt/files/virtlockd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlockd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlogd/log/run b/srcpkgs/libvirt/files/virtlogd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlogd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtlxcd/log/run b/srcpkgs/libvirt/files/virtlxcd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtlxcd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnetworkd/log/run b/srcpkgs/libvirt/files/virtnetworkd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnetworkd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnodedevd/log/run b/srcpkgs/libvirt/files/virtnodedevd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnodedevd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtnwfilterd/log/run b/srcpkgs/libvirt/files/virtnwfilterd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtnwfilterd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtproxyd/log/run b/srcpkgs/libvirt/files/virtproxyd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtproxyd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtqemud/log/run b/srcpkgs/libvirt/files/virtqemud/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtqemud/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtsecretd/log/run b/srcpkgs/libvirt/files/virtsecretd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtsecretd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtstoraged/log/run b/srcpkgs/libvirt/files/virtstoraged/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtstoraged/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtvboxd/log/run b/srcpkgs/libvirt/files/virtvboxd/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtvboxd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/libvirt/files/virtxend/log/run b/srcpkgs/libvirt/files/virtxend/log/run
deleted file mode 120000
index 5c7df1c93a45..000000000000
--- a/srcpkgs/libvirt/files/virtxend/log/run
+++ /dev/null
@@ -1 +0,0 @@
-../../libvirt-generic/log/run
\ No newline at end of file
diff --git a/srcpkgs/lldpd/files/lldpd/log/run b/srcpkgs/lldpd/files/lldpd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/lldpd/files/lldpd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/lsyncd/files/lsyncd/log/run b/srcpkgs/lsyncd/files/lsyncd/log/run
deleted file mode 100755
index 114c954f1d99..000000000000
--- a/srcpkgs/lsyncd/files/lsyncd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t lsyncd -p 'daemon.info'
diff --git a/srcpkgs/lxd/files/lxd/log/run b/srcpkgs/lxd/files/lxd/log/run
deleted file mode 100644
index 817e6073ea07..000000000000
--- a/srcpkgs/lxd/files/lxd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t lxd
diff --git a/srcpkgs/mariadb/files/mysqld/log/run b/srcpkgs/mariadb/files/mysqld/log/run
deleted file mode 100755
index b36c4dafa403..000000000000
--- a/srcpkgs/mariadb/files/mysqld/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/minidlna/files/minidlnad/log/run b/srcpkgs/minidlna/files/minidlnad/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/minidlna/files/minidlnad/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/miniflux/files/miniflux/log/run b/srcpkgs/miniflux/files/miniflux/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/miniflux/files/miniflux/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/minio/files/minio/log/run b/srcpkgs/minio/files/minio/log/run
deleted file mode 100644
index b36c4dafa403..000000000000
--- a/srcpkgs/minio/files/minio/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice
diff --git a/srcpkgs/moby/files/docker/log/run b/srcpkgs/moby/files/docker/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/moby/files/docker/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/monero/files/monerod/log/run b/srcpkgs/monero/files/monerod/log/run
deleted file mode 100644
index afcb02949c66..000000000000
--- a/srcpkgs/monero/files/monerod/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t monerod
diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
deleted file mode 100644
index 6b01a89f5be9..000000000000
--- a/srcpkgs/mumble/files/mumble-server/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/ndhc/files/ndhc/log/run b/srcpkgs/ndhc/files/ndhc/log/run
deleted file mode 100755
index 3dd63242fc51..000000000000
--- a/srcpkgs/ndhc/files/ndhc/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t ndhc
diff --git a/srcpkgs/ndppd/files/ndppd/log/run b/srcpkgs/ndppd/files/ndppd/log/run
deleted file mode 100755
index 6351a7cbc249..000000000000
--- a/srcpkgs/ndppd/files/ndppd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t ndppd
diff --git a/srcpkgs/neard/files/neard/log/run b/srcpkgs/neard/files/neard/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/neard/files/neard/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/neard/files/seeld/log/run b/srcpkgs/neard/files/seeld/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/neard/files/seeld/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/nebula/files/nebula/log/run b/srcpkgs/nebula/files/nebula/log/run
deleted file mode 100755
index 6a816023830d..000000000000
--- a/srcpkgs/nebula/files/nebula/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger --tag nebula --priority daemon.info
diff --git a/srcpkgs/net-snmp/files/snmpd/log/run b/srcpkgs/net-snmp/files/snmpd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/net-snmp/files/snmpd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/node_exporter/files/node_exporter/log/run b/srcpkgs/node_exporter/files/node_exporter/log/run
deleted file mode 100755
index 719aeb1c263e..000000000000
--- a/srcpkgs/node_exporter/files/node_exporter/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t node_exporter
diff --git a/srcpkgs/openntpd/files/openntpd/log/run b/srcpkgs/openntpd/files/openntpd/log/run
deleted file mode 100644
index 1401554c5c37..000000000000
--- a/srcpkgs/openntpd/files/openntpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t openntpd -p daemon.notice
diff --git a/srcpkgs/openrgb/files/openrgb/log/run b/srcpkgs/openrgb/files/openrgb/log/run
deleted file mode 100644
index 12023ee0eca3..000000000000
--- a/srcpkgs/openrgb/files/openrgb/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t openrgb -p daemon.info
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/podman/files/podman/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/postgresql14/files/postgresql14/log/run b/srcpkgs/postgresql14/files/postgresql14/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql14/files/postgresql14/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/postgresql15/files/postgresql15/log/run b/srcpkgs/postgresql15/files/postgresql15/log/run
deleted file mode 100755
index 815d9c974079..000000000000
--- a/srcpkgs/postgresql15/files/postgresql15/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t postgres@VERSION@
diff --git a/srcpkgs/preload/files/preload/log/run b/srcpkgs/preload/files/preload/log/run
deleted file mode 100644
index 03f18ca93f33..000000000000
--- a/srcpkgs/preload/files/preload/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec svlogd -t /var/log/preload
diff --git a/srcpkgs/privoxy/files/privoxy/log/run b/srcpkgs/privoxy/files/privoxy/log/run
deleted file mode 100755
index fa590adf4e6a..000000000000
--- a/srcpkgs/privoxy/files/privoxy/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t privoxy
diff --git a/srcpkgs/prometheus/files/prometheus/log/run b/srcpkgs/prometheus/files/prometheus/log/run
deleted file mode 100755
index d93cf9f498ea..000000000000
--- a/srcpkgs/prometheus/files/prometheus/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t prometheus
diff --git a/srcpkgs/qrtr-ns/files/qrtr-ns/log/run b/srcpkgs/qrtr-ns/files/qrtr-ns/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/qrtr-ns/files/qrtr-ns/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/radicale/files/radicale/log/run b/srcpkgs/radicale/files/radicale/log/run
deleted file mode 100755
index 37284378a054..000000000000
--- a/srcpkgs/radicale/files/radicale/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec svlogd /var/log/radicale
diff --git a/srcpkgs/routinator/files/routinator/log/run b/srcpkgs/routinator/files/routinator/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/routinator/files/routinator/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/samba/files/ctdbd/log/run b/srcpkgs/samba/files/ctdbd/log/run
deleted file mode 100644
index 7b12895c7406..000000000000
--- a/srcpkgs/samba/files/ctdbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t ctdbd
diff --git a/srcpkgs/samba/files/nmbd/log/run b/srcpkgs/samba/files/nmbd/log/run
deleted file mode 100755
index fb52de5c92a1..000000000000
--- a/srcpkgs/samba/files/nmbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t nmbd
diff --git a/srcpkgs/samba/files/smbd/log/run b/srcpkgs/samba/files/smbd/log/run
deleted file mode 100755
index 3131489de9f3..000000000000
--- a/srcpkgs/samba/files/smbd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.notice -t smbd
diff --git a/srcpkgs/sklogw/files/sklogw/log/run b/srcpkgs/sklogw/files/sklogw/log/run
deleted file mode 100755
index 8d9259845801..000000000000
--- a/srcpkgs/sklogw/files/sklogw/log/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/sh
-
-#log script
-[ -d /var/log/sklogw ] || mkdir -p /var/log/sklogw
-exec svlogd -ttt /var/log/sklogw
diff --git a/srcpkgs/snapcast/files/snapclient/log/run b/srcpkgs/snapcast/files/snapclient/log/run
deleted file mode 100644
index 67d63360736a..000000000000
--- a/srcpkgs/snapcast/files/snapclient/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t snapclient
diff --git a/srcpkgs/snapcast/files/snapserver/log/run b/srcpkgs/snapcast/files/snapserver/log/run
deleted file mode 100644
index 13577cf7f054..000000000000
--- a/srcpkgs/snapcast/files/snapserver/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t snapserver
diff --git a/srcpkgs/sndio/files/sndiod/log/run b/srcpkgs/sndio/files/sndiod/log/run
deleted file mode 100755
index 4472c76afb44..000000000000
--- a/srcpkgs/sndio/files/sndiod/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t sndiod
diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
deleted file mode 100644
index acfadabea4d8..000000000000
--- a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec vlogger -p daemon -t socklog-ucspi-tcp
diff --git a/srcpkgs/soju/files/soju/log/run b/srcpkgs/soju/files/soju/log/run
deleted file mode 100755
index e3e1d1b70f91..000000000000
--- a/srcpkgs/soju/files/soju/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t soju -p daemon
diff --git a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
deleted file mode 100755
index c50c10aa0da9..000000000000
--- a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t spreed-webrtc-server -p daemon.notice
diff --git a/srcpkgs/sqmail/files/qmail-send/log/run b/srcpkgs/sqmail/files/qmail-send/log/run
deleted file mode 100755
index dfe9ca0c0e91..000000000000
--- a/srcpkgs/sqmail/files/qmail-send/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-send
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/log/run b/srcpkgs/sqmail/files/qmail-smtpd/log/run
deleted file mode 100755
index e8b65cb0b353..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpd
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/log/run b/srcpkgs/sqmail/files/qmail-smtpsd/log/run
deleted file mode 100755
index 933100cc3f74..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpsd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpsd
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/log/run b/srcpkgs/sqmail/files/qmail-smtpsub/log/run
deleted file mode 100755
index c7918d4ee26a..000000000000
--- a/srcpkgs/sqmail/files/qmail-smtpsub/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p mail.notice -t qmail-smtpsub
diff --git a/srcpkgs/stubby/files/stubby/log/run b/srcpkgs/stubby/files/stubby/log/run
deleted file mode 100644
index 133f33a73b58..000000000000
--- a/srcpkgs/stubby/files/stubby/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t stubby -p daemon.notice
diff --git a/srcpkgs/syncthing/files/discosrv/log/run b/srcpkgs/syncthing/files/discosrv/log/run
deleted file mode 100755
index a667e5fd80c7..000000000000
--- a/srcpkgs/syncthing/files/discosrv/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec svlogd /var/log/discosrv
diff --git a/srcpkgs/syncthing/files/relaysrv/log/run b/srcpkgs/syncthing/files/relaysrv/log/run
deleted file mode 100755
index b1d5a28a7bf5..000000000000
--- a/srcpkgs/syncthing/files/relaysrv/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec svlogd /var/log/relaysrv
diff --git a/srcpkgs/tailscale/files/tailscaled/log/run b/srcpkgs/tailscale/files/tailscaled/log/run
deleted file mode 100755
index 28894bc17c6a..000000000000
--- a/srcpkgs/tailscale/files/tailscaled/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-exec logger -t tailscaled -p daemon.info
diff --git a/srcpkgs/thermald/files/thermald/log/run b/srcpkgs/thermald/files/thermald/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/thermald/files/thermald/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/tqftpserv/files/tqftpserv/log/run b/srcpkgs/tqftpserv/files/tqftpserv/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/tqftpserv/files/tqftpserv/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/trousers/files/tcsd/log/run b/srcpkgs/trousers/files/tcsd/log/run
deleted file mode 100644
index f74f42b898ec..000000000000
--- a/srcpkgs/trousers/files/tcsd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t tcsd
diff --git a/srcpkgs/umurmur/files/umurmurd/log/run b/srcpkgs/umurmur/files/umurmurd/log/run
deleted file mode 100644
index 4935a89f175e..000000000000
--- a/srcpkgs/umurmur/files/umurmurd/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -p daemon.notice -t umurmurd
diff --git a/srcpkgs/up_rewrite/files/up_rewrite/log/run b/srcpkgs/up_rewrite/files/up_rewrite/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/up_rewrite/files/up_rewrite/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/upmpdcli/files/upmpdcli/log/run b/srcpkgs/upmpdcli/files/upmpdcli/log/run
deleted file mode 100644
index 9d3d8b8d9878..000000000000
--- a/srcpkgs/upmpdcli/files/upmpdcli/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t upmpdcli
diff --git a/srcpkgs/varnish/files/varnishd/log/run b/srcpkgs/varnish/files/varnishd/log/run
deleted file mode 100755
index 280d955ac11c..000000000000
--- a/srcpkgs/varnish/files/varnishd/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -t varnishd -p daemon.info
diff --git a/srcpkgs/vaultwarden/files/vaultwarden/log/run b/srcpkgs/vaultwarden/files/vaultwarden/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/vaultwarden/files/vaultwarden/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/vnstat/files/vnstatd/log/run b/srcpkgs/vnstat/files/vnstatd/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/vnstat/files/vnstatd/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/waydroid/files/waydroid-container/log/run b/srcpkgs/waydroid/files/waydroid-container/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/waydroid/files/waydroid-container/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/webhook/files/webhook/log/run b/srcpkgs/webhook/files/webhook/log/run
deleted file mode 100644
index 700bf023a873..000000000000
--- a/srcpkgs/webhook/files/webhook/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -p daemon.info -t webhook
diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run
deleted file mode 100644
index 4dd58318870e..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec logger -t wireplumber -p daemon.info
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/log/run b/srcpkgs/x2goserver/files/x2gocleansessions/log/run
deleted file mode 100644
index d5901d1fc65f..000000000000
--- a/srcpkgs/x2goserver/files/x2gocleansessions/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec logger -p daemon.info -t x2gocleansessions
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/log/run b/srcpkgs/yggdrasil/files/yggdrasil/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/yggdrasil/files/yggdrasil/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/znc/files/znc/log/run b/srcpkgs/znc/files/znc/log/run
deleted file mode 120000
index 3a5b4a586051..000000000000
--- a/srcpkgs/znc/files/znc/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/vlogger
\ No newline at end of file
From 88e664c64040f473ac7b3ca39c970e28d3188979 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 7 Feb 2023 02:04:26 -0500
Subject: [PATCH 322/356] cronie, dcron, dkimproxy, sqmail: override default
log facility
previous log service used cron/mail facility
---
srcpkgs/cronie/template | 2 +-
srcpkgs/dcron/template | 2 +-
srcpkgs/dkimproxy/template | 4 ++--
srcpkgs/sqmail/template | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 2c26c2dc6352..3f8fbbcc4f30 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -44,7 +44,7 @@ pre_configure() {
}
post_install() {
- vsv cronie
+ vsv cronie cron
vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond
# Add /etc/cron.deny empty, to allow all users.
diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index eb975fd13a30..ab92850344ee 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -47,7 +47,7 @@ do_install() {
# crontab must be setuid for all users to work!
chmod 4755 ${DESTDIR}/usr/bin/crontab
- vsv dcron
+ vsv dcron cron
# Fix conflicts with other packages
mv ${DESTDIR}/usr/bin/crond ${DESTDIR}/usr/bin/dcrond
diff --git a/srcpkgs/dkimproxy/template b/srcpkgs/dkimproxy/template
index bab8cee6633f..4c411af516c1 100644
--- a/srcpkgs/dkimproxy/template
+++ b/srcpkgs/dkimproxy/template
@@ -20,6 +20,6 @@ post_install() {
vsconf ${DESTDIR}/etc/dkimproxy_out.conf.example
mv ${DESTDIR}/etc/dkimproxy_in.conf.example ${DESTDIR}/etc/dkimproxy_in.conf
mv ${DESTDIR}/etc/dkimproxy_out.conf.example ${DESTDIR}/etc/dkimproxy_out.conf
- vsv dkimproxy_in
- vsv dkimproxy_out
+ vsv dkimproxy_in mail
+ vsv dkimproxy_out mail
}
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 78c0af18eadb..3ba60479850c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -117,10 +117,10 @@ do_install() {
done
rm ${DESTDIR}/usr/bin/hostname
rm ${DESTDIR}/usr/share/man/man8/hostname.8
- vsv qmail-send
- vsv qmail-smtpd
- vsv qmail-smtpsd
- vsv qmail-smtpsub
+ vsv qmail-send mail
+ vsv qmail-smtpd mail
+ vsv qmail-smtpsd mail
+ vsv qmail-smtpsub mail
vlicense ../doc/LICENSE
mv ${DESTDIR}/usr/bin/maildirmake ${DESTDIR}/usr/bin/maildirmake.sqmail
mv ${DESTDIR}/usr/share/man/man1/maildirmake.1 ${DESTDIR}/usr/share/man/man1/maildirmake.sqmail.1
From fa6de531bfa94b3639b26ab196b92ad863e3d5dc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 7 Feb 2023 02:25:27 -0500
Subject: [PATCH 323/356] *: add exec 2>&1 to all existing services
except when it already exists, of course
---
srcpkgs/3proxy/files/3proxy/run | 1 +
srcpkgs/Clightd/files/Clightd/run | 1 +
srcpkgs/EternalTerminal/files/etserver/run | 1 +
srcpkgs/FreeRADIUS/files/FreeRADIUS/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run | 1 +
srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run | 1 +
srcpkgs/Gokapi/files/gokapi/run | 1 +
srcpkgs/NetAuth-ldap/files/netauth-ldap/run | 1 +
srcpkgs/NetAuth/files/netauthd/run | 1 +
srcpkgs/NetworkManager/files/NetworkManager/run | 1 +
srcpkgs/PopCorn/files/pqueryd/run | 1 +
srcpkgs/PopCorn/files/statrepo/run | 1 +
srcpkgs/Swapspace/files/swapspace/run | 1 +
srcpkgs/acpid/files/acpid/run | 1 +
srcpkgs/alertmanager/files/alertmanager/run | 1 +
srcpkgs/alfred/files/alfred/run | 1 +
srcpkgs/alfred/files/batadv-vis/run | 1 +
srcpkgs/alsa-utils/files/alsa/run | 1 +
srcpkgs/android-tools/files/adb/run | 1 +
srcpkgs/anope/files/anope/run | 1 +
srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run | 1 +
srcpkgs/apache-kafka/files/apache-kafka/run | 1 +
srcpkgs/apache-tomcat/files/apache-tomcat/run | 1 +
srcpkgs/apache/files/apache/run | 1 +
srcpkgs/apcupsd/files/apcupsd/run | 1 +
srcpkgs/ardor/files/ardor-tor/run | 1 +
srcpkgs/ardor/files/ardor/run | 1 +
srcpkgs/armagetronad/files/armagetronad-dedicated/run | 1 +
srcpkgs/asus-kbd-backlight/files/asus-kbd/run | 1 +
srcpkgs/at/files/at/run | 1 +
srcpkgs/atop/files/atop/run | 1 +
srcpkgs/audit/files/auditctl/run | 1 +
srcpkgs/audit/files/auditd/run | 1 +
srcpkgs/avahi/files/avahi-daemon/run | 1 +
srcpkgs/bacula-common/files/bacula-dir/run | 1 +
srcpkgs/bacula-common/files/bacula-fd/run | 1 +
srcpkgs/bacula-common/files/bacula-sd/run | 1 +
srcpkgs/barrier/files/barrierc/run | 1 +
srcpkgs/barrier/files/barriers/run | 1 +
srcpkgs/beanstalkd/files/beanstalkd/run | 1 +
srcpkgs/beard/files/beard/run | 1 +
srcpkgs/bftpd/files/bftpd/run | 1 +
srcpkgs/binfmt-support/files/binfmt-support/run | 1 +
srcpkgs/bird/files/bird/run | 1 +
srcpkgs/bird_exporter/files/bird_exporter/run | 1 +
srcpkgs/bitlbee/files/bitlbee/run | 1 +
srcpkgs/blackbox_exporter/files/blackbox_exporter/run | 1 +
srcpkgs/bluez-alsa/files/bluez-alsa/run | 1 +
srcpkgs/bolt/files/boltd/run | 1 +
srcpkgs/brltty/files/brltty/run | 1 +
srcpkgs/bumblebee/files/bumblebeed/run | 1 +
srcpkgs/burp2-server/files/burp2-server/run | 1 +
srcpkgs/busybox/files/busybox-klogd/run | 1 +
srcpkgs/busybox/files/busybox-ntpd/run | 1 +
srcpkgs/busybox/files/busybox-syslogd/run | 1 +
srcpkgs/cachefilesd/files/cachefilesd/run | 1 +
srcpkgs/caddy/files/caddy/run | 1 +
srcpkgs/canto-next/files/canto-daemon/run | 1 +
srcpkgs/chronograf/files/chronograf/run | 1 +
srcpkgs/chrony/files/chronyd/run | 1 +
srcpkgs/ckb-next/files/ckb-next-daemon/run | 1 +
srcpkgs/cntlm/files/cntlm/run | 1 +
srcpkgs/collectd/files/collectd/run | 1 +
srcpkgs/colord/files/colord/run | 1 +
srcpkgs/conduit/files/conduit/run | 1 +
srcpkgs/connman/files/connmand/run | 1 +
srcpkgs/containerd/files/containerd/run | 1 +
srcpkgs/coturn/files/coturnserver/run | 1 +
srcpkgs/criu/files/criu/run | 1 +
srcpkgs/cronie/files/cronie/run | 1 +
srcpkgs/cups-filters/files/cups-browsed/run | 1 +
srcpkgs/cups/files/cupsd/run | 1 +
srcpkgs/darkhttpd/files/darkhttpd/run | 1 +
srcpkgs/dbus-elogind/files/dbus/run | 1 +
srcpkgs/dbus/files/dbus/run | 1 +
srcpkgs/dcron/files/dcron/run | 1 +
srcpkgs/ddclient/files/ddclient/run | 1 +
srcpkgs/deluge/files/deluge-web/run | 1 +
srcpkgs/deluge/files/deluged/run | 1 +
srcpkgs/dhcpcd/files/dhcpcd-eth0/run | 1 +
srcpkgs/dhcpcd/files/dhcpcd/run | 1 +
srcpkgs/dictd/files/dictd/run | 1 +
srcpkgs/diod/files/diod/run | 1 +
srcpkgs/distcc/files/distccd/run | 1 +
srcpkgs/dkimproxy/files/dkimproxy_in/run | 1 +
srcpkgs/dkimproxy/files/dkimproxy_out/run | 1 +
srcpkgs/dnsdist/files/dnsdist/run | 1 +
srcpkgs/dnsmasq/files/dnsmasq/run | 1 +
srcpkgs/dovecot/files/dovecot/run | 1 +
srcpkgs/dq/files/dqcache/run | 1 +
srcpkgs/drbd-utils/files/drbd/run | 1 +
srcpkgs/dropbear/files/dropbear/run | 1 +
srcpkgs/duiadns/files/duiadns/run | 1 +
srcpkgs/earlyoom/files/earlyoom/run | 1 +
srcpkgs/edac-utils/files/edac/run | 1 +
srcpkgs/elog/files/elogd/run | 1 +
srcpkgs/elogind/files/elogind/run | 1 +
srcpkgs/etcd/files/etcd/run | 1 +
srcpkgs/eudev/files/udevd/run | 1 +
srcpkgs/fah/files/FAHClient/run | 1 +
srcpkgs/fail2ban/files/fail2ban/run | 1 +
srcpkgs/fake-hwclock/files/fake-hwclock/run | 1 +
srcpkgs/fastd/files/fastd/run | 1 +
srcpkgs/fcron/files/fcron/run | 1 +
srcpkgs/fiche/files/fiche/run | 1 +
srcpkgs/firehol/files/firehol/run | 1 +
srcpkgs/flannel/files/flannel/run | 1 +
srcpkgs/freeipmi/files/bmc-watchdog/run | 1 +
srcpkgs/freeipmi/files/ipmidetectd/run | 1 +
srcpkgs/freeipmi/files/ipmiseld/run | 1 +
srcpkgs/frp/files/frpc/run | 1 +
srcpkgs/frp/files/frps/run | 1 +
srcpkgs/frr/files/frr-generic/run | 1 +
srcpkgs/fwknop/files/fwknopd/run | 1 +
srcpkgs/gdm/files/gdm/run | 1 +
srcpkgs/gemserv/files/gemserv/run | 1 +
srcpkgs/geomyidae/files/geomyidae/run | 1 +
srcpkgs/gerbera/files/gerbera/run | 1 +
srcpkgs/gitea/files/gitea/run | 1 +
srcpkgs/gitlab-runner/files/gitlab-runner/run | 1 +
srcpkgs/glibc/files/nscd/run | 1 +
srcpkgs/glider/files/glider/run | 1 +
srcpkgs/glusterfs/files/glusterd/run | 1 +
srcpkgs/glusterfs/files/glusterfsd/run | 1 +
srcpkgs/gnunet/files/gnunet/run | 1 +
srcpkgs/go-ipfs/files/ipfs/run | 1 +
srcpkgs/goatcounter/files/goatcounter/run | 1 +
srcpkgs/gogs/files/gogs/run | 1 +
srcpkgs/gpm/files/gpm/run | 1 +
srcpkgs/gpsd/files/gpsd/run | 1 +
srcpkgs/grafana/files/grafana/run | 1 +
srcpkgs/h2o/files/h2o/run | 1 +
srcpkgs/haproxy/files/haproxy/run | 1 +
srcpkgs/haveged/files/haveged/run | 1 +
srcpkgs/hddtemp/files/hddtemp/run | 1 +
srcpkgs/hiawatha/files/hiawatha/run | 1 +
srcpkgs/hitch/files/hitch/run | 1 +
srcpkgs/hostapd/files/hostapd/run | 1 +
srcpkgs/i2pd/files/i2pd/run | 1 +
srcpkgs/i8kutils/files/i8kmon/run | 1 +
srcpkgs/icinga2/files/icinga2/run | 1 +
srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run | 1 +
srcpkgs/inadyn/files/inadyn/run | 1 +
srcpkgs/incron/files/incron/run | 1 +
srcpkgs/influxdb/files/influxdb/run | 1 +
srcpkgs/inspircd/files/inspircd/run | 1 +
srcpkgs/iptables/files/ip6tables/run | 1 +
srcpkgs/iptables/files/iptables/run | 1 +
srcpkgs/ipvsadm/files/ipvsadm/run | 1 +
srcpkgs/irqbalance/files/irqbalance/run | 1 +
srcpkgs/iwd/files/ead/run | 1 +
srcpkgs/iwd/files/iwd/run | 1 +
srcpkgs/jenkins/files/jenkins/run | 1 +
srcpkgs/kapacitor/files/kapacitor/run | 1 +
srcpkgs/kea/files/kea-dhcp-ddns/run | 1 +
srcpkgs/kea/files/kea-dhcp4/run | 1 +
srcpkgs/kea/files/kea-dhcp6/run | 1 +
srcpkgs/keepalived/files/keepalived/run | 1 +
srcpkgs/keyd/files/keyd/run | 1 +
srcpkgs/knot-resolver/files/kresd/run | 1 +
srcpkgs/knot/files/knotd/run | 1 +
srcpkgs/kubernetes/files/kube-apiserver/run | 1 +
srcpkgs/kubernetes/files/kube-controller-manager/run | 1 +
srcpkgs/kubernetes/files/kube-proxy/run | 1 +
srcpkgs/kubernetes/files/kube-scheduler/run | 1 +
srcpkgs/kubernetes/files/kubelet/run | 1 +
srcpkgs/laptop-mode/files/laptop-mode/run | 1 +
srcpkgs/ldm/files/ldm/run | 1 +
srcpkgs/libcgroup/files/cgred/run | 1 +
srcpkgs/libratbag/files/ratbagd/run | 1 +
srcpkgs/libvirt/files/libvirt-generic/run | 1 +
srcpkgs/lightdm/files/lightdm/run | 1 +
srcpkgs/lighttpd/files/lighttpd/run | 1 +
srcpkgs/linux-tools/files/freefall/run | 1 +
srcpkgs/linux-tools/files/usbipd/run | 1 +
srcpkgs/lldpd/files/lldpd/run | 1 +
srcpkgs/lm_sensors/files/fancontrol/run | 1 +
srcpkgs/lsyncd/files/lsyncd/run | 1 +
srcpkgs/lvm2/files/dmeventd/run | 1 +
srcpkgs/lvm2/files/lvmetad/run | 1 +
srcpkgs/lxc/files/lxc-autostart/run | 1 +
srcpkgs/lxcfs/files/lxcfs/run | 1 +
srcpkgs/lxd-lts/files/lxd/run | 1 +
srcpkgs/lxd/files/lxd/run | 1 +
srcpkgs/lxdm/files/lxdm/run | 1 +
srcpkgs/mDNSResponder/files/dnsextd/run | 1 +
srcpkgs/mDNSResponder/files/mdnsd/run | 1 +
srcpkgs/mariadb/files/mysqld/run | 1 +
srcpkgs/mcelog/files/mcelog/run | 1 +
srcpkgs/mdadm/files/mdadm/run | 1 +
srcpkgs/metalog/files/metalog/run | 1 +
srcpkgs/minidlna/files/minidlnad/run | 1 +
srcpkgs/minio/files/minio/run | 1 +
srcpkgs/mit-krb5/files/kadmind/run | 1 +
srcpkgs/mit-krb5/files/krb5kdc/run | 1 +
srcpkgs/moby/files/docker/run | 1 +
srcpkgs/monero/files/monerod/run | 1 +
srcpkgs/monit/files/monit/run | 1 +
srcpkgs/monkey/files/monkey/run | 1 +
srcpkgs/moosefs/files/mfschunkserver/run | 1 +
srcpkgs/moosefs/files/mfsmaster/run | 1 +
srcpkgs/moosefs/files/mfsmetalogger/run | 1 +
srcpkgs/mopidy/files/mopidy/run | 1 +
srcpkgs/mosquitto/files/mosquitto/run | 1 +
srcpkgs/mouseemu/files/mouseemu/run | 1 +
srcpkgs/mpDris2/files/mpDris2/run | 1 +
srcpkgs/mpd/files/mpd/run | 1 +
srcpkgs/mpdscribble/files/mpdscribble/run | 1 +
srcpkgs/munge/files/munge/run | 1 +
srcpkgs/musl-nscd/files/nscd/run | 1 +
srcpkgs/nbd/files/nbd/run | 1 +
srcpkgs/ndhc/files/ndhc/run | 1 +
srcpkgs/ndppd/files/ndppd/run | 1 +
srcpkgs/neard/files/neard/run | 1 +
srcpkgs/neard/files/seeld/run | 1 +
srcpkgs/net-snmp/files/snmpd/run | 1 +
srcpkgs/netdata/files/netdata/run | 1 +
srcpkgs/network-ups-tools/files/upsd/run | 1 +
srcpkgs/network-ups-tools/files/upsdrvctl/run | 1 +
srcpkgs/network-ups-tools/files/upsmon/run | 1 +
srcpkgs/nfs-utils/files/nfs-server/run | 1 +
srcpkgs/nfs-utils/files/rpcblkmapd/run | 1 +
srcpkgs/nfs-utils/files/rpcgssd/run | 1 +
srcpkgs/nfs-utils/files/rpcidmapd/run | 1 +
srcpkgs/nfs-utils/files/rpcsvcgssd/run | 1 +
srcpkgs/nfs-utils/files/statd/run | 1 +
srcpkgs/nftables/files/nftables/run | 1 +
srcpkgs/ngetty/files/ngetty/run | 1 +
srcpkgs/nginx/files/nginx/run | 1 +
srcpkgs/ngircd/files/ngircd/run | 1 +
srcpkgs/nix/files/nix-daemon/run | 1 +
srcpkgs/node_exporter/files/node_exporter/run | 1 +
srcpkgs/nodm/files/nodm/run | 1 +
srcpkgs/noip2/files/noip2/run | 1 +
srcpkgs/nrpe/files/nrpe/run | 1 +
srcpkgs/nsd/files/nsd/run | 1 +
srcpkgs/nss-pam-ldapd/files/nslcd/run | 1 +
srcpkgs/ntp/files/isc-ntpd/run | 1 +
srcpkgs/nullmailer/files/nullmailer/run | 1 +
srcpkgs/nvidia/files/nvidia-powerd/run | 1 +
srcpkgs/nxt/files/nxt-tor/run | 1 +
srcpkgs/nxt/files/nxt/run | 1 +
srcpkgs/odroid-u2-base/files/odroid-led/run | 1 +
srcpkgs/ofono/files/ofonod/run | 1 +
srcpkgs/oidentd/files/oidentd/run | 1 +
srcpkgs/olsrd/files/olsrd/run | 1 +
srcpkgs/open-vm-tools/files/vmtoolsd/run | 1 +
srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run | 1 +
srcpkgs/opendkim/files/opendkim/run | 1 +
srcpkgs/openntpd/files/openntpd/run | 1 +
srcpkgs/openrgb/files/openrgb/run | 1 +
srcpkgs/opensmtpd/files/opensmtpd/run | 1 +
srcpkgs/openssh/files/sshd/run | 1 +
srcpkgs/openvswitch/files/ovs-vswitchd/run | 1 +
srcpkgs/openvswitch/files/ovsdb-server/run | 1 +
srcpkgs/parpd/files/parpd/run | 1 +
srcpkgs/parprouted/files/parprouted/run | 1 +
srcpkgs/pbbuttonsd/files/pbbuttonsd/run | 1 +
srcpkgs/pcsclite/files/pcscd/run | 1 +
srcpkgs/pd-mapper/files/pd-mapper/run | 1 +
srcpkgs/php/files/php-fpm/run | 1 +
srcpkgs/php8.0/files/php-fpm8.0/run | 1 +
srcpkgs/php8.1/files/php-fpm8.1/run | 1 +
srcpkgs/pipewire/files/pipewire-pulse/run | 1 +
srcpkgs/pipewire/files/pipewire/run | 1 +
srcpkgs/podman/files/podman-docker/run | 1 +
srcpkgs/podman/files/podman/run | 1 +
srcpkgs/polipo/files/polipo/run | 1 +
srcpkgs/polkit/files/polkitd/run | 1 +
srcpkgs/postfix/files/postfix/run | 1 +
srcpkgs/postgresql14/files/postgresql14/run | 1 +
srcpkgs/postgresql15/files/postgresql15/run | 1 +
srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run | 1 +
srcpkgs/privoxy/files/privoxy/run | 1 +
srcpkgs/prometheus/files/prometheus/run | 1 +
srcpkgs/prosody/files/prosody/run | 1 +
srcpkgs/pulseaudio/files/pulseaudio/run | 1 +
srcpkgs/qemu/files/qemu-ga/run | 1 +
srcpkgs/qrtr-ns/files/qrtr-ns/run | 1 +
srcpkgs/quassel/files/quasselcore/run | 1 +
srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run | 1 +
srcpkgs/radvd/files/radvd/run | 1 +
srcpkgs/redis/files/redis/run | 1 +
srcpkgs/rest-server/files/rest-server/run | 1 +
srcpkgs/rmilter/files/rmilter/run | 1 +
srcpkgs/rmtfs/files/rmtfs/run | 1 +
srcpkgs/rng-tools/files/rngd/run | 1 +
srcpkgs/routinator/files/routinator/run | 1 +
srcpkgs/rpcbind/files/rpcbind/run | 1 +
srcpkgs/rspamd/files/rspamd/run | 1 +
srcpkgs/rsync/files/rsyncd/run | 1 +
srcpkgs/rsyslog/files/rsyslogd/run | 1 +
srcpkgs/rtkit/files/rtkit/run | 1 +
srcpkgs/salt/files/salt-api/run | 1 +
srcpkgs/salt/files/salt-master/run | 1 +
srcpkgs/salt/files/salt-minion/run | 1 +
srcpkgs/salt/files/salt-syndic/run | 1 +
srcpkgs/samba/files/ctdbd/run | 1 +
srcpkgs/sane/files/saned/run | 1 +
srcpkgs/scron/files/scron/run | 1 +
srcpkgs/sddm/files/sddm/run | 1 +
srcpkgs/seatd/files/seatd/run | 1 +
srcpkgs/sftpgo/files/sftpgo/run | 1 +
srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run | 1 +
srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run | 1 +
srcpkgs/shinit/files/shinit/run | 1 +
srcpkgs/shiori/files/shiori/run | 1 +
srcpkgs/shorewall/files/shorewall/run | 1 +
srcpkgs/shorewall/files/shorewall6/run | 1 +
srcpkgs/slim/files/slim/run | 1 +
srcpkgs/smartmontools/files/smartd/run | 1 +
srcpkgs/smcroute/files/smcrouted/run | 1 +
srcpkgs/snapcast/files/snapclient/run | 1 +
srcpkgs/snapcast/files/snapserver/run | 1 +
srcpkgs/snapper/files/snapperd/run | 1 +
srcpkgs/sndio/files/sndiod/run | 1 +
srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run | 1 +
srcpkgs/spamassassin/files/spamd/run | 1 +
srcpkgs/spampd/files/spampd/run | 1 +
srcpkgs/spice-vdagent/files/spice-vdagentd/run | 1 +
srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run | 1 +
srcpkgs/sqmail/files/qmail-send/run | 1 +
srcpkgs/sqmail/files/qmail-smtpd/run | 1 +
srcpkgs/sqmail/files/qmail-smtpsd/run | 1 +
srcpkgs/sqmail/files/qmail-smtpsub/run | 1 +
srcpkgs/squid/files/squid/run | 1 +
srcpkgs/sshguard/files/sshguard-socklog/run | 1 +
srcpkgs/ssl_exporter/files/ssl_exporter/run | 1 +
srcpkgs/sslh/files/sslh/run | 1 +
srcpkgs/sssd/files/sssd/run | 1 +
srcpkgs/strongswan/files/strongswan/run | 1 +
srcpkgs/stubby/files/stubby/run | 1 +
srcpkgs/subversion/files/svnserve/run | 1 +
srcpkgs/sv-netmount/files/netmount/run | 1 +
srcpkgs/synapse/files/synapse/run | 1 +
srcpkgs/synergy/files/synergyc/run | 1 +
srcpkgs/synergy/files/synergys/run | 1 +
srcpkgs/telegraf/files/telegraf/run | 1 +
srcpkgs/tftp-hpa/files/tftpd-hpa/run | 1 +
srcpkgs/thermald/files/thermald/run | 1 +
srcpkgs/thttpd/files/thttpd/run | 1 +
srcpkgs/tinc/files/tincd/run | 1 +
srcpkgs/tinyproxy/files/tinyproxy/run | 1 +
srcpkgs/tinyssh/files/tinysshd/run | 1 +
srcpkgs/tlp/files/tlp/run | 1 +
srcpkgs/tor/files/tor/run | 1 +
srcpkgs/touchegg/files/touchegg/run | 1 +
srcpkgs/toxcore/files/tox-bootstrapd/run | 1 +
srcpkgs/transmission/files/transmission-daemon/run | 1 +
srcpkgs/twoftpd/files/twoftpd-anon/run | 1 +
srcpkgs/ufw/files/ufw/run | 1 +
srcpkgs/ulogd/files/ulogd/run | 1 +
srcpkgs/unbound/files/unbound/run | 1 +
srcpkgs/upmpdcli/files/upmpdcli/run | 1 +
srcpkgs/uptimed/files/uptimed/run | 1 +
srcpkgs/usbguard/files/usbguard/run | 1 +
srcpkgs/usbmuxd/files/usbmuxd/run | 1 +
srcpkgs/util-linux/files/uuidd/run | 1 +
srcpkgs/v2ray/files/v2ray/run | 1 +
srcpkgs/varnish/files/varnishd/run | 1 +
srcpkgs/vault/files/vault/run | 1 +
srcpkgs/vaultwarden/files/vaultwarden/run | 1 +
srcpkgs/virtualbox-ose/files/vboxservice/run | 1 +
srcpkgs/virtualbox-ose/files/vboxwebsrv/run | 1 +
srcpkgs/vnstat/files/vnstatd/run | 1 +
srcpkgs/vpnd/files/vpnd/run | 1 +
srcpkgs/vsftpd/files/vsftpd-ipv6/run | 1 +
srcpkgs/vsftpd/files/vsftpd/run | 1 +
srcpkgs/watchdog/files/watchdog/run | 1 +
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/wesnoth/files/wesnothd/run | 1 +
srcpkgs/wicd/files/wicd/run | 1 +
srcpkgs/wireguard-tools/files/wireguard/run | 1 +
srcpkgs/wireproxy/files/wireproxy/run | 1 +
srcpkgs/x2goserver/files/x2gocleansessions/run | 1 +
srcpkgs/xdm/files/xdm/run | 1 +
srcpkgs/xen/files/xen/run | 1 +
srcpkgs/xen/files/xenconsoled/run | 1 +
srcpkgs/xen/files/xenstored/run | 1 +
srcpkgs/xinetd/files/xinetd/run | 1 +
srcpkgs/xl2tpd/files/xl2tpd/run | 1 +
srcpkgs/yggdrasil/files/yggdrasil/run | 1 +
srcpkgs/zabbix/files/zabbix-agent/run | 1 +
srcpkgs/zabbix/files/zabbix-proxy/run | 1 +
srcpkgs/zabbix/files/zabbix-server/run | 1 +
srcpkgs/zeek/files/bro/run | 1 +
srcpkgs/zeek/files/zeek/run | 1 +
srcpkgs/zfs/files/zed/run | 1 +
srcpkgs/znc/files/znc/run | 1 +
srcpkgs/zrepl/files/zrepl/run | 1 +
392 files changed, 392 insertions(+)
diff --git a/srcpkgs/3proxy/files/3proxy/run b/srcpkgs/3proxy/files/3proxy/run
index bbdcd1a51bca..ddb3a1fa6b63 100755
--- a/srcpkgs/3proxy/files/3proxy/run
+++ b/srcpkgs/3proxy/files/3proxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec 3proxy /etc/3proxy/3proxy.cfg
diff --git a/srcpkgs/Clightd/files/Clightd/run b/srcpkgs/Clightd/files/Clightd/run
index 9170543376b5..4319b150787e 100644
--- a/srcpkgs/Clightd/files/Clightd/run
+++ b/srcpkgs/Clightd/files/Clightd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec /usr/libexec/clightd 2>&1
diff --git a/srcpkgs/EternalTerminal/files/etserver/run b/srcpkgs/EternalTerminal/files/etserver/run
index 97e23f86cf88..a5e3fe2a793f 100644
--- a/srcpkgs/EternalTerminal/files/etserver/run
+++ b/srcpkgs/EternalTerminal/files/etserver/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _eternal etserver
diff --git a/srcpkgs/FreeRADIUS/files/FreeRADIUS/run b/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
index 525e8d2ae103..65baa3ee7901 100644
--- a/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
+++ b/srcpkgs/FreeRADIUS/files/FreeRADIUS/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _freeradius:_freeradius radiusd -f
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run b/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
index 163298b9fa5f..33d97affb4d3 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-Guest-Initialization/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# The Google services assert that the init is performing some
# sequencing. Since runit provides no such facility, we will block
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run b/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
index 286d7b59f1d5..a387bca2edbd 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-accounts/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run b/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
index 33615f7eec01..e2c5534669b0 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-clock-skew/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run b/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
index 31a2fd454520..3cb07ac1cf33 100644
--- a/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
+++ b/srcpkgs/GCP-Guest-Environment/files/GCP-ip-forwarding/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check GCP-Guest-Initialization >/dev/null || exit 1
diff --git a/srcpkgs/Gokapi/files/gokapi/run b/srcpkgs/Gokapi/files/gokapi/run
index 8f4295583d2c..24213299c51e 100644
--- a/srcpkgs/Gokapi/files/gokapi/run
+++ b/srcpkgs/Gokapi/files/gokapi/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetAuth-ldap/files/netauth-ldap/run b/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
index 465f4e54904a..c49142f50e96 100644
--- a/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
+++ b/srcpkgs/NetAuth-ldap/files/netauth-ldap/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetAuth/files/netauthd/run b/srcpkgs/NetAuth/files/netauthd/run
index 2f15234c2505..718a5deb4b18 100644
--- a/srcpkgs/NetAuth/files/netauthd/run
+++ b/srcpkgs/NetAuth/files/netauthd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run
index 2df342d579b0..a1a143999ad7 100755
--- a/srcpkgs/NetworkManager/files/NetworkManager/run
+++ b/srcpkgs/NetworkManager/files/NetworkManager/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec NetworkManager -n > /dev/null 2>&1
diff --git a/srcpkgs/PopCorn/files/pqueryd/run b/srcpkgs/PopCorn/files/pqueryd/run
index b413a58cf116..db1958bea23d 100644
--- a/srcpkgs/PopCorn/files/pqueryd/run
+++ b/srcpkgs/PopCorn/files/pqueryd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/PopCorn/files/statrepo/run b/srcpkgs/PopCorn/files/statrepo/run
index 05c15baf1b75..33bbfcc7014e 100644
--- a/srcpkgs/PopCorn/files/statrepo/run
+++ b/srcpkgs/PopCorn/files/statrepo/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/Swapspace/files/swapspace/run b/srcpkgs/Swapspace/files/swapspace/run
index d07bc78f2e7d..3317e23833f8 100644
--- a/srcpkgs/Swapspace/files/swapspace/run
+++ b/srcpkgs/Swapspace/files/swapspace/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec swapspace
diff --git a/srcpkgs/acpid/files/acpid/run b/srcpkgs/acpid/files/acpid/run
index 0f41739c080b..20e374fa70a1 100755
--- a/srcpkgs/acpid/files/acpid/run
+++ b/srcpkgs/acpid/files/acpid/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec acpid -f ${OPTS:=-l}
diff --git a/srcpkgs/alertmanager/files/alertmanager/run b/srcpkgs/alertmanager/files/alertmanager/run
index c4ca4e70d674..2c86493d2115 100755
--- a/srcpkgs/alertmanager/files/alertmanager/run
+++ b/srcpkgs/alertmanager/files/alertmanager/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/alfred/files/alfred/run b/srcpkgs/alfred/files/alfred/run
index c80114d09a1f..362ada881786 100755
--- a/srcpkgs/alfred/files/alfred/run
+++ b/srcpkgs/alfred/files/alfred/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec alfred ${OPTS:=-i "bat0" -b "bat0"}
diff --git a/srcpkgs/alfred/files/batadv-vis/run b/srcpkgs/alfred/files/batadv-vis/run
index 2fe016ae3793..baf7acd68fdc 100755
--- a/srcpkgs/alfred/files/batadv-vis/run
+++ b/srcpkgs/alfred/files/batadv-vis/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec batadv-vis ${OPTS:=-si bat0}
diff --git a/srcpkgs/alsa-utils/files/alsa/run b/srcpkgs/alsa-utils/files/alsa/run
index 728c4c8dd76f..be7cbac7f80e 100755
--- a/srcpkgs/alsa-utils/files/alsa/run
+++ b/srcpkgs/alsa-utils/files/alsa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
alsactl restore
exec chpst -b alsa pause
diff --git a/srcpkgs/android-tools/files/adb/run b/srcpkgs/android-tools/files/adb/run
index 9d81719e4c7c..d5ad652e33fb 100755
--- a/srcpkgs/android-tools/files/adb/run
+++ b/srcpkgs/android-tools/files/adb/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
[ -r conf ] && . ./conf
adb ${OPTS:=start-server -P5037}
diff --git a/srcpkgs/anope/files/anope/run b/srcpkgs/anope/files/anope/run
index ca9b72cedbf2..964ce8945da7 100644
--- a/srcpkgs/anope/files/anope/run
+++ b/srcpkgs/anope/files/anope/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec anopeservices \
--confdir=/etc/anope \
--dbdir=/var/lib/anope \
diff --git a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
index 1fcaf44eeb96..bb9d5c0ea683 100644
--- a/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
+++ b/srcpkgs/apache-kafka/files/apache-kafka-zookeeper/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/lib/kafka/bin/zookeeper-server-start.sh ${PROPERTIES_FILE:-/usr/lib/kafka/config/zookeeper.properties}
diff --git a/srcpkgs/apache-kafka/files/apache-kafka/run b/srcpkgs/apache-kafka/files/apache-kafka/run
index 7f888a35e8cd..8a8c13c6c3d0 100644
--- a/srcpkgs/apache-kafka/files/apache-kafka/run
+++ b/srcpkgs/apache-kafka/files/apache-kafka/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/lib/kafka/bin/kafka-server-start.sh ${PROPERTIES_FILE:-/usr/lib/kafka/config/server.properties}
diff --git a/srcpkgs/apache-tomcat/files/apache-tomcat/run b/srcpkgs/apache-tomcat/files/apache-tomcat/run
index 03f3c94067ea..1cf370821e57 100644
--- a/srcpkgs/apache-tomcat/files/apache-tomcat/run
+++ b/srcpkgs/apache-tomcat/files/apache-tomcat/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export CATALINA_BASE=/usr/share/apache-tomcat
diff --git a/srcpkgs/apache/files/apache/run b/srcpkgs/apache/files/apache/run
index d1995dd04de1..1579bdfed20e 100644
--- a/srcpkgs/apache/files/apache/run
+++ b/srcpkgs/apache/files/apache/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/apcupsd/files/apcupsd/run b/srcpkgs/apcupsd/files/apcupsd/run
index 2c0b807da287..e570f226c90a 100644
--- a/srcpkgs/apcupsd/files/apcupsd/run
+++ b/srcpkgs/apcupsd/files/apcupsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf] && . ./conf
exec apcupsd -b ${OPTS}
diff --git a/srcpkgs/ardor/files/ardor-tor/run b/srcpkgs/ardor/files/ardor-tor/run
index a18a2d10d191..03526311ac8b 100644
--- a/srcpkgs/ardor/files/ardor-tor/run
+++ b/srcpkgs/ardor/files/ardor-tor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ardor-tor > /dev/null
diff --git a/srcpkgs/ardor/files/ardor/run b/srcpkgs/ardor/files/ardor/run
index b872eb1da727..f09d2d4ced10 100644
--- a/srcpkgs/ardor/files/ardor/run
+++ b/srcpkgs/ardor/files/ardor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ardor > /dev/null
diff --git a/srcpkgs/armagetronad/files/armagetronad-dedicated/run b/srcpkgs/armagetronad/files/armagetronad-dedicated/run
index 52127b128b5a..d129885f870b 100644
--- a/srcpkgs/armagetronad/files/armagetronad-dedicated/run
+++ b/srcpkgs/armagetronad/files/armagetronad-dedicated/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec armagetronad-dedicated
diff --git a/srcpkgs/asus-kbd-backlight/files/asus-kbd/run b/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
index dc41b16f87b2..06420e9fd7ac 100644
--- a/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
+++ b/srcpkgs/asus-kbd-backlight/files/asus-kbd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
asus-kbd-backlight allowusers
diff --git a/srcpkgs/at/files/at/run b/srcpkgs/at/files/at/run
index 967ced04cbeb..083a67dfdfcf 100755
--- a/srcpkgs/at/files/at/run
+++ b/srcpkgs/at/files/at/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec atd -f
diff --git a/srcpkgs/atop/files/atop/run b/srcpkgs/atop/files/atop/run
index 532e35f595a1..431d390345f8 100755
--- a/srcpkgs/atop/files/atop/run
+++ b/srcpkgs/atop/files/atop/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec atop -a -w /var/log/atop/atop_$(date +%Y%m%d) 600
diff --git a/srcpkgs/audit/files/auditctl/run b/srcpkgs/audit/files/auditctl/run
index 64a2820eb21e..ebfa223efed5 100755
--- a/srcpkgs/audit/files/auditctl/run
+++ b/srcpkgs/audit/files/auditctl/run
@@ -1,4 +1,5 @@
#!/bin/sh -e
+exec 2>&1
test ! -r ./conf || . ./conf
diff --git a/srcpkgs/audit/files/auditd/run b/srcpkgs/audit/files/auditd/run
index 4b5c68a0bdbd..7e3427652f5d 100755
--- a/srcpkgs/audit/files/auditd/run
+++ b/srcpkgs/audit/files/auditd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec auditd -n
diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run
index af2dc17a93dd..b0d858438fde 100755
--- a/srcpkgs/avahi/files/avahi-daemon/run
+++ b/srcpkgs/avahi/files/avahi-daemon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# if dbus is enabled wait for it.
if [ -e /var/service/dbus ]; then
sv check dbus > /dev/null || exit 1
diff --git a/srcpkgs/bacula-common/files/bacula-dir/run b/srcpkgs/bacula-common/files/bacula-dir/run
index be89aac60783..5632681e99d0 100755
--- a/srcpkgs/bacula-common/files/bacula-dir/run
+++ b/srcpkgs/bacula-common/files/bacula-dir/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-dir -f -c /etc/bacula/bacula-dir.conf
diff --git a/srcpkgs/bacula-common/files/bacula-fd/run b/srcpkgs/bacula-common/files/bacula-fd/run
index 6f3765f1fa75..40411de5b170 100755
--- a/srcpkgs/bacula-common/files/bacula-fd/run
+++ b/srcpkgs/bacula-common/files/bacula-fd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-fd -f -c /etc/bacula/bacula-fd.conf
diff --git a/srcpkgs/bacula-common/files/bacula-sd/run b/srcpkgs/bacula-common/files/bacula-sd/run
index 6ef1480466fa..a46df0bb65a3 100755
--- a/srcpkgs/bacula-common/files/bacula-sd/run
+++ b/srcpkgs/bacula-common/files/bacula-sd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/bacula ] && mkdir /run/bacula
exec bacula-sd -f -c /etc/bacula/bacula-sd.conf
diff --git a/srcpkgs/barrier/files/barrierc/run b/srcpkgs/barrier/files/barrierc/run
index f57a57edaf3a..ab7039aa2256 100755
--- a/srcpkgs/barrier/files/barrierc/run
+++ b/srcpkgs/barrier/files/barrierc/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SERVER_ADDR ] && exit 0
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
diff --git a/srcpkgs/barrier/files/barriers/run b/srcpkgs/barrier/files/barriers/run
index c59b48edf947..5d4deeefb8e7 100755
--- a/srcpkgs/barrier/files/barriers/run
+++ b/srcpkgs/barrier/files/barriers/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
exec barriers --no-daemon ${OPTS:=--restart}
diff --git a/srcpkgs/beanstalkd/files/beanstalkd/run b/srcpkgs/beanstalkd/files/beanstalkd/run
index dfba751acc8f..9823e332ece0 100755
--- a/srcpkgs/beanstalkd/files/beanstalkd/run
+++ b/srcpkgs/beanstalkd/files/beanstalkd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# By default use persistent storage (binary log)
[ -r conf ] && . ./conf
exec chpst -u _beanstalkd:_beanstalkd beanstalkd ${OPTS:=-b /var/lib/beanstalkd} 2>&1
diff --git a/srcpkgs/beard/files/beard/run b/srcpkgs/beard/files/beard/run
index 91fc4c7108f7..fe6be1a33e05 100644
--- a/srcpkgs/beard/files/beard/run
+++ b/srcpkgs/beard/files/beard/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec beard -H ${BEARD_HIBERNATE:=/usr/bin/zzz} $OPTS
diff --git a/srcpkgs/bftpd/files/bftpd/run b/srcpkgs/bftpd/files/bftpd/run
index a20f54a93383..7c8d7b2327e7 100755
--- a/srcpkgs/bftpd/files/bftpd/run
+++ b/srcpkgs/bftpd/files/bftpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bftpd -D
diff --git a/srcpkgs/binfmt-support/files/binfmt-support/run b/srcpkgs/binfmt-support/files/binfmt-support/run
index 3c4d89207d92..9bf7ccfe345e 100644
--- a/srcpkgs/binfmt-support/files/binfmt-support/run
+++ b/srcpkgs/binfmt-support/files/binfmt-support/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
update-binfmts --enable
exec chpst -b binfmt-support pause
diff --git a/srcpkgs/bird/files/bird/run b/srcpkgs/bird/files/bird/run
index 80a516e1e79d..5e0468a592dd 100644
--- a/srcpkgs/bird/files/bird/run
+++ b/srcpkgs/bird/files/bird/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bird -f -u _bird -g _bird ${OPTS:=-c /etc/bird.conf}
diff --git a/srcpkgs/bird_exporter/files/bird_exporter/run b/srcpkgs/bird_exporter/files/bird_exporter/run
index d92d81909407..bfb99f962057 100755
--- a/srcpkgs/bird_exporter/files/bird_exporter/run
+++ b/srcpkgs/bird_exporter/files/bird_exporter/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec bird_exporter ${OPTS:=-bird.v2 -format.new}
diff --git a/srcpkgs/bitlbee/files/bitlbee/run b/srcpkgs/bitlbee/files/bitlbee/run
index e6d5705b60fd..ac0dcef34601 100644
--- a/srcpkgs/bitlbee/files/bitlbee/run
+++ b/srcpkgs/bitlbee/files/bitlbee/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
install -d -m0755 -o bitlbee -g bitlbee /run/bitlbee
[ -r conf ] && . ./conf
diff --git a/srcpkgs/blackbox_exporter/files/blackbox_exporter/run b/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
index a6dd952eac8a..de51fb53d7f9 100755
--- a/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
+++ b/srcpkgs/blackbox_exporter/files/blackbox_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments to blackbox_exporter
# $CONF_FILE is the location of the configuration file.
diff --git a/srcpkgs/bluez-alsa/files/bluez-alsa/run b/srcpkgs/bluez-alsa/files/bluez-alsa/run
index d7a73bbe2c73..2a52a6525812 100644
--- a/srcpkgs/bluez-alsa/files/bluez-alsa/run
+++ b/srcpkgs/bluez-alsa/files/bluez-alsa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _bluez_alsa -g audio /run/bluealsa
diff --git a/srcpkgs/bolt/files/boltd/run b/srcpkgs/bolt/files/boltd/run
index 90fc46026684..8f90fd189efe 100644
--- a/srcpkgs/bolt/files/boltd/run
+++ b/srcpkgs/bolt/files/boltd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec /usr/libexec/boltd > /dev/null 2>&1
diff --git a/srcpkgs/brltty/files/brltty/run b/srcpkgs/brltty/files/brltty/run
index ef50183e589b..e97b3b626f04 100644
--- a/srcpkgs/brltty/files/brltty/run
+++ b/srcpkgs/brltty/files/brltty/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/brltty || exit 1
exec brltty -n
diff --git a/srcpkgs/bumblebee/files/bumblebeed/run b/srcpkgs/bumblebee/files/bumblebeed/run
index a8ee73c4373c..9a85db7e26fc 100755
--- a/srcpkgs/bumblebee/files/bumblebeed/run
+++ b/srcpkgs/bumblebee/files/bumblebeed/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec bumblebeed --use-syslog
diff --git a/srcpkgs/burp2-server/files/burp2-server/run b/srcpkgs/burp2-server/files/burp2-server/run
index 14e3188c6f08..5ea7919b841a 100755
--- a/srcpkgs/burp2-server/files/burp2-server/run
+++ b/srcpkgs/burp2-server/files/burp2-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec burp -F -c /etc/burp/burp-server.conf
diff --git a/srcpkgs/busybox/files/busybox-klogd/run b/srcpkgs/busybox/files/busybox-klogd/run
index 3db6835ffe47..a3f11984e84a 100644
--- a/srcpkgs/busybox/files/busybox-klogd/run
+++ b/srcpkgs/busybox/files/busybox-klogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox klogd -n
diff --git a/srcpkgs/busybox/files/busybox-ntpd/run b/srcpkgs/busybox/files/busybox-ntpd/run
index 617b67f574bc..8fcd2df4f29b 100755
--- a/srcpkgs/busybox/files/busybox-ntpd/run
+++ b/srcpkgs/busybox/files/busybox-ntpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox ntpd -nN -p pool.ntp.org
diff --git a/srcpkgs/busybox/files/busybox-syslogd/run b/srcpkgs/busybox/files/busybox-syslogd/run
index d524941068c9..60d0be02ac28 100644
--- a/srcpkgs/busybox/files/busybox-syslogd/run
+++ b/srcpkgs/busybox/files/busybox-syslogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec busybox syslogd -n
diff --git a/srcpkgs/cachefilesd/files/cachefilesd/run b/srcpkgs/cachefilesd/files/cachefilesd/run
index 5cc506581989..4785ef933e1b 100755
--- a/srcpkgs/cachefilesd/files/cachefilesd/run
+++ b/srcpkgs/cachefilesd/files/cachefilesd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
modprobe cachefiles || exit 1
exec cachefilesd -n ${OPTS:= -f /etc/cachefilesd.conf}
diff --git a/srcpkgs/caddy/files/caddy/run b/srcpkgs/caddy/files/caddy/run
index 58940d1bfd3b..9c259b6bb4c4 100644
--- a/srcpkgs/caddy/files/caddy/run
+++ b/srcpkgs/caddy/files/caddy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/canto-next/files/canto-daemon/run b/srcpkgs/canto-next/files/canto-daemon/run
index 37a5f8912c5f..8514ff6a8f83 100644
--- a/srcpkgs/canto-next/files/canto-daemon/run
+++ b/srcpkgs/canto-next/files/canto-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec canto-daemon
diff --git a/srcpkgs/chronograf/files/chronograf/run b/srcpkgs/chronograf/files/chronograf/run
index 3f3bb679fd8d..c5f6e0b2dc0b 100644
--- a/srcpkgs/chronograf/files/chronograf/run
+++ b/srcpkgs/chronograf/files/chronograf/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _chronograf:_chronograf chronograf --bolt-path=/var/lib/chronograf/chronograf-v1.db --canned-path=/usr/share/chronograf/canned
diff --git a/srcpkgs/chrony/files/chronyd/run b/srcpkgs/chrony/files/chronyd/run
index 75ee6102a3fb..a6aeb85624ce 100644
--- a/srcpkgs/chrony/files/chronyd/run
+++ b/srcpkgs/chrony/files/chronyd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m750 -o chrony -g chrony /var/run/chrony
exec chronyd -n -u chrony
diff --git a/srcpkgs/ckb-next/files/ckb-next-daemon/run b/srcpkgs/ckb-next/files/ckb-next-daemon/run
index fc0d263a74c8..65017ff8dc16 100644
--- a/srcpkgs/ckb-next/files/ckb-next-daemon/run
+++ b/srcpkgs/ckb-next/files/ckb-next-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/ckb-next-daemon 2>&1
diff --git a/srcpkgs/cntlm/files/cntlm/run b/srcpkgs/cntlm/files/cntlm/run
index b1e45897f545..f1d5a2fd5541 100755
--- a/srcpkgs/cntlm/files/cntlm/run
+++ b/srcpkgs/cntlm/files/cntlm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cntlm -f 2>&1
diff --git a/srcpkgs/collectd/files/collectd/run b/srcpkgs/collectd/files/collectd/run
index cb773129d1c6..bbb84229f7fc 100644
--- a/srcpkgs/collectd/files/collectd/run
+++ b/srcpkgs/collectd/files/collectd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec collectd -f
diff --git a/srcpkgs/colord/files/colord/run b/srcpkgs/colord/files/colord/run
index 5650cdaa8885..e03c807ddeea 100755
--- a/srcpkgs/colord/files/colord/run
+++ b/srcpkgs/colord/files/colord/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u colord /usr/libexec/colord 2>&1
diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run
index a3a42e323623..8ca07926e38b 100644
--- a/srcpkgs/conduit/files/conduit/run
+++ b/srcpkgs/conduit/files/conduit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-8192}
export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run
index e90eed5ba4ad..4e37b35268cd 100755
--- a/srcpkgs/connman/files/connmand/run
+++ b/srcpkgs/connman/files/connmand/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec connmand -n ${OPTS}
diff --git a/srcpkgs/containerd/files/containerd/run b/srcpkgs/containerd/files/containerd/run
index 92738de80995..b14083a80a22 100755
--- a/srcpkgs/containerd/files/containerd/run
+++ b/srcpkgs/containerd/files/containerd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
env modeprobe overlay
exec containerd
diff --git a/srcpkgs/coturn/files/coturnserver/run b/srcpkgs/coturn/files/coturnserver/run
index 3ccf906ded56..510fd31df919 100755
--- a/srcpkgs/coturn/files/coturnserver/run
+++ b/srcpkgs/coturn/files/coturnserver/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _coturn:_coturn turnserver -c /etc/turnserver.conf
diff --git a/srcpkgs/criu/files/criu/run b/srcpkgs/criu/files/criu/run
index fa7863abe797..19a67c430bea 100755
--- a/srcpkgs/criu/files/criu/run
+++ b/srcpkgs/criu/files/criu/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec criu service ${OPTS:=-o /var/log/criu-service.log}
diff --git a/srcpkgs/cronie/files/cronie/run b/srcpkgs/cronie/files/cronie/run
index d3045c363c6d..b7e77227b898 100755
--- a/srcpkgs/cronie/files/cronie/run
+++ b/srcpkgs/cronie/files/cronie/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec cronie-crond -n $OPTS 2>&1
diff --git a/srcpkgs/cups-filters/files/cups-browsed/run b/srcpkgs/cups-filters/files/cups-browsed/run
index 1a16f73d3886..2120dce7b0b6 100644
--- a/srcpkgs/cups-filters/files/cups-browsed/run
+++ b/srcpkgs/cups-filters/files/cups-browsed/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cups-browsed
diff --git a/srcpkgs/cups/files/cupsd/run b/srcpkgs/cups/files/cupsd/run
index 568bee19986d..d655c5d87e4d 100755
--- a/srcpkgs/cups/files/cupsd/run
+++ b/srcpkgs/cups/files/cupsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec cupsd -f
diff --git a/srcpkgs/darkhttpd/files/darkhttpd/run b/srcpkgs/darkhttpd/files/darkhttpd/run
index 465456978b30..9b4eb122877c 100755
--- a/srcpkgs/darkhttpd/files/darkhttpd/run
+++ b/srcpkgs/darkhttpd/files/darkhttpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${WWWDIR:=/srv/www/darkhttpd}
exec darkhttpd "${WWWDIR}" --chroot --uid _darkhttpd --gid _darkhttpd $OPTS 2>&1 >>/var/log/darkhttpd/darkhttpd.log
diff --git a/srcpkgs/dbus-elogind/files/dbus/run b/srcpkgs/dbus-elogind/files/dbus/run
index ed60b734343a..4a6b981fd735 100755
--- a/srcpkgs/dbus-elogind/files/dbus/run
+++ b/srcpkgs/dbus-elogind/files/dbus/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dbus/files/dbus/run b/srcpkgs/dbus/files/dbus/run
index ed60b734343a..4a6b981fd735 100755
--- a/srcpkgs/dbus/files/dbus/run
+++ b/srcpkgs/dbus/files/dbus/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus
exec dbus-daemon --system --nofork --nopidfile
diff --git a/srcpkgs/dcron/files/dcron/run b/srcpkgs/dcron/files/dcron/run
index dd4f22a28e59..d3bc290e799f 100755
--- a/srcpkgs/dcron/files/dcron/run
+++ b/srcpkgs/dcron/files/dcron/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dcrond -f $OPTS 2>&1
diff --git a/srcpkgs/ddclient/files/ddclient/run b/srcpkgs/ddclient/files/ddclient/run
index e77a50dd3d07..8b9e7a746ca9 100644
--- a/srcpkgs/ddclient/files/ddclient/run
+++ b/srcpkgs/ddclient/files/ddclient/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ddclient -foreground
diff --git a/srcpkgs/deluge/files/deluge-web/run b/srcpkgs/deluge/files/deluge-web/run
index 9f56a76bdae8..861a81bea28f 100644
--- a/srcpkgs/deluge/files/deluge-web/run
+++ b/srcpkgs/deluge/files/deluge-web/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check deluged >/dev/null || exit 1
HOME=/var/lib/deluge
exec chpst -u deluge:deluge deluge-web -d 2>&1
diff --git a/srcpkgs/deluge/files/deluged/run b/srcpkgs/deluge/files/deluged/run
index 6162f08d46b0..9c5887638e0e 100644
--- a/srcpkgs/deluge/files/deluged/run
+++ b/srcpkgs/deluge/files/deluged/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec deluged -d -U deluge -g deluge -c /var/lib/deluge/.config/deluge ${OPTS} 2>&1
diff --git a/srcpkgs/dhcpcd/files/dhcpcd-eth0/run b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
index da17e8a99ae9..e468ad5fe570 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
+++ b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dhcpcd -B eth0 $OPTS 1>&2
diff --git a/srcpkgs/dhcpcd/files/dhcpcd/run b/srcpkgs/dhcpcd/files/dhcpcd/run
index ac656a2b22bb..c2489dc1cb5d 100644
--- a/srcpkgs/dhcpcd/files/dhcpcd/run
+++ b/srcpkgs/dhcpcd/files/dhcpcd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dhcpcd -B ${OPTS:=-M} 1>&2
diff --git a/srcpkgs/dictd/files/dictd/run b/srcpkgs/dictd/files/dictd/run
index 0138bb406c29..f5ffd52e0a17 100644
--- a/srcpkgs/dictd/files/dictd/run
+++ b/srcpkgs/dictd/files/dictd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec 2>/dev/null
exec chpst -u dictd:dictd dictd --debug nodetach ${OPTS:=--locale en_US.UTF-8 -s}
diff --git a/srcpkgs/diod/files/diod/run b/srcpkgs/diod/files/diod/run
index a1d9faa1f11e..56e4f58f8c96 100755
--- a/srcpkgs/diod/files/diod/run
+++ b/srcpkgs/diod/files/diod/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec diod -f 2>&1
diff --git a/srcpkgs/distcc/files/distccd/run b/srcpkgs/distcc/files/distccd/run
index 58c2676387ac..7fd8322fea71 100755
--- a/srcpkgs/distcc/files/distccd/run
+++ b/srcpkgs/distcc/files/distccd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
PROG="distccd"
USER="nobody"
OPTIONS="--no-detach"
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_in/run b/srcpkgs/dkimproxy/files/dkimproxy_in/run
index 444d5b08158d..3ff39abc7078 100644
--- a/srcpkgs/dkimproxy/files/dkimproxy_in/run
+++ b/srcpkgs/dkimproxy/files/dkimproxy_in/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _dkim:_dkim dkimproxy.in --conf_file=/etc/dkimproxy_in.conf 2>&1
diff --git a/srcpkgs/dkimproxy/files/dkimproxy_out/run b/srcpkgs/dkimproxy/files/dkimproxy_out/run
index b77c1a091bf8..b1d6cd3f3978 100644
--- a/srcpkgs/dkimproxy/files/dkimproxy_out/run
+++ b/srcpkgs/dkimproxy/files/dkimproxy_out/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _dkim:_dkim dkimproxy.out --conf_file=/etc/dkimproxy_out.conf 2>&1
diff --git a/srcpkgs/dnsdist/files/dnsdist/run b/srcpkgs/dnsdist/files/dnsdist/run
index 130506a53b7d..fe83bbce5480 100644
--- a/srcpkgs/dnsdist/files/dnsdist/run
+++ b/srcpkgs/dnsdist/files/dnsdist/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
MAX_OPEN_FILES=${MAX_OPEN_FILES:-2048}
exec chpst -o $MAX_OPEN_FILES dnsdist --uid _dnsdist --gid _dnsdist --supervised --disable-syslog
diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run
index f3504f9e6ece..5d3a69b38695 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq/run
+++ b/srcpkgs/dnsmasq/files/dnsmasq/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/lib/misc
[ -r ./conf ] && . ./conf
exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1
diff --git a/srcpkgs/dovecot/files/dovecot/run b/srcpkgs/dovecot/files/dovecot/run
index c3485096af91..b442b8c25cdf 100755
--- a/srcpkgs/dovecot/files/dovecot/run
+++ b/srcpkgs/dovecot/files/dovecot/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m 0755 -o root -g root /var/run/dovecot
exec dovecot -F
diff --git a/srcpkgs/dq/files/dqcache/run b/srcpkgs/dq/files/dqcache/run
index 5d3e34ebb66a..e86fe710ebcb 100644
--- a/srcpkgs/dq/files/dqcache/run
+++ b/srcpkgs/dq/files/dqcache/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -U _dqcache -e /etc/dqcache/env dqcache 2>&1
diff --git a/srcpkgs/drbd-utils/files/drbd/run b/srcpkgs/drbd-utils/files/drbd/run
index 0f594ec6a1df..e9b9a6d63e15 100755
--- a/srcpkgs/drbd-utils/files/drbd/run
+++ b/srcpkgs/drbd-utils/files/drbd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
/usr/libexec/drbd start
exec chpst -b drbd pause
diff --git a/srcpkgs/dropbear/files/dropbear/run b/srcpkgs/dropbear/files/dropbear/run
index 50c442b8cc98..a02d55320497 100755
--- a/srcpkgs/dropbear/files/dropbear/run
+++ b/srcpkgs/dropbear/files/dropbear/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec dropbear ${OPTS:=-F -R}
diff --git a/srcpkgs/duiadns/files/duiadns/run b/srcpkgs/duiadns/files/duiadns/run
index c60644335b6a..ef0eade5050a 100755
--- a/srcpkgs/duiadns/files/duiadns/run
+++ b/srcpkgs/duiadns/files/duiadns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/earlyoom/files/earlyoom/run b/srcpkgs/earlyoom/files/earlyoom/run
index 7bc8877b5b26..fd2a22c36de9 100755
--- a/srcpkgs/earlyoom/files/earlyoom/run
+++ b/srcpkgs/earlyoom/files/earlyoom/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec earlyoom ${OPTS} 2>&1 >/dev/null
diff --git a/srcpkgs/edac-utils/files/edac/run b/srcpkgs/edac-utils/files/edac/run
index a2cc0160a2b6..6058f0b68f64 100644
--- a/srcpkgs/edac-utils/files/edac/run
+++ b/srcpkgs/edac-utils/files/edac/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
edac-ctl --register-labels
exec chpst -b edac pause
diff --git a/srcpkgs/elog/files/elogd/run b/srcpkgs/elog/files/elogd/run
index b196a73b4ef1..f754fa1e7f1d 100644
--- a/srcpkgs/elog/files/elogd/run
+++ b/srcpkgs/elog/files/elogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u elog:elog /usr/bin/elogd -c /etc/elog/elogd.cfg
diff --git a/srcpkgs/elogind/files/elogind/run b/srcpkgs/elogind/files/elogind/run
index e3564a0c745d..74c4c681df78 100644
--- a/srcpkgs/elogind/files/elogind/run
+++ b/srcpkgs/elogind/files/elogind/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# elogind doesn't work right if it starts before dbus
sv check dbus >/dev/null || exit 1
exec /usr/libexec/elogind/elogind.wrapper
diff --git a/srcpkgs/etcd/files/etcd/run b/srcpkgs/etcd/files/etcd/run
index 4d3f36562993..e525d638c054 100644
--- a/srcpkgs/etcd/files/etcd/run
+++ b/srcpkgs/etcd/files/etcd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export ETCD_DATA_DIR=/var/lib/etcd
export ETCD_NAME=etcd
diff --git a/srcpkgs/eudev/files/udevd/run b/srcpkgs/eudev/files/udevd/run
index 1196b0bd3eb1..b6af85ec341d 100755
--- a/srcpkgs/eudev/files/udevd/run
+++ b/srcpkgs/eudev/files/udevd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
udevadm control --exit
exec udevd
diff --git a/srcpkgs/fah/files/FAHClient/run b/srcpkgs/fah/files/FAHClient/run
index 08af6c9e12e1..98fc57d26a98 100755
--- a/srcpkgs/fah/files/FAHClient/run
+++ b/srcpkgs/fah/files/FAHClient/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
OPTS=--run-as=_fah
set -e
[ -r config ] && . config
diff --git a/srcpkgs/fail2ban/files/fail2ban/run b/srcpkgs/fail2ban/files/fail2ban/run
index c8e9a5b60f6d..c8cefb6a825d 100755
--- a/srcpkgs/fail2ban/files/fail2ban/run
+++ b/srcpkgs/fail2ban/files/fail2ban/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/fail2ban
exec fail2ban-server -f
diff --git a/srcpkgs/fake-hwclock/files/fake-hwclock/run b/srcpkgs/fake-hwclock/files/fake-hwclock/run
index e5f8c5a70c89..f2a6241a5da5 100755
--- a/srcpkgs/fake-hwclock/files/fake-hwclock/run
+++ b/srcpkgs/fake-hwclock/files/fake-hwclock/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
[ -r /etc/default/fake-hwclock ] && . /etc/default/fake-hwclock
fake-hwclock load $FORCE || exit 1
diff --git a/srcpkgs/fastd/files/fastd/run b/srcpkgs/fastd/files/fastd/run
index 86cda0bf1595..4d1bad07ae0a 100755
--- a/srcpkgs/fastd/files/fastd/run
+++ b/srcpkgs/fastd/files/fastd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fastd --config /etc/fastd/fastd.conf
diff --git a/srcpkgs/fcron/files/fcron/run b/srcpkgs/fcron/files/fcron/run
index a3b4afbc6d64..e0f0f9631021 100755
--- a/srcpkgs/fcron/files/fcron/run
+++ b/srcpkgs/fcron/files/fcron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fcron -f
diff --git a/srcpkgs/fiche/files/fiche/run b/srcpkgs/fiche/files/fiche/run
index 510687b56614..46873ebf7afd 100644
--- a/srcpkgs/fiche/files/fiche/run
+++ b/srcpkgs/fiche/files/fiche/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _fiche:_fiche fiche -d yourdomain.com -o /var/tmp/fiche -l /var/log/fiche/log
diff --git a/srcpkgs/firehol/files/firehol/run b/srcpkgs/firehol/files/firehol/run
index 44aa326c1c28..78c2996b16be 100644
--- a/srcpkgs/firehol/files/firehol/run
+++ b/srcpkgs/firehol/files/firehol/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/firehol/firehol.conf ] && exit 0
firehol start || exit 1
exec chpst -b firehol pause
diff --git a/srcpkgs/flannel/files/flannel/run b/srcpkgs/flannel/files/flannel/run
index 953f7459bbfd..7bc961915dd5 100644
--- a/srcpkgs/flannel/files/flannel/run
+++ b/srcpkgs/flannel/files/flannel/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check etcd >/dev/null || exit 1
exec flannel
diff --git a/srcpkgs/freeipmi/files/bmc-watchdog/run b/srcpkgs/freeipmi/files/bmc-watchdog/run
index 2747898f9457..ceab6fb7a269 100644
--- a/srcpkgs/freeipmi/files/bmc-watchdog/run
+++ b/srcpkgs/freeipmi/files/bmc-watchdog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/freeipmi/files/ipmidetectd/run b/srcpkgs/freeipmi/files/ipmidetectd/run
index 1e283cce88b9..d74d97c8d1eb 100644
--- a/srcpkgs/freeipmi/files/ipmidetectd/run
+++ b/srcpkgs/freeipmi/files/ipmidetectd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec ipmidetectd -d
diff --git a/srcpkgs/freeipmi/files/ipmiseld/run b/srcpkgs/freeipmi/files/ipmiseld/run
index 818d1bcb3e46..281a5f2d89c7 100644
--- a/srcpkgs/freeipmi/files/ipmiseld/run
+++ b/srcpkgs/freeipmi/files/ipmiseld/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ipmiseld --foreground
diff --git a/srcpkgs/frp/files/frpc/run b/srcpkgs/frp/files/frpc/run
index c095fe5260c0..eef6a5bbc1bd 100644
--- a/srcpkgs/frp/files/frpc/run
+++ b/srcpkgs/frp/files/frpc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/frpc -c /etc/frp/frpc.ini
diff --git a/srcpkgs/frp/files/frps/run b/srcpkgs/frp/files/frps/run
index 210f9fc25f77..d43adc966c6c 100644
--- a/srcpkgs/frp/files/frps/run
+++ b/srcpkgs/frp/files/frps/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/frps -c /etc/frp/frps.ini
diff --git a/srcpkgs/frr/files/frr-generic/run b/srcpkgs/frr/files/frr-generic/run
index 1a0d2dfb6cba..0725ba54ab21 100755
--- a/srcpkgs/frr/files/frr-generic/run
+++ b/srcpkgs/frr/files/frr-generic/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
daemon="$(basename "${PWD}")"
diff --git a/srcpkgs/fwknop/files/fwknopd/run b/srcpkgs/fwknop/files/fwknopd/run
index 9d915cb51e04..f96978344dce 100644
--- a/srcpkgs/fwknop/files/fwknopd/run
+++ b/srcpkgs/fwknop/files/fwknopd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec fwknopd -f
diff --git a/srcpkgs/gdm/files/gdm/run b/srcpkgs/gdm/files/gdm/run
index a271fbcf070c..af0fbc08a88e 100755
--- a/srcpkgs/gdm/files/gdm/run
+++ b/srcpkgs/gdm/files/gdm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus > /dev/null || exit 1
[ ! -d /run/gdm ] && mkdir -m0711 -p /run/gdm && chown root:gdm /run/gdm
exec gdm
diff --git a/srcpkgs/gemserv/files/gemserv/run b/srcpkgs/gemserv/files/gemserv/run
index 954bc6026268..a7f60bc8d55d 100755
--- a/srcpkgs/gemserv/files/gemserv/run
+++ b/srcpkgs/gemserv/files/gemserv/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _gemserv gemserv ${CONF:-/etc/gemserv.conf}
diff --git a/srcpkgs/geomyidae/files/geomyidae/run b/srcpkgs/geomyidae/files/geomyidae/run
index c03e821b16db..f28cc87f0623 100755
--- a/srcpkgs/geomyidae/files/geomyidae/run
+++ b/srcpkgs/geomyidae/files/geomyidae/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
user=_geomyidae
diff --git a/srcpkgs/gerbera/files/gerbera/run b/srcpkgs/gerbera/files/gerbera/run
index cab802769fe9..0bcd38bddbc6 100755
--- a/srcpkgs/gerbera/files/gerbera/run
+++ b/srcpkgs/gerbera/files/gerbera/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -d /var/lib/gerbera/.config ]; then
mkdir -p /var/lib/gerbera/.config/gerbera
diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index 0644a7895266..d16e22ba9d6e 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# USER and HOME are needed because gitea doesn't actually check the user it
# runs as, but instead just grabs the variables from the variables.
diff --git a/srcpkgs/gitlab-runner/files/gitlab-runner/run b/srcpkgs/gitlab-runner/files/gitlab-runner/run
index 5a137b78d9be..0ad8e3441d04 100644
--- a/srcpkgs/gitlab-runner/files/gitlab-runner/run
+++ b/srcpkgs/gitlab-runner/files/gitlab-runner/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec gitlab-runner run
diff --git a/srcpkgs/glibc/files/nscd/run b/srcpkgs/glibc/files/nscd/run
index e9ea04a19e97..53127524af2b 100755
--- a/srcpkgs/glibc/files/nscd/run
+++ b/srcpkgs/glibc/files/nscd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /var/run/nscd /var/db/nscd
exec nscd -F ${OPTS} >/dev/null
diff --git a/srcpkgs/glider/files/glider/run b/srcpkgs/glider/files/glider/run
index 807b7568362e..92802a87e5cd 100644
--- a/srcpkgs/glider/files/glider/run
+++ b/srcpkgs/glider/files/glider/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u nobody:nogroup glider -config /etc/glider/config
diff --git a/srcpkgs/glusterfs/files/glusterd/run b/srcpkgs/glusterfs/files/glusterd/run
index 7f0e6820e66f..41463c3f49af 100644
--- a/srcpkgs/glusterfs/files/glusterd/run
+++ b/srcpkgs/glusterfs/files/glusterd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec glusterd -N 2>&1
diff --git a/srcpkgs/glusterfs/files/glusterfsd/run b/srcpkgs/glusterfs/files/glusterfsd/run
index 15dd0bed4462..944b6ba04bf4 100644
--- a/srcpkgs/glusterfs/files/glusterfsd/run
+++ b/srcpkgs/glusterfs/files/glusterfsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec glusterfsd -N 2>&1
diff --git a/srcpkgs/gnunet/files/gnunet/run b/srcpkgs/gnunet/files/gnunet/run
index 4adb83a4d027..85671e61debf 100644
--- a/srcpkgs/gnunet/files/gnunet/run
+++ b/srcpkgs/gnunet/files/gnunet/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet/gnunet.conf
diff --git a/srcpkgs/go-ipfs/files/ipfs/run b/srcpkgs/go-ipfs/files/ipfs/run
index 29690e65659a..f93d0fade078 100755
--- a/srcpkgs/go-ipfs/files/ipfs/run
+++ b/srcpkgs/go-ipfs/files/ipfs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
export IPFS_PATH=${IPFS_PATH:=/var/lib/ipfs}
exec chpst -u _ipfs ipfs daemon ${OPTS:=--init --enable-gc --migrate} 2>&1
diff --git a/srcpkgs/goatcounter/files/goatcounter/run b/srcpkgs/goatcounter/files/goatcounter/run
index e52e6387f0a5..61bf906780cf 100755
--- a/srcpkgs/goatcounter/files/goatcounter/run
+++ b/srcpkgs/goatcounter/files/goatcounter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/gogs/files/gogs/run b/srcpkgs/gogs/files/gogs/run
index 361e12f0f75c..90aa26207388 100644
--- a/srcpkgs/gogs/files/gogs/run
+++ b/srcpkgs/gogs/files/gogs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export USER=gogs
export HOME=/srv/gogs
exec chpst -u gogs:gogs -P gogs web --config /etc/gogs.ini 2>&1
diff --git a/srcpkgs/gpm/files/gpm/run b/srcpkgs/gpm/files/gpm/run
index 1d1a3e77d9f2..6883c7c43de4 100755
--- a/srcpkgs/gpm/files/gpm/run
+++ b/srcpkgs/gpm/files/gpm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
exec gpm -D -m /dev/input/mice -t imps2
diff --git a/srcpkgs/gpsd/files/gpsd/run b/srcpkgs/gpsd/files/gpsd/run
index 43ad7c8f93f2..8c8d973044ef 100644
--- a/srcpkgs/gpsd/files/gpsd/run
+++ b/srcpkgs/gpsd/files/gpsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec /usr/bin/gpsd -N -F /run/gpsd.sock $OPTS ${DEV:=/dev/gps0}
diff --git a/srcpkgs/grafana/files/grafana/run b/srcpkgs/grafana/files/grafana/run
index 3a78eec79a79..f1d961e83f48 100755
--- a/srcpkgs/grafana/files/grafana/run
+++ b/srcpkgs/grafana/files/grafana/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _grafana:_grafana grafana-server -homepath /usr/share/grafana/ -config /etc/grafana/grafana.ini 2>&1
diff --git a/srcpkgs/h2o/files/h2o/run b/srcpkgs/h2o/files/h2o/run
index 57e623ede217..2e1e931f1701 100644
--- a/srcpkgs/h2o/files/h2o/run
+++ b/srcpkgs/h2o/files/h2o/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec h2o -c /etc/h2o.conf
diff --git a/srcpkgs/haproxy/files/haproxy/run b/srcpkgs/haproxy/files/haproxy/run
index 997215b0ca70..822c75dba8db 100755
--- a/srcpkgs/haproxy/files/haproxy/run
+++ b/srcpkgs/haproxy/files/haproxy/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec haproxy -W -f /etc/haproxy/haproxy.cfg
diff --git a/srcpkgs/haveged/files/haveged/run b/srcpkgs/haveged/files/haveged/run
index 30abcbdc0d26..2c09586db33f 100644
--- a/srcpkgs/haveged/files/haveged/run
+++ b/srcpkgs/haveged/files/haveged/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
exec haveged -w 1024 -v 1 -F
diff --git a/srcpkgs/hddtemp/files/hddtemp/run b/srcpkgs/hddtemp/files/hddtemp/run
index fbed7ddb0bc7..790768cf33e1 100755
--- a/srcpkgs/hddtemp/files/hddtemp/run
+++ b/srcpkgs/hddtemp/files/hddtemp/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec hddtemp -dF ${OPTS:=/dev/sda}
diff --git a/srcpkgs/hiawatha/files/hiawatha/run b/srcpkgs/hiawatha/files/hiawatha/run
index eb962fb992ce..2865ab6f7c51 100755
--- a/srcpkgs/hiawatha/files/hiawatha/run
+++ b/srcpkgs/hiawatha/files/hiawatha/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hiawatha -d
diff --git a/srcpkgs/hitch/files/hitch/run b/srcpkgs/hitch/files/hitch/run
index bd09afdb4261..9e665f41f65e 100755
--- a/srcpkgs/hitch/files/hitch/run
+++ b/srcpkgs/hitch/files/hitch/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hitch -u _hitch --config=/etc/hitch.conf
diff --git a/srcpkgs/hostapd/files/hostapd/run b/srcpkgs/hostapd/files/hostapd/run
index 0d17269e5d5e..39628755b420 100644
--- a/srcpkgs/hostapd/files/hostapd/run
+++ b/srcpkgs/hostapd/files/hostapd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec hostapd -s /etc/hostapd/hostapd.conf 2>&1
diff --git a/srcpkgs/i2pd/files/i2pd/run b/srcpkgs/i2pd/files/i2pd/run
index 2395b784eed4..a68c888a478b 100644
--- a/srcpkgs/i2pd/files/i2pd/run
+++ b/srcpkgs/i2pd/files/i2pd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-16384}
exec chpst -u _i2pd:_i2pd i2pd --service \
diff --git a/srcpkgs/i8kutils/files/i8kmon/run b/srcpkgs/i8kutils/files/i8kmon/run
index 4e0179182e77..569ebcc4a3be 100644
--- a/srcpkgs/i8kutils/files/i8kmon/run
+++ b/srcpkgs/i8kutils/files/i8kmon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -r ./conf ]; then
. ./conf
diff --git a/srcpkgs/icinga2/files/icinga2/run b/srcpkgs/icinga2/files/icinga2/run
index 456a8b246e41..d70f08eeaa99 100644
--- a/srcpkgs/icinga2/files/icinga2/run
+++ b/srcpkgs/icinga2/files/icinga2/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -oicinga -gicinga -d /run/icinga2
exec icinga2 daemon 2>&1
diff --git a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
index 5d3c8e9747ca..2744a2279c38 100755
--- a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
+++ b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/iio-sensor-proxy
diff --git a/srcpkgs/inadyn/files/inadyn/run b/srcpkgs/inadyn/files/inadyn/run
index 072f7fc1db52..d01febe7e8d6 100644
--- a/srcpkgs/inadyn/files/inadyn/run
+++ b/srcpkgs/inadyn/files/inadyn/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ ! -d /run/inadyn ] &&
mkdir -p /run/inadyn &&
diff --git a/srcpkgs/incron/files/incron/run b/srcpkgs/incron/files/incron/run
index 95fa0cfd9e3f..34c3272335a4 100644
--- a/srcpkgs/incron/files/incron/run
+++ b/srcpkgs/incron/files/incron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec incrond -n
diff --git a/srcpkgs/influxdb/files/influxdb/run b/srcpkgs/influxdb/files/influxdb/run
index dbb25cd03489..21a5285de281 100755
--- a/srcpkgs/influxdb/files/influxdb/run
+++ b/srcpkgs/influxdb/files/influxdb/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _influxdb:_influxdb influxd -config /etc/influxdb/influxdb.conf 2>&1
diff --git a/srcpkgs/inspircd/files/inspircd/run b/srcpkgs/inspircd/files/inspircd/run
index a9b6b365f977..a58657811577 100644
--- a/srcpkgs/inspircd/files/inspircd/run
+++ b/srcpkgs/inspircd/files/inspircd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u inspircd inspircd \
--nofork --config /etc/inspircd/inspircd.conf
diff --git a/srcpkgs/iptables/files/ip6tables/run b/srcpkgs/iptables/files/ip6tables/run
index 10e559afe91d..f62abbbb5415 100644
--- a/srcpkgs/iptables/files/ip6tables/run
+++ b/srcpkgs/iptables/files/ip6tables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/iptables/ip6tables.rules ] && exit 0
ip6tables-restore -w 3 /etc/iptables/ip6tables.rules || exit 1
exec chpst -b ip6tables pause
diff --git a/srcpkgs/iptables/files/iptables/run b/srcpkgs/iptables/files/iptables/run
index 74a2ab20d63c..346d7c332a1f 100644
--- a/srcpkgs/iptables/files/iptables/run
+++ b/srcpkgs/iptables/files/iptables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/iptables/iptables.rules ] && exit 0
iptables-restore -w 3 /etc/iptables/iptables.rules || exit 1
exec chpst -b iptables pause
diff --git a/srcpkgs/ipvsadm/files/ipvsadm/run b/srcpkgs/ipvsadm/files/ipvsadm/run
index 6bf7e37a3984..e4b60d5281f4 100644
--- a/srcpkgs/ipvsadm/files/ipvsadm/run
+++ b/srcpkgs/ipvsadm/files/ipvsadm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
: ${CONF_FILE:=/etc/ipvsadm.conf}
[ -r conf ] && . ./conf
[ -s $CONF_FILE ] || exit 0
diff --git a/srcpkgs/irqbalance/files/irqbalance/run b/srcpkgs/irqbalance/files/irqbalance/run
index 8c96e180cc71..cb32dd2597ad 100755
--- a/srcpkgs/irqbalance/files/irqbalance/run
+++ b/srcpkgs/irqbalance/files/irqbalance/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m0755 /run/irqbalance
exec irqbalance -f $OPTS
diff --git a/srcpkgs/iwd/files/ead/run b/srcpkgs/iwd/files/ead/run
index be32e2dbfa37..398550cf7d13 100644
--- a/srcpkgs/iwd/files/ead/run
+++ b/srcpkgs/iwd/files/ead/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . conf
exec /usr/libexec/ead ${OPTS} 2>&1
diff --git a/srcpkgs/iwd/files/iwd/run b/srcpkgs/iwd/files/iwd/run
index f42e3cfc4ffa..7b751e0a5a8c 100755
--- a/srcpkgs/iwd/files/iwd/run
+++ b/srcpkgs/iwd/files/iwd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec /usr/libexec/iwd ${OPTS} 2>&1
diff --git a/srcpkgs/jenkins/files/jenkins/run b/srcpkgs/jenkins/files/jenkins/run
index 05d8a79c68db..a17ef44df7f0 100755
--- a/srcpkgs/jenkins/files/jenkins/run
+++ b/srcpkgs/jenkins/files/jenkins/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/profile
[ -r conf ] && . ./conf
diff --git a/srcpkgs/kapacitor/files/kapacitor/run b/srcpkgs/kapacitor/files/kapacitor/run
index bf01be588bae..98965928a848 100644
--- a/srcpkgs/kapacitor/files/kapacitor/run
+++ b/srcpkgs/kapacitor/files/kapacitor/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _kapacitor:_kapacitor kapacitord --config /etc/kapacitor/kapacitor.conf 2>&1
diff --git a/srcpkgs/kea/files/kea-dhcp-ddns/run b/srcpkgs/kea/files/kea-dhcp-ddns/run
index dc6ecbb017fe..5676ff1bfaec 100644
--- a/srcpkgs/kea/files/kea-dhcp-ddns/run
+++ b/srcpkgs/kea/files/kea-dhcp-ddns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /run/kea
exec kea-dhcp-ddns ${OPTS:=-c /etc/kea/kea.conf}
diff --git a/srcpkgs/kea/files/kea-dhcp4/run b/srcpkgs/kea/files/kea-dhcp4/run
index 1f99ae418bd9..faac2be967d6 100644
--- a/srcpkgs/kea/files/kea-dhcp4/run
+++ b/srcpkgs/kea/files/kea-dhcp4/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet address show "$WAIT_IFACE")" ] && exit 1
mkdir -p /run/kea
diff --git a/srcpkgs/kea/files/kea-dhcp6/run b/srcpkgs/kea/files/kea-dhcp6/run
index 00d0eeff8010..f3977e3cc86a 100644
--- a/srcpkgs/kea/files/kea-dhcp6/run
+++ b/srcpkgs/kea/files/kea-dhcp6/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet6 address show "$WAIT_IFACE")" ] && exit 1
mkdir -p /run/kea
diff --git a/srcpkgs/keepalived/files/keepalived/run b/srcpkgs/keepalived/files/keepalived/run
index bec8c0de5ee1..e542d2d20dca 100644
--- a/srcpkgs/keepalived/files/keepalived/run
+++ b/srcpkgs/keepalived/files/keepalived/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec keepalived --dont-fork
diff --git a/srcpkgs/keyd/files/keyd/run b/srcpkgs/keyd/files/keyd/run
index 5e62cef91c72..471e3f59b872 100644
--- a/srcpkgs/keyd/files/keyd/run
+++ b/srcpkgs/keyd/files/keyd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Sometimes when starting the keyd service, the keyboard can become unresponsive.
# This is the result of keyd starting when the early udevd process is still running but
diff --git a/srcpkgs/knot-resolver/files/kresd/run b/srcpkgs/knot-resolver/files/kresd/run
index 2342892a135f..43b80cda27f2 100644
--- a/srcpkgs/knot-resolver/files/kresd/run
+++ b/srcpkgs/knot-resolver/files/kresd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _knot_resolver -g _knot_resolver /run/knot-resolver
exec kresd ${OPTS:--f 1}
diff --git a/srcpkgs/knot/files/knotd/run b/srcpkgs/knot/files/knotd/run
index 85301ab0461d..ee822deb055d 100644
--- a/srcpkgs/knot/files/knotd/run
+++ b/srcpkgs/knot/files/knotd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
install -d -m0755 -o _knot -g _knot /run/knot
exec knotd ${OPTS}
diff --git a/srcpkgs/kubernetes/files/kube-apiserver/run b/srcpkgs/kubernetes/files/kube-apiserver/run
index 159804b95a5b..a5106159a375 100644
--- a/srcpkgs/kubernetes/files/kube-apiserver/run
+++ b/srcpkgs/kubernetes/files/kube-apiserver/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/apiserver ] && . /etc/kubernetes/apiserver
exec chpst -u kube:kube kube-apiserver \
diff --git a/srcpkgs/kubernetes/files/kube-controller-manager/run b/srcpkgs/kubernetes/files/kube-controller-manager/run
index 5d298168109d..272df9c5495c 100644
--- a/srcpkgs/kubernetes/files/kube-controller-manager/run
+++ b/srcpkgs/kubernetes/files/kube-controller-manager/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/controller-manager ] && . /etc/kubernetes/controller-manager
exec chpst -u kube:kube kube-controller-manager \
diff --git a/srcpkgs/kubernetes/files/kube-proxy/run b/srcpkgs/kubernetes/files/kube-proxy/run
index 58f4865ccbe7..85f5ceac0fba 100644
--- a/srcpkgs/kubernetes/files/kube-proxy/run
+++ b/srcpkgs/kubernetes/files/kube-proxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/proxy ] && . /etc/kubernetes/proxy
exec kube-proxy \
diff --git a/srcpkgs/kubernetes/files/kube-scheduler/run b/srcpkgs/kubernetes/files/kube-scheduler/run
index 8e0a83a7613e..57925b60bcaa 100644
--- a/srcpkgs/kubernetes/files/kube-scheduler/run
+++ b/srcpkgs/kubernetes/files/kube-scheduler/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/scheduler ] && . /etc/kubernetes/scheduler
exec chpst -u kube:kube kube-scheduler \
diff --git a/srcpkgs/kubernetes/files/kubelet/run b/srcpkgs/kubernetes/files/kubelet/run
index 4b623e966e5c..0bea9b4d28f6 100644
--- a/srcpkgs/kubernetes/files/kubelet/run
+++ b/srcpkgs/kubernetes/files/kubelet/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r /etc/kubernetes/config ] && . /etc/kubernetes/config
[ -r /etc/kubernetes/kubelet ] && . /etc/kubernetes/kubelet
exec kubelet $OPTS 2>/dev/null
diff --git a/srcpkgs/laptop-mode/files/laptop-mode/run b/srcpkgs/laptop-mode/files/laptop-mode/run
index 8d8e154ec876..ad3d976d14f7 100644
--- a/srcpkgs/laptop-mode/files/laptop-mode/run
+++ b/srcpkgs/laptop-mode/files/laptop-mode/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
laptop_mode init auto
exec chpst -b laptop-mode pause
diff --git a/srcpkgs/ldm/files/ldm/run b/srcpkgs/ldm/files/ldm/run
index bf242b7e00b5..e139a58df257 100644
--- a/srcpkgs/ldm/files/ldm/run
+++ b/srcpkgs/ldm/files/ldm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -s conf ] && . ./conf
exec ldm ${OPTS:=-u nobody}
diff --git a/srcpkgs/libcgroup/files/cgred/run b/srcpkgs/libcgroup/files/cgred/run
index 7b621d762c61..eb3a298bf855 100755
--- a/srcpkgs/libcgroup/files/cgred/run
+++ b/srcpkgs/libcgroup/files/cgred/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Default logs to syslog with facility DAEMON
# man cgrulesengd for options list and descriptions.
[ -r conf ] && . ./conf
diff --git a/srcpkgs/libratbag/files/ratbagd/run b/srcpkgs/libratbag/files/ratbagd/run
index 1fbf9c8e5a7d..b5ae8240f029 100755
--- a/srcpkgs/libratbag/files/ratbagd/run
+++ b/srcpkgs/libratbag/files/ratbagd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec ratbagd
diff --git a/srcpkgs/libvirt/files/libvirt-generic/run b/srcpkgs/libvirt/files/libvirt-generic/run
index 93b8a31ae81e..9d172da0a423 100644
--- a/srcpkgs/libvirt/files/libvirt-generic/run
+++ b/srcpkgs/libvirt/files/libvirt-generic/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
diff --git a/srcpkgs/lightdm/files/lightdm/run b/srcpkgs/lightdm/files/lightdm/run
index cabe9dd5b87d..f376f39f00a4 100755
--- a/srcpkgs/lightdm/files/lightdm/run
+++ b/srcpkgs/lightdm/files/lightdm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
install -d -m0711 -olightdm -glightdm /run/lightdm
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/lighttpd/files/lighttpd/run b/srcpkgs/lighttpd/files/lighttpd/run
index b1d0bb000f7f..59fbe4c0def2 100644
--- a/srcpkgs/lighttpd/files/lighttpd/run
+++ b/srcpkgs/lighttpd/files/lighttpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
diff --git a/srcpkgs/linux-tools/files/freefall/run b/srcpkgs/linux-tools/files/freefall/run
index 51a9f293b473..9aee7a51a7d3 100644
--- a/srcpkgs/linux-tools/files/freefall/run
+++ b/srcpkgs/linux-tools/files/freefall/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec freefall ${OPTS:=/dev/sda}
diff --git a/srcpkgs/linux-tools/files/usbipd/run b/srcpkgs/linux-tools/files/usbipd/run
index 9deca9bdfae8..4da64ab288e7 100755
--- a/srcpkgs/linux-tools/files/usbipd/run
+++ b/srcpkgs/linux-tools/files/usbipd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe -q usbip-host || exit 1
modprobe -q vhci-hcd || exit 1
exec usbipd
diff --git a/srcpkgs/lldpd/files/lldpd/run b/srcpkgs/lldpd/files/lldpd/run
index 79ec74814eaf..f10c7ddd50b1 100755
--- a/srcpkgs/lldpd/files/lldpd/run
+++ b/srcpkgs/lldpd/files/lldpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec lldpd ${OPTS:- -d} 2>&1
diff --git a/srcpkgs/lm_sensors/files/fancontrol/run b/srcpkgs/lm_sensors/files/fancontrol/run
index f04fce8d648f..0025d9784a5d 100644
--- a/srcpkgs/lm_sensors/files/fancontrol/run
+++ b/srcpkgs/lm_sensors/files/fancontrol/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . conf
[ ! -r ${CONF_FILE:-/etc/fancontrol} ] && exit 1
exec /usr/bin/fancontrol ${CONF_FILE:-/etc/fancontrol}
diff --git a/srcpkgs/lsyncd/files/lsyncd/run b/srcpkgs/lsyncd/files/lsyncd/run
index c6baeb891c2f..6a8a5ec808de 100644
--- a/srcpkgs/lsyncd/files/lsyncd/run
+++ b/srcpkgs/lsyncd/files/lsyncd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec lsyncd -nodaemon "${CONF_FILE:-/etc/lsyncd/lsyncd.conf.lua}"
diff --git a/srcpkgs/lvm2/files/dmeventd/run b/srcpkgs/lvm2/files/dmeventd/run
index 09ceb7fd8f3c..b6dc448dd990 100644
--- a/srcpkgs/lvm2/files/dmeventd/run
+++ b/srcpkgs/lvm2/files/dmeventd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec dmeventd -f
diff --git a/srcpkgs/lvm2/files/lvmetad/run b/srcpkgs/lvm2/files/lvmetad/run
index f85b5cf6f9c6..c203a0ed9a77 100644
--- a/srcpkgs/lvm2/files/lvmetad/run
+++ b/srcpkgs/lvm2/files/lvmetad/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lvmetad -f
diff --git a/srcpkgs/lxc/files/lxc-autostart/run b/srcpkgs/lxc/files/lxc-autostart/run
index 5e93d5ef35d2..5dd11d01c225 100755
--- a/srcpkgs/lxc/files/lxc-autostart/run
+++ b/srcpkgs/lxc/files/lxc-autostart/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
lxc-autostart || exit 1
exec chpst -b lxc-autostart pause
diff --git a/srcpkgs/lxcfs/files/lxcfs/run b/srcpkgs/lxcfs/files/lxcfs/run
index 2e751d7e9810..7ff382798f93 100755
--- a/srcpkgs/lxcfs/files/lxcfs/run
+++ b/srcpkgs/lxcfs/files/lxcfs/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lxcfs -f /var/lib/lxcfs
diff --git a/srcpkgs/lxd-lts/files/lxd/run b/srcpkgs/lxd-lts/files/lxd/run
index a32a24389378..4a9ea61ba9a6 100755
--- a/srcpkgs/lxd-lts/files/lxd/run
+++ b/srcpkgs/lxd-lts/files/lxd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
_systemd_cgrp="/sys/fs/cgroup/systemd"
if [ ! -d ${_systemd_cgrp} ]; then
mkdir ${_systemd_cgrp}
diff --git a/srcpkgs/lxd/files/lxd/run b/srcpkgs/lxd/files/lxd/run
index a32a24389378..4a9ea61ba9a6 100644
--- a/srcpkgs/lxd/files/lxd/run
+++ b/srcpkgs/lxd/files/lxd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
_systemd_cgrp="/sys/fs/cgroup/systemd"
if [ ! -d ${_systemd_cgrp} ]; then
mkdir ${_systemd_cgrp}
diff --git a/srcpkgs/lxdm/files/lxdm/run b/srcpkgs/lxdm/files/lxdm/run
index f25827cf42a0..55b6a191149d 100755
--- a/srcpkgs/lxdm/files/lxdm/run
+++ b/srcpkgs/lxdm/files/lxdm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec lxdm
diff --git a/srcpkgs/mDNSResponder/files/dnsextd/run b/srcpkgs/mDNSResponder/files/dnsextd/run
index 640e11c76f9c..bf3f8ec1c79c 100644
--- a/srcpkgs/mDNSResponder/files/dnsextd/run
+++ b/srcpkgs/mDNSResponder/files/dnsextd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec dnsextd -d
diff --git a/srcpkgs/mDNSResponder/files/mdnsd/run b/srcpkgs/mDNSResponder/files/mdnsd/run
index 2eb4d89f2583..58b59acf898a 100644
--- a/srcpkgs/mDNSResponder/files/mdnsd/run
+++ b/srcpkgs/mDNSResponder/files/mdnsd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mdnsd -debug
diff --git a/srcpkgs/mariadb/files/mysqld/run b/srcpkgs/mariadb/files/mysqld/run
index bc16a07883ed..6368eb526c5a 100755
--- a/srcpkgs/mariadb/files/mysqld/run
+++ b/srcpkgs/mariadb/files/mysqld/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/mysqld ] && mkdir -p /run/mysqld
chown mysql:mysql /run/mysqld
exec chpst -u mysql:mysql mysqld --user=mysql 2>&1
diff --git a/srcpkgs/mcelog/files/mcelog/run b/srcpkgs/mcelog/files/mcelog/run
index 18691c742c01..f0842d518919 100755
--- a/srcpkgs/mcelog/files/mcelog/run
+++ b/srcpkgs/mcelog/files/mcelog/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mcelog --daemon --foreground --syslog
diff --git a/srcpkgs/mdadm/files/mdadm/run b/srcpkgs/mdadm/files/mdadm/run
index b9684b26a831..38670a644ae3 100755
--- a/srcpkgs/mdadm/files/mdadm/run
+++ b/srcpkgs/mdadm/files/mdadm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
# --syslog makes it run in every case, yet forwards to mail address if given.
exec mdadm --monitor --scan --syslog
diff --git a/srcpkgs/metalog/files/metalog/run b/srcpkgs/metalog/files/metalog/run
index 0f801d171017..5b7ff14eba60 100755
--- a/srcpkgs/metalog/files/metalog/run
+++ b/srcpkgs/metalog/files/metalog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
[ -r conf ] && . ./conf
exec metalog ${OPTS=-v}
diff --git a/srcpkgs/minidlna/files/minidlnad/run b/srcpkgs/minidlna/files/minidlnad/run
index f38a72eb355f..406865afa577 100644
--- a/srcpkgs/minidlna/files/minidlnad/run
+++ b/srcpkgs/minidlna/files/minidlnad/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec minidlnad -S ${OPTS} 2>&1
diff --git a/srcpkgs/minio/files/minio/run b/srcpkgs/minio/files/minio/run
index ecea96356c9a..dfbae379b4a4 100755
--- a/srcpkgs/minio/files/minio/run
+++ b/srcpkgs/minio/files/minio/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/default/minio
: ${MINIO_VOLUMES:="/var/lib/minio/data/"}
exec chpst -u _minio:_minio minio -C /etc/minio/ server "$MINIO_VOLUMES"
diff --git a/srcpkgs/mit-krb5/files/kadmind/run b/srcpkgs/mit-krb5/files/kadmind/run
index 55ccb49c9141..0fa119dc9ab0 100755
--- a/srcpkgs/mit-krb5/files/kadmind/run
+++ b/srcpkgs/mit-krb5/files/kadmind/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec kadmind -nofork
diff --git a/srcpkgs/mit-krb5/files/krb5kdc/run b/srcpkgs/mit-krb5/files/krb5kdc/run
index f4d7314003a7..847e73e79503 100755
--- a/srcpkgs/mit-krb5/files/krb5kdc/run
+++ b/srcpkgs/mit-krb5/files/krb5kdc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec krb5kdc -n
diff --git a/srcpkgs/moby/files/docker/run b/srcpkgs/moby/files/docker/run
index ed42f5fa72f8..959c22b803c5 100644
--- a/srcpkgs/moby/files/docker/run
+++ b/srcpkgs/moby/files/docker/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
modprobe -q loop || exit 1
mountpoint -q /sys/fs/cgroup/systemd || {
diff --git a/srcpkgs/monero/files/monerod/run b/srcpkgs/monero/files/monerod/run
index bc06010c7c2e..f485e63659fa 100644
--- a/srcpkgs/monero/files/monerod/run
+++ b/srcpkgs/monero/files/monerod/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u monero:monero /usr/bin/monerod --non-interactive --config-file /etc/monerod.conf
diff --git a/srcpkgs/monit/files/monit/run b/srcpkgs/monit/files/monit/run
index f80af51c5397..13a36afab271 100644
--- a/srcpkgs/monit/files/monit/run
+++ b/srcpkgs/monit/files/monit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -f /etc/monit/monitrc ]; then
CONF="-c /etc/monit/monitrc"
fi
diff --git a/srcpkgs/monkey/files/monkey/run b/srcpkgs/monkey/files/monkey/run
index 95dad012d94d..15a45ba93f31 100644
--- a/srcpkgs/monkey/files/monkey/run
+++ b/srcpkgs/monkey/files/monkey/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec monkey
diff --git a/srcpkgs/moosefs/files/mfschunkserver/run b/srcpkgs/moosefs/files/mfschunkserver/run
index 3e02c6e9e60e..316c8507de62 100644
--- a/srcpkgs/moosefs/files/mfschunkserver/run
+++ b/srcpkgs/moosefs/files/mfschunkserver/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfschunkserver.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/moosefs/files/mfsmaster/run b/srcpkgs/moosefs/files/mfsmaster/run
index 083632c8a883..72389baab5fd 100644
--- a/srcpkgs/moosefs/files/mfsmaster/run
+++ b/srcpkgs/moosefs/files/mfsmaster/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfsmaster.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/moosefs/files/mfsmetalogger/run b/srcpkgs/moosefs/files/mfsmetalogger/run
index bdd9fdf432a9..2797217ea172 100644
--- a/srcpkgs/moosefs/files/mfsmetalogger/run
+++ b/srcpkgs/moosefs/files/mfsmetalogger/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -e conf ] && . ./conf
: ${CONF_FILE:=/etc/mfs/mfsmetalogger.cfg}
[ -e ${CONF_FILE} ] || exit 1
diff --git a/srcpkgs/mopidy/files/mopidy/run b/srcpkgs/mopidy/files/mopidy/run
index 558c2d7a4e67..68c0263086e2 100755
--- a/srcpkgs/mopidy/files/mopidy/run
+++ b/srcpkgs/mopidy/files/mopidy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec chpst -u mopidy:audio \
mopidy --config /etc/mopidy/mopidy.conf \
>/dev/null 2>&1
diff --git a/srcpkgs/mosquitto/files/mosquitto/run b/srcpkgs/mosquitto/files/mosquitto/run
index a33891408325..3a8ac97289a7 100644
--- a/srcpkgs/mosquitto/files/mosquitto/run
+++ b/srcpkgs/mosquitto/files/mosquitto/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
cd /var/lib/mosquitto
exec chpst -u _mosquitto:_mosquitto mosquitto -c /etc/mosquitto/mosquitto.conf
diff --git a/srcpkgs/mouseemu/files/mouseemu/run b/srcpkgs/mouseemu/files/mouseemu/run
index 1ce7c17df5ea..c35e3dafba57 100644
--- a/srcpkgs/mouseemu/files/mouseemu/run
+++ b/srcpkgs/mouseemu/files/mouseemu/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec mouseemu -nofork $MID_CLICK $RIGHT_CLICK $SCROLL $TYPING_BLOCK
diff --git a/srcpkgs/mpDris2/files/mpDris2/run b/srcpkgs/mpDris2/files/mpDris2/run
index a3cbb12868b9..2e2b4fef37d7 100644
--- a/srcpkgs/mpDris2/files/mpDris2/run
+++ b/srcpkgs/mpDris2/files/mpDris2/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mpDris2
\ No newline at end of file
diff --git a/srcpkgs/mpd/files/mpd/run b/srcpkgs/mpd/files/mpd/run
index bb7832c9e235..bc002d4f8507 100755
--- a/srcpkgs/mpd/files/mpd/run
+++ b/srcpkgs/mpd/files/mpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m 0755 -o mpd -g mpd /run/mpd
exec mpd --no-daemon ${OPTS:-}
diff --git a/srcpkgs/mpdscribble/files/mpdscribble/run b/srcpkgs/mpdscribble/files/mpdscribble/run
index 7a4243113078..29cceefca2bb 100755
--- a/srcpkgs/mpdscribble/files/mpdscribble/run
+++ b/srcpkgs/mpdscribble/files/mpdscribble/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec mpdscribble --no-daemon
diff --git a/srcpkgs/munge/files/munge/run b/srcpkgs/munge/files/munge/run
index 9c773ca00578..4626b3ddc2ad 100644
--- a/srcpkgs/munge/files/munge/run
+++ b/srcpkgs/munge/files/munge/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -d /var/run/munge ]; then
mkdir -m0755 -p /var/run/munge
fi
diff --git a/srcpkgs/musl-nscd/files/nscd/run b/srcpkgs/musl-nscd/files/nscd/run
index e9ea04a19e97..53127524af2b 100755
--- a/srcpkgs/musl-nscd/files/nscd/run
+++ b/srcpkgs/musl-nscd/files/nscd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
mkdir -p /var/run/nscd /var/db/nscd
exec nscd -F ${OPTS} >/dev/null
diff --git a/srcpkgs/nbd/files/nbd/run b/srcpkgs/nbd/files/nbd/run
index e4179d3e861d..ba721e5ea19b 100644
--- a/srcpkgs/nbd/files/nbd/run
+++ b/srcpkgs/nbd/files/nbd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nbd-server -d 2>&1
diff --git a/srcpkgs/ndhc/files/ndhc/run b/srcpkgs/ndhc/files/ndhc/run
index 93a73882002f..7302ad0b9275 100755
--- a/srcpkgs/ndhc/files/ndhc/run
+++ b/srcpkgs/ndhc/files/ndhc/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec ndhc -R /etc/resolv.conf -u ndhc -U ndhc -D ndhc -C /var/lib/ndhc/jail -s /var/lib/ndhc/state ${OPTS:=-i eth0} 2>&1
diff --git a/srcpkgs/ndppd/files/ndppd/run b/srcpkgs/ndppd/files/ndppd/run
index 6c36352ecd37..2fcc394d3bec 100755
--- a/srcpkgs/ndppd/files/ndppd/run
+++ b/srcpkgs/ndppd/files/ndppd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec ndppd -v
diff --git a/srcpkgs/neard/files/neard/run b/srcpkgs/neard/files/neard/run
index e26e7c0279c1..c1e1562afc2d 100644
--- a/srcpkgs/neard/files/neard/run
+++ b/srcpkgs/neard/files/neard/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
[ -r conf ] && . ./conf
exec /usr/libexec/nfc/neard --nodaemon ${OPTS}
diff --git a/srcpkgs/neard/files/seeld/run b/srcpkgs/neard/files/seeld/run
index 22790b957346..5c6a37eff096 100644
--- a/srcpkgs/neard/files/seeld/run
+++ b/srcpkgs/neard/files/seeld/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
[ -r conf ] && . ./conf
exec /usr/libexec/nfc/seeld --nodaemon ${OPTS}
diff --git a/srcpkgs/net-snmp/files/snmpd/run b/srcpkgs/net-snmp/files/snmpd/run
index bcb7b2004baa..13fafd7f2d89 100755
--- a/srcpkgs/net-snmp/files/snmpd/run
+++ b/srcpkgs/net-snmp/files/snmpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec snmpd -f -Lo $OPTS
diff --git a/srcpkgs/netdata/files/netdata/run b/srcpkgs/netdata/files/netdata/run
index a4c76948b16c..21bf679cf574 100644
--- a/srcpkgs/netdata/files/netdata/run
+++ b/srcpkgs/netdata/files/netdata/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _netdata:_netdata netdata -D
diff --git a/srcpkgs/network-ups-tools/files/upsd/run b/srcpkgs/network-ups-tools/files/upsd/run
index 53d9ba24a605..5a97d7e27c04 100755
--- a/srcpkgs/network-ups-tools/files/upsd/run
+++ b/srcpkgs/network-ups-tools/files/upsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - information server
# upsd will run in the foreground and prints information on stdout
install -d -m 0770 -o nut -g nut /run/ups
diff --git a/srcpkgs/network-ups-tools/files/upsdrvctl/run b/srcpkgs/network-ups-tools/files/upsdrvctl/run
index aab0bcc121fa..343c516e8ffa 100755
--- a/srcpkgs/network-ups-tools/files/upsdrvctl/run
+++ b/srcpkgs/network-ups-tools/files/upsdrvctl/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - driver controller
install -d -m 0770 -o nut -g nut /run/ups
upsdrvctl -D start
diff --git a/srcpkgs/network-ups-tools/files/upsmon/run b/srcpkgs/network-ups-tools/files/upsmon/run
index 714030cae547..b83cc7f335cf 100755
--- a/srcpkgs/network-ups-tools/files/upsmon/run
+++ b/srcpkgs/network-ups-tools/files/upsmon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Network UPS Tools - monitor and shutdown controller
# upsmon will run in the foreground and prints information on stdout
exec upsmon -D
diff --git a/srcpkgs/nfs-utils/files/nfs-server/run b/srcpkgs/nfs-utils/files/nfs-server/run
index 74ce0477fb75..b7ed2aa45fdf 100755
--- a/srcpkgs/nfs-utils/files/nfs-server/run
+++ b/srcpkgs/nfs-utils/files/nfs-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the statd service is running.
sv check statd >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcblkmapd/run b/srcpkgs/nfs-utils/files/rpcblkmapd/run
index 2acd9074ac80..269e72f9323e 100755
--- a/srcpkgs/nfs-utils/files/rpcblkmapd/run
+++ b/srcpkgs/nfs-utils/files/rpcblkmapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcgssd/run b/srcpkgs/nfs-utils/files/rpcgssd/run
index 439406037c25..1bd5c98a4a35 100755
--- a/srcpkgs/nfs-utils/files/rpcgssd/run
+++ b/srcpkgs/nfs-utils/files/rpcgssd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcidmapd/run b/srcpkgs/nfs-utils/files/rpcidmapd/run
index 5f75973d1439..f683b7a1ffac 100755
--- a/srcpkgs/nfs-utils/files/rpcidmapd/run
+++ b/srcpkgs/nfs-utils/files/rpcidmapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/rpcsvcgssd/run b/srcpkgs/nfs-utils/files/rpcsvcgssd/run
index c751c60d051d..92be0858a7af 100755
--- a/srcpkgs/nfs-utils/files/rpcsvcgssd/run
+++ b/srcpkgs/nfs-utils/files/rpcsvcgssd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nfs-utils/files/statd/run b/srcpkgs/nfs-utils/files/statd/run
index 66900a3b4d9f..e2abb38aed87 100755
--- a/srcpkgs/nfs-utils/files/statd/run
+++ b/srcpkgs/nfs-utils/files/statd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Make sure the portmap service is running.
sv check rpcbind >/dev/null || exit 1
diff --git a/srcpkgs/nftables/files/nftables/run b/srcpkgs/nftables/files/nftables/run
index c8425d3753e3..fd385435a791 100644
--- a/srcpkgs/nftables/files/nftables/run
+++ b/srcpkgs/nftables/files/nftables/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -r /etc/nftables.conf ] && exit 0
nft -f /etc/nftables.conf
exec chpst -b nftables pause
diff --git a/srcpkgs/ngetty/files/ngetty/run b/srcpkgs/ngetty/files/ngetty/run
index c68e80737f30..e8fa81e6ff50 100755
--- a/srcpkgs/ngetty/files/ngetty/run
+++ b/srcpkgs/ngetty/files/ngetty/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export TERM=linux
[ -r conf ] && . ./conf
exec ngetty ${OPTS:=tty1 tty2 tty3 tty4 tty5 tty6}
diff --git a/srcpkgs/nginx/files/nginx/run b/srcpkgs/nginx/files/nginx/run
index 05e9182e4f79..60a3d2e30ca9 100755
--- a/srcpkgs/nginx/files/nginx/run
+++ b/srcpkgs/nginx/files/nginx/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nginx -g 'daemon off;'
diff --git a/srcpkgs/ngircd/files/ngircd/run b/srcpkgs/ngircd/files/ngircd/run
index 253a0cdd3e72..19e4b8425294 100755
--- a/srcpkgs/ngircd/files/ngircd/run
+++ b/srcpkgs/ngircd/files/ngircd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ngircd -n
diff --git a/srcpkgs/nix/files/nix-daemon/run b/srcpkgs/nix/files/nix-daemon/run
index 4c277b2113ce..052cf9d45a8d 100644
--- a/srcpkgs/nix/files/nix-daemon/run
+++ b/srcpkgs/nix/files/nix-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nix-daemon
diff --git a/srcpkgs/node_exporter/files/node_exporter/run b/srcpkgs/node_exporter/files/node_exporter/run
index add864b742a2..5e06fc33bbe9 100755
--- a/srcpkgs/node_exporter/files/node_exporter/run
+++ b/srcpkgs/node_exporter/files/node_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Add $ARGS for more arguments to node_exporter
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/nodm/files/nodm/run b/srcpkgs/nodm/files/nodm/run
index d43bfc7689bd..065c0208dfb7 100644
--- a/srcpkgs/nodm/files/nodm/run
+++ b/srcpkgs/nodm/files/nodm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
export NODM_USER NODM_X_OPTIONS NODM_MIN_SESSION_TIME NODM_XSESSION
exec nodm 1>&2
diff --git a/srcpkgs/noip2/files/noip2/run b/srcpkgs/noip2/files/noip2/run
index 1ae24f2a5686..6f4adc8cbd25 100755
--- a/srcpkgs/noip2/files/noip2/run
+++ b/srcpkgs/noip2/files/noip2/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec noip2 -f
diff --git a/srcpkgs/nrpe/files/nrpe/run b/srcpkgs/nrpe/files/nrpe/run
index 72612cf68aaf..704b91a68631 100644
--- a/srcpkgs/nrpe/files/nrpe/run
+++ b/srcpkgs/nrpe/files/nrpe/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nrpe --no-forking --config=/etc/nagios/nrpe.cfg 2>&1
diff --git a/srcpkgs/nsd/files/nsd/run b/srcpkgs/nsd/files/nsd/run
index a4c8172a7972..abfea3728fd3 100755
--- a/srcpkgs/nsd/files/nsd/run
+++ b/srcpkgs/nsd/files/nsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m 0755 -o nsd -g nsd /run/nsd
exec nsd -d 2>/dev/null
diff --git a/srcpkgs/nss-pam-ldapd/files/nslcd/run b/srcpkgs/nss-pam-ldapd/files/nslcd/run
index f3fdc75a7e0f..c17fecb4e4af 100755
--- a/srcpkgs/nss-pam-ldapd/files/nslcd/run
+++ b/srcpkgs/nss-pam-ldapd/files/nslcd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/nslcd
chown nslcd:nslcd /var/run/nslcd
exec chpst -u nslcd:nslcd nslcd -n
diff --git a/srcpkgs/ntp/files/isc-ntpd/run b/srcpkgs/ntp/files/isc-ntpd/run
index 84db62b851d7..62be4031a8d5 100755
--- a/srcpkgs/ntp/files/isc-ntpd/run
+++ b/srcpkgs/ntp/files/isc-ntpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec isc-ntpd -g -u ntpd:ntpd -n >/dev/null 2>&1
diff --git a/srcpkgs/nullmailer/files/nullmailer/run b/srcpkgs/nullmailer/files/nullmailer/run
index 2c3bc8aea0cc..9b893b27ba38 100644
--- a/srcpkgs/nullmailer/files/nullmailer/run
+++ b/srcpkgs/nullmailer/files/nullmailer/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _nullmail nullmailer-send 2>&1
diff --git a/srcpkgs/nvidia/files/nvidia-powerd/run b/srcpkgs/nvidia/files/nvidia-powerd/run
index 8fe7540cce5e..caffb87562e2 100644
--- a/srcpkgs/nvidia/files/nvidia-powerd/run
+++ b/srcpkgs/nvidia/files/nvidia-powerd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/nvidia-powerd
diff --git a/srcpkgs/nxt/files/nxt-tor/run b/srcpkgs/nxt/files/nxt-tor/run
index 7f4032c1bd56..c14f448c4950 100644
--- a/srcpkgs/nxt/files/nxt-tor/run
+++ b/srcpkgs/nxt/files/nxt-tor/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check tor >/dev/null || exit 1
exec nxt-tor > /dev/null
diff --git a/srcpkgs/nxt/files/nxt/run b/srcpkgs/nxt/files/nxt/run
index 2ffc87eaf557..a3479cc97b11 100644
--- a/srcpkgs/nxt/files/nxt/run
+++ b/srcpkgs/nxt/files/nxt/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec nxt > /dev/null
diff --git a/srcpkgs/odroid-u2-base/files/odroid-led/run b/srcpkgs/odroid-u2-base/files/odroid-led/run
index a1ecf5f2b23d..0cea18182b7d 100755
--- a/srcpkgs/odroid-u2-base/files/odroid-led/run
+++ b/srcpkgs/odroid-u2-base/files/odroid-led/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
odroid-led
exec chpst -b odroid-led pause
diff --git a/srcpkgs/ofono/files/ofonod/run b/srcpkgs/ofono/files/ofonod/run
index 6bee7b3120c2..22352555a79d 100644
--- a/srcpkgs/ofono/files/ofonod/run
+++ b/srcpkgs/ofono/files/ofonod/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ofonod -n
diff --git a/srcpkgs/oidentd/files/oidentd/run b/srcpkgs/oidentd/files/oidentd/run
index 3d816c5ebfde..71e3d01b68fa 100644
--- a/srcpkgs/oidentd/files/oidentd/run
+++ b/srcpkgs/oidentd/files/oidentd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec oidentd -i ${OPTS:=-u nobody -g nogroup}
diff --git a/srcpkgs/olsrd/files/olsrd/run b/srcpkgs/olsrd/files/olsrd/run
index 098fa489691f..b769fb94bf59 100755
--- a/srcpkgs/olsrd/files/olsrd/run
+++ b/srcpkgs/olsrd/files/olsrd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec olsrd -nofork -f /etc/olsrd.conf
diff --git a/srcpkgs/open-vm-tools/files/vmtoolsd/run b/srcpkgs/open-vm-tools/files/vmtoolsd/run
index 302a6314bc33..59a49c394220 100644
--- a/srcpkgs/open-vm-tools/files/vmtoolsd/run
+++ b/srcpkgs/open-vm-tools/files/vmtoolsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
index b0a5cc121b90..2a4cb82fe3eb 100644
--- a/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
+++ b/srcpkgs/open-vm-tools/files/vmware-vmblock-fuse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
diff --git a/srcpkgs/opendkim/files/opendkim/run b/srcpkgs/opendkim/files/opendkim/run
index 644eaac43a88..3c875f777b5e 100644
--- a/srcpkgs/opendkim/files/opendkim/run
+++ b/srcpkgs/opendkim/files/opendkim/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec opendkim -f ${OPTS}
diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index 864c0eb418fa..1751437488e6 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec openntpd -d ${OPTS} 2>&1
diff --git a/srcpkgs/openrgb/files/openrgb/run b/srcpkgs/openrgb/files/openrgb/run
index 6bbee3483bd2..ee3712b755cc 100644
--- a/srcpkgs/openrgb/files/openrgb/run
+++ b/srcpkgs/openrgb/files/openrgb/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec openrgb --server 2>&1
diff --git a/srcpkgs/opensmtpd/files/opensmtpd/run b/srcpkgs/opensmtpd/files/opensmtpd/run
index 68ecaeadebcf..3f67c4e01566 100755
--- a/srcpkgs/opensmtpd/files/opensmtpd/run
+++ b/srcpkgs/opensmtpd/files/opensmtpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec smtpd -F 2>&1
diff --git a/srcpkgs/openssh/files/sshd/run b/srcpkgs/openssh/files/sshd/run
index b5e744a6fa85..a3594373b6d6 100755
--- a/srcpkgs/openssh/files/sshd/run
+++ b/srcpkgs/openssh/files/sshd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ssh-keygen -A >/dev/null 2>&1 # Will generate host keys if they don't already exist
[ -r conf ] && . ./conf
exec /usr/bin/sshd -D $OPTS
diff --git a/srcpkgs/openvswitch/files/ovs-vswitchd/run b/srcpkgs/openvswitch/files/ovs-vswitchd/run
index a0a6c98f997f..499795d53afd 100755
--- a/srcpkgs/openvswitch/files/ovs-vswitchd/run
+++ b/srcpkgs/openvswitch/files/ovs-vswitchd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe -q openvswitch || exit 1
sv check ovsdb-server >/dev/null || exit 1
install -d /run/openvswitch
diff --git a/srcpkgs/openvswitch/files/ovsdb-server/run b/srcpkgs/openvswitch/files/ovsdb-server/run
index 36528368a4d0..cf8947a8578b 100755
--- a/srcpkgs/openvswitch/files/ovsdb-server/run
+++ b/srcpkgs/openvswitch/files/ovsdb-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ ! -f /etc/openvswitch/conf.db ]; then
install -d /etc/openvswitch
ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema || exit 1
diff --git a/srcpkgs/parpd/files/parpd/run b/srcpkgs/parpd/files/parpd/run
index 029dfdac68dd..e5b5c3373648 100644
--- a/srcpkgs/parpd/files/parpd/run
+++ b/srcpkgs/parpd/files/parpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec parpd ${OPTS:=-fl} 1>&2
diff --git a/srcpkgs/parprouted/files/parprouted/run b/srcpkgs/parprouted/files/parprouted/run
index 0029ad4590d0..2d835aef20a8 100644
--- a/srcpkgs/parprouted/files/parprouted/run
+++ b/srcpkgs/parprouted/files/parprouted/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec parprouted ${OPTS}
diff --git a/srcpkgs/pbbuttonsd/files/pbbuttonsd/run b/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
index 7acfdb354bb2..1dfcb9944494 100644
--- a/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
+++ b/srcpkgs/pbbuttonsd/files/pbbuttonsd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec pbbuttonsd --configfile=${CONF:=/etc/pbbuttonsd.cnf} ${OPTS}
diff --git a/srcpkgs/pcsclite/files/pcscd/run b/srcpkgs/pcsclite/files/pcscd/run
index 99c662d6ebf2..6ae35a3c76ab 100755
--- a/srcpkgs/pcsclite/files/pcscd/run
+++ b/srcpkgs/pcsclite/files/pcscd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec pcscd -f
diff --git a/srcpkgs/pd-mapper/files/pd-mapper/run b/srcpkgs/pd-mapper/files/pd-mapper/run
index b641f486507f..a0999e86c354 100644
--- a/srcpkgs/pd-mapper/files/pd-mapper/run
+++ b/srcpkgs/pd-mapper/files/pd-mapper/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec pd-mapper $OPTS
diff --git a/srcpkgs/php/files/php-fpm/run b/srcpkgs/php/files/php-fpm/run
index c9c75b0498aa..98c6bdd9411d 100755
--- a/srcpkgs/php/files/php-fpm/run
+++ b/srcpkgs/php/files/php-fpm/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec php-fpm --nodaemonize
diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run
index f1c712335ab8..9d61e0035983 100755
--- a/srcpkgs/php8.0/files/php-fpm8.0/run
+++ b/srcpkgs/php8.0/files/php-fpm8.0/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec php-fpm8.0 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run
index 5928ea5103ef..ddc4298cece4 100755
--- a/srcpkgs/php8.1/files/php-fpm8.1/run
+++ b/srcpkgs/php8.1/files/php-fpm8.1/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec php-fpm8.1 --nodaemonize ${OPTS}
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
index ea0520e44cd2..6eb172b8b19f 100644
--- a/srcpkgs/pipewire/files/pipewire-pulse/run
+++ b/srcpkgs/pipewire/files/pipewire-pulse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# this service is experimental and most setups should start pipewire as a user,
# for further information, please refer to the handbook
! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
index 9cd2c21f53d0..a201626e464d 100644
--- a/srcpkgs/pipewire/files/pipewire/run
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# this service is experimental and most setups should start pipewire as a user,
# for further information, please refer to the handbook
! [ -d /run/pipewire ] && install -m 755 -g _pipewire -o _pipewire -d /run/pipewire
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
index 3125a4f89ed9..8a3a5623b5eb 100755
--- a/srcpkgs/podman/files/podman-docker/run
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ln -sf /run/podman/podman.sock /run/docker.sock
exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
index 8eb8f41752e4..6e0ba966badb 100755
--- a/srcpkgs/podman/files/podman/run
+++ b/srcpkgs/podman/files/podman/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/polipo/files/polipo/run b/srcpkgs/polipo/files/polipo/run
index 2380d40ebf14..64ce07ee6083 100755
--- a/srcpkgs/polipo/files/polipo/run
+++ b/srcpkgs/polipo/files/polipo/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u nobody polipo
diff --git a/srcpkgs/polkit/files/polkitd/run b/srcpkgs/polkit/files/polkitd/run
index c175cba6f95b..9d69121096eb 100644
--- a/srcpkgs/polkit/files/polkitd/run
+++ b/srcpkgs/polkit/files/polkitd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/lib/polkit-1/polkitd --no-debug
diff --git a/srcpkgs/postfix/files/postfix/run b/srcpkgs/postfix/files/postfix/run
index 38688bb5f46b..a0f0db57742d 100755
--- a/srcpkgs/postfix/files/postfix/run
+++ b/srcpkgs/postfix/files/postfix/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
postfix check || exit 1
exec /usr/libexec/postfix/master -d
diff --git a/srcpkgs/postgresql14/files/postgresql14/run b/srcpkgs/postgresql14/files/postgresql14/run
index 3aee9440e847..1da79920625d 100755
--- a/srcpkgs/postgresql14/files/postgresql14/run
+++ b/srcpkgs/postgresql14/files/postgresql14/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/psql@VERSION@/default/postgresql
: ${PGDATA:="$PGROOT/data"}
diff --git a/srcpkgs/postgresql15/files/postgresql15/run b/srcpkgs/postgresql15/files/postgresql15/run
index 3aee9440e847..1da79920625d 100755
--- a/srcpkgs/postgresql15/files/postgresql15/run
+++ b/srcpkgs/postgresql15/files/postgresql15/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
. /etc/psql@VERSION@/default/postgresql
: ${PGDATA:="$PGROOT/data"}
diff --git a/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
index d34cc6b20a29..c5dc3f90c28a 100644
--- a/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
+++ b/srcpkgs/power-profiles-daemon/files/power-profiles-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/power-profiles-daemon
diff --git a/srcpkgs/privoxy/files/privoxy/run b/srcpkgs/privoxy/files/privoxy/run
index 120ca2ad62b6..e656efaaec5a 100755
--- a/srcpkgs/privoxy/files/privoxy/run
+++ b/srcpkgs/privoxy/files/privoxy/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u privoxy:privoxy privoxy --no-daemon /etc/privoxy/config 2>&1
diff --git a/srcpkgs/prometheus/files/prometheus/run b/srcpkgs/prometheus/files/prometheus/run
index 8311d78552f1..1d72db840ff3 100755
--- a/srcpkgs/prometheus/files/prometheus/run
+++ b/srcpkgs/prometheus/files/prometheus/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -f ./conf ] && . ./conf
diff --git a/srcpkgs/prosody/files/prosody/run b/srcpkgs/prosody/files/prosody/run
index 2173db0113a4..e302e315d867 100644
--- a/srcpkgs/prosody/files/prosody/run
+++ b/srcpkgs/prosody/files/prosody/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
mkdir -p /run/prosody
chown prosody:prosody /run/prosody
exec chpst -u prosody:prosody prosody
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
index afbf4517ecb2..16cbde6922a4 100644
--- a/srcpkgs/pulseaudio/files/pulseaudio/run
+++ b/srcpkgs/pulseaudio/files/pulseaudio/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec pulseaudio --system
diff --git a/srcpkgs/qemu/files/qemu-ga/run b/srcpkgs/qemu/files/qemu-ga/run
index 4db20bf91c10..8ba5ef665e62 100755
--- a/srcpkgs/qemu/files/qemu-ga/run
+++ b/srcpkgs/qemu/files/qemu-ga/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec qemu-ga ${OPTS}
diff --git a/srcpkgs/qrtr-ns/files/qrtr-ns/run b/srcpkgs/qrtr-ns/files/qrtr-ns/run
index 7ce1340960cf..adb7ecb718c5 100644
--- a/srcpkgs/qrtr-ns/files/qrtr-ns/run
+++ b/srcpkgs/qrtr-ns/files/qrtr-ns/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${OPTS:=-f 1}
exec qrtr-ns $OPTS
diff --git a/srcpkgs/quassel/files/quasselcore/run b/srcpkgs/quassel/files/quasselcore/run
index f30e57eef930..b467f3e7f3b9 100644
--- a/srcpkgs/quassel/files/quasselcore/run
+++ b/srcpkgs/quassel/files/quasselcore/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u quassel quasselcore \
${OPTS:=--require-ssl --configdir=/var/lib/quassel --logfile=/var/log/quassel/quasselcore.log}
diff --git a/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run b/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
index 893de235871e..1a278cdfa603 100755
--- a/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
+++ b/srcpkgs/radeon-profile-daemon/files/radeon-profile-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec radeon-profile-daemon
diff --git a/srcpkgs/radvd/files/radvd/run b/srcpkgs/radvd/files/radvd/run
index 6ab3d099cfcb..d8d528b96bb8 100755
--- a/srcpkgs/radvd/files/radvd/run
+++ b/srcpkgs/radvd/files/radvd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec radvd --nodaemon --logmethod=syslog
diff --git a/srcpkgs/redis/files/redis/run b/srcpkgs/redis/files/redis/run
index 9ce7366eb70f..71811fafe274 100644
--- a/srcpkgs/redis/files/redis/run
+++ b/srcpkgs/redis/files/redis/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o redis -g redis /run/redis
exec chpst -u redis:redis redis-server /etc/redis/redis.conf > /dev/null
diff --git a/srcpkgs/rest-server/files/rest-server/run b/srcpkgs/rest-server/files/rest-server/run
index 2a78f5b0bcd1..251a52fde62b 100644
--- a/srcpkgs/rest-server/files/rest-server/run
+++ b/srcpkgs/rest-server/files/rest-server/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
. /etc/default/rest-server
exec chpst -u _restserver:_restserver rest-server --path $DATA_DIRECTORY $OPTIONS
diff --git a/srcpkgs/rmilter/files/rmilter/run b/srcpkgs/rmilter/files/rmilter/run
index 0cc86694d91a..ca901effb2e5 100755
--- a/srcpkgs/rmilter/files/rmilter/run
+++ b/srcpkgs/rmilter/files/rmilter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${RMILTERUSER:=rmilter}
: ${RMILTERGROUP:=rmilter}
diff --git a/srcpkgs/rmtfs/files/rmtfs/run b/srcpkgs/rmtfs/files/rmtfs/run
index b3e939935e36..a84d5097a23c 100644
--- a/srcpkgs/rmtfs/files/rmtfs/run
+++ b/srcpkgs/rmtfs/files/rmtfs/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${OPTS:=-r -P -s}
exec rmtfs $OPTS
diff --git a/srcpkgs/rng-tools/files/rngd/run b/srcpkgs/rng-tools/files/rngd/run
index dbccf991524a..9595d0341815 100644
--- a/srcpkgs/rng-tools/files/rngd/run
+++ b/srcpkgs/rng-tools/files/rngd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
RNGD_OPTS=""
[ -r conf ] && . ./conf
diff --git a/srcpkgs/routinator/files/routinator/run b/srcpkgs/routinator/files/routinator/run
index bbc2c493935e..6b0a70ea20cb 100755
--- a/srcpkgs/routinator/files/routinator/run
+++ b/srcpkgs/routinator/files/routinator/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec routinator --config ${CONF_FILE:-/etc/routinator/routinator.conf} server --user=_routinator --group=_routinator $OPTS 2>&1
diff --git a/srcpkgs/rpcbind/files/rpcbind/run b/srcpkgs/rpcbind/files/rpcbind/run
index 65fab4dec968..81a0b3546fba 100755
--- a/srcpkgs/rpcbind/files/rpcbind/run
+++ b/srcpkgs/rpcbind/files/rpcbind/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec rpcbind -f
diff --git a/srcpkgs/rspamd/files/rspamd/run b/srcpkgs/rspamd/files/rspamd/run
index eba167ab713a..592faf0e1b55 100755
--- a/srcpkgs/rspamd/files/rspamd/run
+++ b/srcpkgs/rspamd/files/rspamd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
: ${RSPAMDUSER:=rspamd}
: ${RSPAMDGROUP:=rspamd}
diff --git a/srcpkgs/rsync/files/rsyncd/run b/srcpkgs/rsync/files/rsyncd/run
index 5a7d49576d54..69a101f2346c 100644
--- a/srcpkgs/rsync/files/rsyncd/run
+++ b/srcpkgs/rsync/files/rsyncd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ ! -e /etc/rsyncd.conf ] && exit 1
exec rsync --daemon --no-detach
diff --git a/srcpkgs/rsyslog/files/rsyslogd/run b/srcpkgs/rsyslog/files/rsyslogd/run
index 30d94a83f174..b94722eaed81 100755
--- a/srcpkgs/rsyslog/files/rsyslogd/run
+++ b/srcpkgs/rsyslog/files/rsyslogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec rsyslogd -n
diff --git a/srcpkgs/rtkit/files/rtkit/run b/srcpkgs/rtkit/files/rtkit/run
index 1fe14134187f..b5418e9c563f 100644
--- a/srcpkgs/rtkit/files/rtkit/run
+++ b/srcpkgs/rtkit/files/rtkit/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/libexec/rtkit-daemon
diff --git a/srcpkgs/salt/files/salt-api/run b/srcpkgs/salt/files/salt-api/run
index 0748970d6a48..0a8ced51bb2b 100755
--- a/srcpkgs/salt/files/salt-api/run
+++ b/srcpkgs/salt/files/salt-api/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-api
diff --git a/srcpkgs/salt/files/salt-master/run b/srcpkgs/salt/files/salt-master/run
index 928cc01797c3..64411f2c330a 100755
--- a/srcpkgs/salt/files/salt-master/run
+++ b/srcpkgs/salt/files/salt-master/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-master
diff --git a/srcpkgs/salt/files/salt-minion/run b/srcpkgs/salt/files/salt-minion/run
index e9b71afc37d3..fd923cb2be0c 100755
--- a/srcpkgs/salt/files/salt-minion/run
+++ b/srcpkgs/salt/files/salt-minion/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-minion
diff --git a/srcpkgs/salt/files/salt-syndic/run b/srcpkgs/salt/files/salt-syndic/run
index 80950effa664..6c2dc7be432a 100755
--- a/srcpkgs/salt/files/salt-syndic/run
+++ b/srcpkgs/salt/files/salt-syndic/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec salt-syndic
diff --git a/srcpkgs/samba/files/ctdbd/run b/srcpkgs/samba/files/ctdbd/run
index f93d43eb8625..2f57f789c5b3 100644
--- a/srcpkgs/samba/files/ctdbd/run
+++ b/srcpkgs/samba/files/ctdbd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ctdbd -i
diff --git a/srcpkgs/sane/files/saned/run b/srcpkgs/sane/files/saned/run
index 18016ad066c4..61d1060f02c1 100644
--- a/srcpkgs/sane/files/saned/run
+++ b/srcpkgs/sane/files/saned/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec saned -l -u _saned ${OPTS}
diff --git a/srcpkgs/scron/files/scron/run b/srcpkgs/scron/files/scron/run
index cbfe72951a8e..428d84713de8 100755
--- a/srcpkgs/scron/files/scron/run
+++ b/srcpkgs/scron/files/scron/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec scrond -n 2>&1
diff --git a/srcpkgs/sddm/files/sddm/run b/srcpkgs/sddm/files/sddm/run
index 0ac2a2a4545e..3a5dc6ca58cc 100644
--- a/srcpkgs/sddm/files/sddm/run
+++ b/srcpkgs/sddm/files/sddm/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
sv check dbus >/dev/null || exit 1
diff --git a/srcpkgs/seatd/files/seatd/run b/srcpkgs/seatd/files/seatd/run
index a7cf1b48a364..0b82b4c3d90a 100644
--- a/srcpkgs/seatd/files/seatd/run
+++ b/srcpkgs/seatd/files/seatd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/seatd -g _seatd
diff --git a/srcpkgs/sftpgo/files/sftpgo/run b/srcpkgs/sftpgo/files/sftpgo/run
index f35ca0281a55..d63f66a22082 100755
--- a/srcpkgs/sftpgo/files/sftpgo/run
+++ b/srcpkgs/sftpgo/files/sftpgo/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export SFTPGO_HTTPD__TEMPLATES_PATH=/usr/share/sftpgo/templates
export SFTPGO_HTTPD__STATIC_FILES_PATH=/usr/share/sftpgo/static
diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
index 846ca47cf976..598b92a2da69 100755
--- a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
+++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-client/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u shadowsocks:shadowsocks ss-local -c /etc/shadowsocks-libev/config.json 1>/dev/null
diff --git a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
index 0fd1074671c1..671538434cc8 100755
--- a/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
+++ b/srcpkgs/shadowsocks-libev/files/shadowsocks-libev-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u shadowsocks:shadowsocks ss-server -c /etc/shadowsocks-libev/config.json 1>/dev/null
diff --git a/srcpkgs/shinit/files/shinit/run b/srcpkgs/shinit/files/shinit/run
index f51d6a9e2caf..457a241c2397 100644
--- a/srcpkgs/shinit/files/shinit/run
+++ b/srcpkgs/shinit/files/shinit/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
export SHINIT_USER=void
diff --git a/srcpkgs/shiori/files/shiori/run b/srcpkgs/shiori/files/shiori/run
index 0cd56601f58d..5178f99d65c4 100644
--- a/srcpkgs/shiori/files/shiori/run
+++ b/srcpkgs/shiori/files/shiori/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _shiori shiori serve ${OPTS="--address 127.0.0.1 --port 8080"}
diff --git a/srcpkgs/shorewall/files/shorewall/run b/srcpkgs/shorewall/files/shorewall/run
index 751bf5b76b8c..99473fc38a0d 100755
--- a/srcpkgs/shorewall/files/shorewall/run
+++ b/srcpkgs/shorewall/files/shorewall/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
shorewall start
exec chpst -b shorewall pause
diff --git a/srcpkgs/shorewall/files/shorewall6/run b/srcpkgs/shorewall/files/shorewall6/run
index 8c44bbb49db2..254cba9520b5 100755
--- a/srcpkgs/shorewall/files/shorewall6/run
+++ b/srcpkgs/shorewall/files/shorewall6/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
shorewall6 start
exec chpst -b shorewall6 pause
diff --git a/srcpkgs/slim/files/slim/run b/srcpkgs/slim/files/slim/run
index 765580b17635..ba62756fcc75 100755
--- a/srcpkgs/slim/files/slim/run
+++ b/srcpkgs/slim/files/slim/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec slim -nodaemon
diff --git a/srcpkgs/smartmontools/files/smartd/run b/srcpkgs/smartmontools/files/smartd/run
index 1dc3cc9966a9..e4f00accbd77 100755
--- a/srcpkgs/smartmontools/files/smartd/run
+++ b/srcpkgs/smartmontools/files/smartd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec smartd -n
diff --git a/srcpkgs/smcroute/files/smcrouted/run b/srcpkgs/smcroute/files/smcrouted/run
index 4fdbc56773ff..7a8a6f993cab 100755
--- a/srcpkgs/smcroute/files/smcrouted/run
+++ b/srcpkgs/smcroute/files/smcrouted/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/snapcast/files/snapclient/run b/srcpkgs/snapcast/files/snapclient/run
index d39016efd43b..c5b48ce2f399 100644
--- a/srcpkgs/snapcast/files/snapclient/run
+++ b/srcpkgs/snapcast/files/snapclient/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _snapclient:audio snapclient ${OPTS} 2>&1
diff --git a/srcpkgs/snapcast/files/snapserver/run b/srcpkgs/snapcast/files/snapserver/run
index 638817b15397..cf492f7f9bda 100644
--- a/srcpkgs/snapcast/files/snapserver/run
+++ b/srcpkgs/snapcast/files/snapserver/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _snapserver snapserver ${OPTS} 2>&1
diff --git a/srcpkgs/snapper/files/snapperd/run b/srcpkgs/snapper/files/snapperd/run
index 34e9216df98b..4a1e86638e55 100755
--- a/srcpkgs/snapper/files/snapperd/run
+++ b/srcpkgs/snapper/files/snapperd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec snapperd
diff --git a/srcpkgs/sndio/files/sndiod/run b/srcpkgs/sndio/files/sndiod/run
index 8b4bb8dc0047..622d532a2a57 100755
--- a/srcpkgs/sndio/files/sndiod/run
+++ b/srcpkgs/sndio/files/sndiod/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec sndiod ${OPTS} -d 2>&1
diff --git a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
index fd750fe9a45e..5c7329f4b967 100644
--- a/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
+++ b/srcpkgs/socklog-ucspi/files/socklog-ucspi-tcp/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/spamassassin/files/spamd/run b/srcpkgs/spamassassin/files/spamd/run
index 35bc03d30f68..1c3521bdb24a 100755
--- a/srcpkgs/spamassassin/files/spamd/run
+++ b/srcpkgs/spamassassin/files/spamd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -d /var/lib/spamassassin ] || sa-update
exec spamd ${OPTS}
diff --git a/srcpkgs/spampd/files/spampd/run b/srcpkgs/spampd/files/spampd/run
index 7c19ace4ea96..35cc5a0fb626 100755
--- a/srcpkgs/spampd/files/spampd/run
+++ b/srcpkgs/spampd/files/spampd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec spampd --nodetach ${OPTS:=--host=127.0.0.1:10025 --relayhost=127.0.0.1:10026 --a --rh --u=_spampd --g=_spampd --maxsize=512}
diff --git a/srcpkgs/spice-vdagent/files/spice-vdagentd/run b/srcpkgs/spice-vdagent/files/spice-vdagentd/run
index 97f1150565dd..6139df344260 100755
--- a/srcpkgs/spice-vdagent/files/spice-vdagentd/run
+++ b/srcpkgs/spice-vdagent/files/spice-vdagentd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -p /var/run/spice-vdagentd
exec /usr/bin/spice-vdagentd -x
diff --git a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
index aac85d39a505..5617a2444486 100755
--- a/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
+++ b/srcpkgs/spreed-webrtc/files/spreed-webrtc-server/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _spreed_webrtc:_spreed_webrtc spreed-webrtc-server -c /etc/spreed/webrtc.conf
diff --git a/srcpkgs/sqmail/files/qmail-send/run b/srcpkgs/sqmail/files/qmail-send/run
index c3124c7a1890..18622e236aac 100755
--- a/srcpkgs/sqmail/files/qmail-send/run
+++ b/srcpkgs/sqmail/files/qmail-send/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
if [ -f /var/qmail/control/defaultdelivery ]; then
defaultdelivery=$(cat /var/qmail/control/defaultdelivery)
else
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/run b/srcpkgs/sqmail/files/qmail-smtpd/run
index c9993a14f4e0..f90ac49d17e1 100755
--- a/srcpkgs/sqmail/files/qmail-smtpd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/run b/srcpkgs/sqmail/files/qmail-smtpsd/run
index 8138490e142e..19aa95bfbf33 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/run b/srcpkgs/sqmail/files/qmail-smtpsub/run
index 7c01b0a444a2..8377944c8c32 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsub/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsub/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
QMAILU=$(id -u _qmaild)
QMAILG=$(id -g _qmaild)
HOSTNAME=$(hostname)
diff --git a/srcpkgs/squid/files/squid/run b/srcpkgs/squid/files/squid/run
index f926f8ffcb8f..fc9ebd7241fd 100644
--- a/srcpkgs/squid/files/squid/run
+++ b/srcpkgs/squid/files/squid/run
@@ -1,4 +1,5 @@
#!/bin/sh -e
+exec 2>&1
install -o squid -g squid -m 0755 -d /var/run/squid
squid -N -s -z
exec squid -N -s
diff --git a/srcpkgs/sshguard/files/sshguard-socklog/run b/srcpkgs/sshguard/files/sshguard-socklog/run
index 746df4822ce6..4fcd23a169ac 100755
--- a/srcpkgs/sshguard/files/sshguard-socklog/run
+++ b/srcpkgs/sshguard/files/sshguard-socklog/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Defaults that mabe be overridden (or erased entirely) by configuration
LOGFILE="${LOGFILE:-/var/log/socklog/secure/current}"
diff --git a/srcpkgs/ssl_exporter/files/ssl_exporter/run b/srcpkgs/ssl_exporter/files/ssl_exporter/run
index 0c2bda6a4dab..038148e06bec 100644
--- a/srcpkgs/ssl_exporter/files/ssl_exporter/run
+++ b/srcpkgs/ssl_exporter/files/ssl_exporter/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u nobody ssl_exporter $OPTS
diff --git a/srcpkgs/sslh/files/sslh/run b/srcpkgs/sslh/files/sslh/run
index 18710d4f96ad..247f31341787 100644
--- a/srcpkgs/sslh/files/sslh/run
+++ b/srcpkgs/sslh/files/sslh/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec sslh -f -u nobody -F/etc/sslh.cfg
diff --git a/srcpkgs/sssd/files/sssd/run b/srcpkgs/sssd/files/sssd/run
index 61a87edc699c..8203ac628a6d 100755
--- a/srcpkgs/sssd/files/sssd/run
+++ b/srcpkgs/sssd/files/sssd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec sssd -i
diff --git a/srcpkgs/strongswan/files/strongswan/run b/srcpkgs/strongswan/files/strongswan/run
index 16b6a9311424..5963bb28e664 100755
--- a/srcpkgs/strongswan/files/strongswan/run
+++ b/srcpkgs/strongswan/files/strongswan/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ipsec start --nofork
diff --git a/srcpkgs/stubby/files/stubby/run b/srcpkgs/stubby/files/stubby/run
index 2e12b92f0c34..3b819aaedc8d 100644
--- a/srcpkgs/stubby/files/stubby/run
+++ b/srcpkgs/stubby/files/stubby/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _stubby:_stubby /usr/bin/stubby 2>&1
diff --git a/srcpkgs/subversion/files/svnserve/run b/srcpkgs/subversion/files/svnserve/run
index 7f512e085141..aa7a1bebe59a 100755
--- a/srcpkgs/subversion/files/svnserve/run
+++ b/srcpkgs/subversion/files/svnserve/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec svnserve -d --foreground $OPTS
diff --git a/srcpkgs/sv-netmount/files/netmount/run b/srcpkgs/sv-netmount/files/netmount/run
index 9b0f4d72f9b4..d88dd8c9a2b0 100755
--- a/srcpkgs/sv-netmount/files/netmount/run
+++ b/srcpkgs/sv-netmount/files/netmount/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Load user defined variables
[ -r conf ] && . ./conf
diff --git a/srcpkgs/synapse/files/synapse/run b/srcpkgs/synapse/files/synapse/run
index 0778d6317328..7c3277a788ec 100644
--- a/srcpkgs/synapse/files/synapse/run
+++ b/srcpkgs/synapse/files/synapse/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
cd /var/lib/synapse
exec chpst -u synapse:synapse synapse_homeserver -c ${CONFIG_FILE:-/etc/synapse/homeserver.yaml}
diff --git a/srcpkgs/synergy/files/synergyc/run b/srcpkgs/synergy/files/synergyc/run
index eed442178d7c..ee9b27041843 100755
--- a/srcpkgs/synergy/files/synergyc/run
+++ b/srcpkgs/synergy/files/synergyc/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SERVER_ADDR ] && exit 0
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
diff --git a/srcpkgs/synergy/files/synergys/run b/srcpkgs/synergy/files/synergys/run
index 65bc0a52d76d..b1b2b5cc3f9a 100755
--- a/srcpkgs/synergy/files/synergys/run
+++ b/srcpkgs/synergy/files/synergys/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0
exec synergys --no-daemon ${OPTS:=--restart}
diff --git a/srcpkgs/telegraf/files/telegraf/run b/srcpkgs/telegraf/files/telegraf/run
index bd88810c3977..2104b55469d6 100644
--- a/srcpkgs/telegraf/files/telegraf/run
+++ b/srcpkgs/telegraf/files/telegraf/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _telegraf:_telegraf telegraf "$TELEGRAF_CONF_LINE" "$TELEGRAF_CONFDIR_LINE" 2>&1
diff --git a/srcpkgs/tftp-hpa/files/tftpd-hpa/run b/srcpkgs/tftp-hpa/files/tftpd-hpa/run
index d11fba58fd66..44bef33434b8 100644
--- a/srcpkgs/tftp-hpa/files/tftpd-hpa/run
+++ b/srcpkgs/tftp-hpa/files/tftpd-hpa/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
diff --git a/srcpkgs/thermald/files/thermald/run b/srcpkgs/thermald/files/thermald/run
index de5b6d5c3e1e..0df85a0b8af9 100644
--- a/srcpkgs/thermald/files/thermald/run
+++ b/srcpkgs/thermald/files/thermald/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec thermald --no-daemon --dbus-enable 2>&1
diff --git a/srcpkgs/thttpd/files/thttpd/run b/srcpkgs/thttpd/files/thttpd/run
index 95a629aabe29..cfcb6561cfbe 100755
--- a/srcpkgs/thttpd/files/thttpd/run
+++ b/srcpkgs/thttpd/files/thttpd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec thttpd -D
diff --git a/srcpkgs/tinc/files/tincd/run b/srcpkgs/tinc/files/tincd/run
index 21f48699717d..41650420858c 100755
--- a/srcpkgs/tinc/files/tincd/run
+++ b/srcpkgs/tinc/files/tincd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec tincd -D
diff --git a/srcpkgs/tinyproxy/files/tinyproxy/run b/srcpkgs/tinyproxy/files/tinyproxy/run
index a065b7f4f6d8..f85cefeef110 100755
--- a/srcpkgs/tinyproxy/files/tinyproxy/run
+++ b/srcpkgs/tinyproxy/files/tinyproxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
install -d -m 0755 -o _tinyproxy -g _tinyproxy /run/tinyproxy
exec chpst -1 tinyproxy -d $OPTS
diff --git a/srcpkgs/tinyssh/files/tinysshd/run b/srcpkgs/tinyssh/files/tinysshd/run
index 2e382737cc31..1069860e00ff 100644
--- a/srcpkgs/tinyssh/files/tinysshd/run
+++ b/srcpkgs/tinyssh/files/tinysshd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
# Override OPTS in conf. Suggested:
# OPTS='-x sftp=/usr/libexec/sftp-server -l -v'
diff --git a/srcpkgs/tlp/files/tlp/run b/srcpkgs/tlp/files/tlp/run
index 552c2e721154..04cdebc1a3b7 100755
--- a/srcpkgs/tlp/files/tlp/run
+++ b/srcpkgs/tlp/files/tlp/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
exec 1>&2
tlp init start || exit 1
exec chpst -b tlp pause
diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index 3b6f9953376d..315befc9b063 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
ulimit -n ${MAX_OPEN_FILES:-65536}
exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/touchegg/files/touchegg/run b/srcpkgs/touchegg/files/touchegg/run
index abe9b2319e3b..d85b174340b1 100755
--- a/srcpkgs/touchegg/files/touchegg/run
+++ b/srcpkgs/touchegg/files/touchegg/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _touchegg:input touchegg --daemon
diff --git a/srcpkgs/toxcore/files/tox-bootstrapd/run b/srcpkgs/toxcore/files/tox-bootstrapd/run
index e9acbdd6ee95..08f9d0f0d2d6 100755
--- a/srcpkgs/toxcore/files/tox-bootstrapd/run
+++ b/srcpkgs/toxcore/files/tox-bootstrapd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
exec chpst -u _tox_bootstrapd tox-bootstrapd --foreground ${OPTS:-"--config=/etc/tox-bootstrapd.conf"}
diff --git a/srcpkgs/transmission/files/transmission-daemon/run b/srcpkgs/transmission/files/transmission-daemon/run
index 07e3935f805a..ed988af16556 100755
--- a/srcpkgs/transmission/files/transmission-daemon/run
+++ b/srcpkgs/transmission/files/transmission-daemon/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u transmission:transmission transmission-daemon -f --log-error
diff --git a/srcpkgs/twoftpd/files/twoftpd-anon/run b/srcpkgs/twoftpd/files/twoftpd-anon/run
index 5618bd69b9a9..5e3dd2d7df6c 100755
--- a/srcpkgs/twoftpd/files/twoftpd-anon/run
+++ b/srcpkgs/twoftpd/files/twoftpd-anon/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
UID=$(id -u ftp)
GID=$(id -g ftp)
echo $UID > ./env/UID
diff --git a/srcpkgs/ufw/files/ufw/run b/srcpkgs/ufw/files/ufw/run
index 41b6523de68c..174bb3fd0cb7 100755
--- a/srcpkgs/ufw/files/ufw/run
+++ b/srcpkgs/ufw/files/ufw/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
/usr/lib/ufw/ufw-init start quiet
exec chpst -b ufw pause
diff --git a/srcpkgs/ulogd/files/ulogd/run b/srcpkgs/ulogd/files/ulogd/run
index 0f7e286e6e3c..737516c9e598 100644
--- a/srcpkgs/ulogd/files/ulogd/run
+++ b/srcpkgs/ulogd/files/ulogd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec ulogd -u _ulogd
diff --git a/srcpkgs/unbound/files/unbound/run b/srcpkgs/unbound/files/unbound/run
index 378933e6f592..8eea12be139b 100755
--- a/srcpkgs/unbound/files/unbound/run
+++ b/srcpkgs/unbound/files/unbound/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec unbound -dp
diff --git a/srcpkgs/upmpdcli/files/upmpdcli/run b/srcpkgs/upmpdcli/files/upmpdcli/run
index 1a6b2018657d..0a728f192656 100644
--- a/srcpkgs/upmpdcli/files/upmpdcli/run
+++ b/srcpkgs/upmpdcli/files/upmpdcli/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec chpst -u _upmpdcli upmpdcli ${OPTS:- -c /etc/upmpdcli.conf} 2>&1
diff --git a/srcpkgs/uptimed/files/uptimed/run b/srcpkgs/uptimed/files/uptimed/run
index 716df87a4aa2..89c40aed17f6 100755
--- a/srcpkgs/uptimed/files/uptimed/run
+++ b/srcpkgs/uptimed/files/uptimed/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec uptimed -f $OPTS
diff --git a/srcpkgs/usbguard/files/usbguard/run b/srcpkgs/usbguard/files/usbguard/run
index 9c33365a71e5..d5aa8b89ca66 100644
--- a/srcpkgs/usbguard/files/usbguard/run
+++ b/srcpkgs/usbguard/files/usbguard/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec usbguard-daemon
diff --git a/srcpkgs/usbmuxd/files/usbmuxd/run b/srcpkgs/usbmuxd/files/usbmuxd/run
index 0a064839de33..4314e9e2761d 100644
--- a/srcpkgs/usbmuxd/files/usbmuxd/run
+++ b/srcpkgs/usbmuxd/files/usbmuxd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec usbmuxd -f -u
diff --git a/srcpkgs/util-linux/files/uuidd/run b/srcpkgs/util-linux/files/uuidd/run
index bfbaa5492b34..78b1a6609d58 100755
--- a/srcpkgs/util-linux/files/uuidd/run
+++ b/srcpkgs/util-linux/files/uuidd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/uuidd ] && mkdir -p /run/uuidd
chown _uuidd:_uuidd /run/uuidd
exec chpst -u _uuidd:_uuidd uuidd -F -P
diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
index cae39437dd15..2910b070fb90 100644
--- a/srcpkgs/v2ray/files/v2ray/run
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _v2ray v2ray run -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run
index 1f4805733942..06eb3e51e6f2 100755
--- a/srcpkgs/varnish/files/varnishd/run
+++ b/srcpkgs/varnish/files/varnishd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
# Default options
VARNISH_ADDR=0.0.0.0:80
diff --git a/srcpkgs/vault/files/vault/run b/srcpkgs/vault/files/vault/run
index 840cc2836921..6b08c00f5c2e 100644
--- a/srcpkgs/vault/files/vault/run
+++ b/srcpkgs/vault/files/vault/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
exec chpst -u _vault vault server -config=/etc/vault/
diff --git a/srcpkgs/vaultwarden/files/vaultwarden/run b/srcpkgs/vaultwarden/files/vaultwarden/run
index ff5d0c6af46d..2c4beb06ee76 100644
--- a/srcpkgs/vaultwarden/files/vaultwarden/run
+++ b/srcpkgs/vaultwarden/files/vaultwarden/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
ENV_FILE=${ENV_FILE:-/etc/vaultwarden.conf}
export ENV_FILE
diff --git a/srcpkgs/virtualbox-ose/files/vboxservice/run b/srcpkgs/virtualbox-ose/files/vboxservice/run
index c3c0d94d034d..984493784030 100755
--- a/srcpkgs/virtualbox-ose/files/vboxservice/run
+++ b/srcpkgs/virtualbox-ose/files/vboxservice/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
# Note: requires dbus service
exec VBoxService -f
diff --git a/srcpkgs/virtualbox-ose/files/vboxwebsrv/run b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
index c28a700747b7..328216e4457d 100755
--- a/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
+++ b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check vboxservice >/dev/null || exit 1
sv check dbus >/dev/null || exit 1
exec vboxwebsrv
diff --git a/srcpkgs/vnstat/files/vnstatd/run b/srcpkgs/vnstat/files/vnstatd/run
index ea3a9ba02bd7..fb1228b7471c 100755
--- a/srcpkgs/vnstat/files/vnstatd/run
+++ b/srcpkgs/vnstat/files/vnstatd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec vnstatd -n
diff --git a/srcpkgs/vpnd/files/vpnd/run b/srcpkgs/vpnd/files/vpnd/run
index 9f023775841d..9c2b90f2d193 100644
--- a/srcpkgs/vpnd/files/vpnd/run
+++ b/srcpkgs/vpnd/files/vpnd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/vpnd
diff --git a/srcpkgs/vsftpd/files/vsftpd-ipv6/run b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
index f0ca4b4d6099..b8c553af7728 100644
--- a/srcpkgs/vsftpd/files/vsftpd-ipv6/run
+++ b/srcpkgs/vsftpd/files/vsftpd-ipv6/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec vsftpd -obackground=no -olisten=no -olisten_ipv6=yes ${OPTS}
diff --git a/srcpkgs/vsftpd/files/vsftpd/run b/srcpkgs/vsftpd/files/vsftpd/run
index 0b237d7d8c74..02e1063dc0cd 100644
--- a/srcpkgs/vsftpd/files/vsftpd/run
+++ b/srcpkgs/vsftpd/files/vsftpd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec vsftpd -obackground=no ${OPTS}
diff --git a/srcpkgs/watchdog/files/watchdog/run b/srcpkgs/watchdog/files/watchdog/run
index a7bb2abd33c6..896685808b02 100755
--- a/srcpkgs/watchdog/files/watchdog/run
+++ b/srcpkgs/watchdog/files/watchdog/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
exec watchdog -F ${OPTS}
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index b926f6c70305..3e44af632958 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec waydroid -w container start
diff --git a/srcpkgs/wesnoth/files/wesnothd/run b/srcpkgs/wesnoth/files/wesnothd/run
index e32ddd006a46..b9bfeec8c3ab 100644
--- a/srcpkgs/wesnoth/files/wesnothd/run
+++ b/srcpkgs/wesnoth/files/wesnothd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
mkdir -m0700 -p /run/wesnoth
exec wesnothd
diff --git a/srcpkgs/wicd/files/wicd/run b/srcpkgs/wicd/files/wicd/run
index 5adacd074701..c88a989263cf 100755
--- a/srcpkgs/wicd/files/wicd/run
+++ b/srcpkgs/wicd/files/wicd/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
sv check dbus >/dev/null || exit 1
exec chpst -1 wicd --no-daemon
diff --git a/srcpkgs/wireguard-tools/files/wireguard/run b/srcpkgs/wireguard-tools/files/wireguard/run
index d669d955aafa..f18d25ee1227 100755
--- a/srcpkgs/wireguard-tools/files/wireguard/run
+++ b/srcpkgs/wireguard-tools/files/wireguard/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
set -e
for conf in /etc/wireguard/*.conf; do
diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run
index 7ba16434072e..4ee380ac48ba 100644
--- a/srcpkgs/wireproxy/files/wireproxy/run
+++ b/srcpkgs/wireproxy/files/wireproxy/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r ./conf ] && . ./conf
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/run b/srcpkgs/x2goserver/files/x2gocleansessions/run
index f40d8b1f2b35..81041208a29d 100644
--- a/srcpkgs/x2goserver/files/x2gocleansessions/run
+++ b/srcpkgs/x2goserver/files/x2gocleansessions/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec /usr/bin/x2gocleansessions --nofork
diff --git a/srcpkgs/xdm/files/xdm/run b/srcpkgs/xdm/files/xdm/run
index 49f1608c8b91..0dd30414122d 100755
--- a/srcpkgs/xdm/files/xdm/run
+++ b/srcpkgs/xdm/files/xdm/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec xdm -error /dev/stdout -nodaemon 2>&1
diff --git a/srcpkgs/xen/files/xen/run b/srcpkgs/xen/files/xen/run
index b35a945d1bec..5aff5c94a62a 100755
--- a/srcpkgs/xen/files/xen/run
+++ b/srcpkgs/xen/files/xen/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check xenconsoled >/dev/null || exit 1
xenstore-write "/local/domain/0/domid" 0 || exit 1
xenstore-write "/local/domain/0/name" "Domain-0" || exit 1
diff --git a/srcpkgs/xen/files/xenconsoled/run b/srcpkgs/xen/files/xenconsoled/run
index bf13989cdb95..d5dedb6c5f8c 100755
--- a/srcpkgs/xen/files/xenconsoled/run
+++ b/srcpkgs/xen/files/xenconsoled/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv check xenstored >/dev/null || exit 1
mkdir -p /var/log/xen/console
exec xenconsoled -i --log=all
diff --git a/srcpkgs/xen/files/xenstored/run b/srcpkgs/xen/files/xenstored/run
index f30d9adefaa4..6f0744726428 100755
--- a/srcpkgs/xen/files/xenstored/run
+++ b/srcpkgs/xen/files/xenstored/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ ! -d /run/xen ] && mkdir -p /run/xen
modprobe -q xen-evtchn xen-gnttalloc || exit 1
mountpoint -q /proc/xen || mount -t xenfs xenfs /proc/xen
diff --git a/srcpkgs/xinetd/files/xinetd/run b/srcpkgs/xinetd/files/xinetd/run
index 08bab8849c20..999a1283fece 100755
--- a/srcpkgs/xinetd/files/xinetd/run
+++ b/srcpkgs/xinetd/files/xinetd/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec xinetd -dontfork -syslog daemon
diff --git a/srcpkgs/xl2tpd/files/xl2tpd/run b/srcpkgs/xl2tpd/files/xl2tpd/run
index 343575eb5988..ccdadd6a2c3f 100644
--- a/srcpkgs/xl2tpd/files/xl2tpd/run
+++ b/srcpkgs/xl2tpd/files/xl2tpd/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . ./conf
[ -d /var/run/xl2tpd ] || mkdir /var/run/xl2tpd
exec xl2tpd -D ${OPTS:=-c /etc/xl2tpd/xl2tpd.conf}
diff --git a/srcpkgs/yggdrasil/files/yggdrasil/run b/srcpkgs/yggdrasil/files/yggdrasil/run
index 0c5e259b3ae5..1189f9cc02ed 100755
--- a/srcpkgs/yggdrasil/files/yggdrasil/run
+++ b/srcpkgs/yggdrasil/files/yggdrasil/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
modprobe tun
caps='-all,+NET_ADMIN,+NET_RAW'
drop_caps="setpriv --inh-caps $caps --bounding-set $caps"
diff --git a/srcpkgs/zabbix/files/zabbix-agent/run b/srcpkgs/zabbix/files/zabbix-agent/run
index badcd16daa56..0fa78920beb0 100755
--- a/srcpkgs/zabbix/files/zabbix-agent/run
+++ b/srcpkgs/zabbix/files/zabbix-agent/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o _zabbix_agent -g _zabbix_agent /run/zabbix-agentd
chpst -u _zabbix_agent:_zabbix_agent zabbix_agentd -f -c /etc/zabbix_agentd.conf
diff --git a/srcpkgs/zabbix/files/zabbix-proxy/run b/srcpkgs/zabbix/files/zabbix-proxy/run
index 5b6685de0efe..a5a3351cf5a1 100755
--- a/srcpkgs/zabbix/files/zabbix-proxy/run
+++ b/srcpkgs/zabbix/files/zabbix-proxy/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0750 -o _zabbix_proxy -g _zabbix_proxy /run/zabbix-proxy
chpst -u _zabbix_proxy:_zabbix_proxy zabbix_proxy -f -c /etc/zabbix_proxy.conf
diff --git a/srcpkgs/zabbix/files/zabbix-server/run b/srcpkgs/zabbix/files/zabbix-server/run
index 09c7bfaa92bd..bbeb61e94660 100755
--- a/srcpkgs/zabbix/files/zabbix-server/run
+++ b/srcpkgs/zabbix/files/zabbix-server/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
sv start mysqld >/dev/null || exit 1
install -d -m0750 -o _zabbix_server -g _zabbix_server /run/zabbix-server
diff --git a/srcpkgs/zeek/files/bro/run b/srcpkgs/zeek/files/bro/run
index 90eb6a59c0ce..3daf99573a9e 100644
--- a/srcpkgs/zeek/files/bro/run
+++ b/srcpkgs/zeek/files/bro/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
BROLOGDIR="/var/log/bro"
diff --git a/srcpkgs/zeek/files/zeek/run b/srcpkgs/zeek/files/zeek/run
index 8d3fd5e36f21..9401eefa57ab 100644
--- a/srcpkgs/zeek/files/zeek/run
+++ b/srcpkgs/zeek/files/zeek/run
@@ -1,4 +1,5 @@
#!/bin/sh
+exec 2>&1
ZEEKLOGDIR="/var/log/zeek"
diff --git a/srcpkgs/zfs/files/zed/run b/srcpkgs/zfs/files/zed/run
index 0e3c1a4f53da..63deda22b506 100755
--- a/srcpkgs/zfs/files/zed/run
+++ b/srcpkgs/zfs/files/zed/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
[ -r conf ] && . conf
exec zed -F $OPTS
diff --git a/srcpkgs/znc/files/znc/run b/srcpkgs/znc/files/znc/run
index 7f69a9a382f8..6888186ac4fd 100644
--- a/srcpkgs/znc/files/znc/run
+++ b/srcpkgs/znc/files/znc/run
@@ -1,2 +1,3 @@
#!/bin/sh
+exec 2>&1
exec chpst -u znc:znc znc -f -n 2>&1
diff --git a/srcpkgs/zrepl/files/zrepl/run b/srcpkgs/zrepl/files/zrepl/run
index 6641430b37e9..f783e265f774 100644
--- a/srcpkgs/zrepl/files/zrepl/run
+++ b/srcpkgs/zrepl/files/zrepl/run
@@ -1,3 +1,4 @@
#!/bin/sh
+exec 2>&1
install -d -m0700 /var/run/zrepl
exec zrepl --config /etc/zrepl/zrepl.yml daemon
From b9890b6efa38d4880eaeae1d150f29ad8fb3b35d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:04:23 -0500
Subject: [PATCH 324/356] dnscrypt-proxy: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/dnscrypt-proxy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnscrypt-proxy/template b/srcpkgs/dnscrypt-proxy/template
index e06702e89b92..8a5a16f2d0cf 100644
--- a/srcpkgs/dnscrypt-proxy/template
+++ b/srcpkgs/dnscrypt-proxy/template
@@ -1,7 +1,7 @@
# Template file for 'dnscrypt-proxy'
pkgname=dnscrypt-proxy
version=2.1.4
-revision=1
+revision=2
build_style=go
go_import_path=github.com/dnscrypt/dnscrypt-proxy
go_package="${go_import_path}/dnscrypt-proxy"
From fe97bb1579a9d94069e631a7da2f6a2dcb3eeee8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:43 -0500
Subject: [PATCH 325/356] dq: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/dq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dq/template b/srcpkgs/dq/template
index e0d84abd1b7f..418b0d89e35d 100644
--- a/srcpkgs/dq/template
+++ b/srcpkgs/dq/template
@@ -1,7 +1,7 @@
# Template file for 'dq'
pkgname=dq
version=0.0.20230101
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="
/etc/dqcache/env 0755 root root
From 8e91c18d1c3ac6fbf4a485bd13ab02b20d92e037 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:47 -0500
Subject: [PATCH 326/356] radicale: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/radicale/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 62e0125da827..a6fabe065463 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
# Template file for 'radicale'
pkgname=radicale
version=3.1.8
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt
From 2e3727e098b2c1c329b58c849fb0ec2e4055adda Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:05:53 -0500
Subject: [PATCH 327/356] syncthing: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/syncthing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d0e8b48205c1..1c4a6f9e9224 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
# Template file for 'syncthing'
pkgname=syncthing
version=1.23.1
-revision=1
+revision=2
build_style=go
go_import_path="github.com/syncthing/syncthing"
go_package="
From d780f88213a8dc4f62519b8273dff756e12022c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 9 Feb 2023 20:11:20 -0500
Subject: [PATCH 328/356] preload: rebuild for log destination change
log was previously using svlogd and putting logs in /var/log/$service,
now uses vlogger.
---
srcpkgs/preload/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/preload/template b/srcpkgs/preload/template
index e3ee614470f5..9623aed0e6eb 100644
--- a/srcpkgs/preload/template
+++ b/srcpkgs/preload/template
@@ -1,13 +1,13 @@
# Template file for 'preload'
pkgname=preload
version=0.6.4
-revision=10
+revision=11
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libglib-devel"
short_desc="Adaptive readahead daemon"
maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://sourceforge.net/projects/preload"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=d0a558e83cb29a51d9d96736ef39f4b4e55e43a589ad1aec594a048ca22f816b
From 03995348e583b48485789548a68ca3232108d627 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 7 Feb 2023 14:48:45 -0600
Subject: [PATCH 329/356] QMPlay2: update to 23.02.05.
---
srcpkgs/QMPlay2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 5697957c80d5..ad73cbb01bae 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
-version=22.10.23
+version=23.02.05
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -14,7 +14,7 @@ license="LGPL-3.0-only"
homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=31e53121e517b45d4317a298df9aed447f880383bea96ae28bfcec0b3a19483f
+checksum=b5347b6840e6f60496f7ca043d423ec52afc7a8b34274379a50c7e7bcd75414c
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
From 26ddf3f024eed98ee020b3f0f8c193e340778a1a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 9 Feb 2023 21:11:16 -0600
Subject: [PATCH 330/356] nvidia: update to 525.89.02.
---
srcpkgs/nvidia/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 5ab1d1b7c8f1..09e40d23482c 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
_desc="NVIDIA drivers for linux"
pkgname=nvidia
-version=525.85.05
+version=525.89.02
revision=1
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
_pkg="NVIDIA-Linux-x86_64-${version}"
distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=ea63b4253403b224bb7313a8977a920dfe9d203d661dd5f6fc26585a70179140
+checksum=0e412c88c5bd98f842a839a6f64614f20e4c0950ef7cffb12b158a71633593e9
# subpackages need to be processed in this specific order
subpackages="nvidia-gtklibs nvidia-dkms nvidia-firmware nvidia-opencl nvidia-libs nvidia-libs-32bit"
depends="nvidia-libs-${version}_${revision}
From 21fff929db40441a449da5cea74f368b6c078d22 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 9 Feb 2023 21:35:22 -0600
Subject: [PATCH 331/356] ghidra: update to 10.2.3.
---
srcpkgs/ghidra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index fca254e4a6bc..aa59daf783a6 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,6 +1,6 @@
# Template file for 'ghidra'
pkgname=ghidra
-version=10.2.2
+version=10.2.3
revision=1
# commit id of 'ghidra-data' repo:
_commit=939210dab2570714944ac35a4daef9633fd842b3
@@ -29,7 +29,7 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb
https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
-checksum="63645c44039b87b65c20bd64b9bd1d2fe4749704220da0b0756a18061cf0f543
+checksum="b200db34e7dae42914fafc45075e84cebf2c635ea47d4422a10b399913f0312e
7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
ff7a4c8262f7d24079b16607122bad8f6fb024f051c27b91883d9498568429a9
00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
From e7fa54b0ff1a8cdda5e43aa515a3d08e9388cc64 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 8 Feb 2023 10:27:41 +0100
Subject: [PATCH 332/356] github-cli: update to 2.23.0
---
srcpkgs/github-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 510a07a6b4cd..c767c300014a 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
# Template file for 'github-cli'
pkgname=github-cli
-version=2.22.1
+version=2.23.0
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://cli.github.com"
changelog="https://github.com/cli/cli/releases"
distfiles="https://github.com/cli/cli/archive/refs/tags/v${version}.tar.gz"
-checksum=09cdd1c435d453a0c610f407979ecf8d314aec41d7b8004794f136f05b0fe688
+checksum=1e9f92a47caa92efedc06b22cfe9c951c5163c4a9bc60a45d477fd5d9b592e54
pre_build() {
local _date
From b80bcf9b0d8780004fc3569216018821b712d7bd Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 10 Feb 2023 00:57:18 -0500
Subject: [PATCH 333/356] vault: update to 1.12.3.
---
srcpkgs/vault/files/vault/run | 5 ++++-
srcpkgs/vault/template | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/vault/files/vault/run b/srcpkgs/vault/files/vault/run
index 6b08c00f5c2e..43742a8ee0a0 100644
--- a/srcpkgs/vault/files/vault/run
+++ b/srcpkgs/vault/files/vault/run
@@ -1,4 +1,7 @@
#!/bin/sh
exec 2>&1
-exec chpst -u _vault vault server -config=/etc/vault/
+[ -r ./conf ] && . ./conf
+: ${OPTS:=server -config=/etc/vault/}
+
+exec chpst -u _vault vault ${OPTS}
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index b8cc146ca579..194ddcc2270f 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
# Template file for 'vault'
pkgname=vault
-version=1.12.1
+version=1.12.3
revision=1
build_style=go
go_import_path="github.com/hashicorp/vault"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.vaultproject.io/"
distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=32dc19ca35496ecaeaf906f8670d3acf569f0c7a43531cbdc9ab69f69f7c4a68
+checksum=be65f2fcc2e5ed0e01978c72a5ee8142470e7115088c96d8c0d1a66e0b5ec17a
system_accounts="_vault"
make_dirs="/var/lib/vault 0700 _vault _vault
/etc/vault 0750 root _vault"
From a9289a40b2c74a73b2bbf852dcca35bb3e0f4a11 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 10 Feb 2023 15:14:57 +0100
Subject: [PATCH 334/356] paps: update to 0.8.0.
---
srcpkgs/paps/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/paps/template b/srcpkgs/paps/template
index 36de5edaa2d3..460daaaae548 100644
--- a/srcpkgs/paps/template
+++ b/srcpkgs/paps/template
@@ -1,6 +1,6 @@
# Template file for 'paps'
pkgname=paps
-version=0.7.9
+version=0.8.0
revision=1
build_style=meson
hostmakedepends="pkg-config cmake"
@@ -10,4 +10,5 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/dov/paps"
distfiles="https://github.com/dov/paps/archive/v${version}.tar.gz"
-checksum=5f0198a011533d915fbf9f5e47438148d1f3a056bcd90bc21d6ae6476b6f3abc
+checksum=8fd8db04e6f8c5c164806d2c1b5fea6096daf583f83f06d1e4813ea61edc291f
+python_version=3
From 14a9db095e0c02b9e466de9515dbdcabbf3d8b73 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Feb 2023 11:30:02 -0500
Subject: [PATCH 335/356] nzbget: patch for openssl3
---
srcpkgs/nzbget/patches/openssl3.patch | 29 +++++++++++++++++++++++++++
srcpkgs/nzbget/template | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/nzbget/patches/openssl3.patch
diff --git a/srcpkgs/nzbget/patches/openssl3.patch b/srcpkgs/nzbget/patches/openssl3.patch
new file mode 100644
index 000000000000..75287bce9f70
--- /dev/null
+++ b/srcpkgs/nzbget/patches/openssl3.patch
@@ -0,0 +1,29 @@
+From f76e8555504e3af4cf8dd4a8c8e374b3ca025099 Mon Sep 17 00:00:00 2001
+From: Simon Chopin <simon.chopin@canonical.com>
+Date: Tue, 7 Dec 2021 13:23:21 +0100
+Subject: [PATCH] daemon:connect: don't use FIPS_mode_set with OpenSSL 3
+
+This function has been removed in OpenSSL 3, replaced by
+EVP_default_properties_enable_fips. See
+https://www.openssl.org/docs/man3.0/man7/migration_guide.html
+---
+ daemon/connect/TlsSocket.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/daemon/connect/TlsSocket.cpp b/daemon/connect/TlsSocket.cpp
+index 544bf6850..831da0dc0 100644
+--- a/daemon/connect/TlsSocket.cpp
++++ b/daemon/connect/TlsSocket.cpp
+@@ -189,7 +189,11 @@ void TlsSocket::Final()
+
+ #ifdef HAVE_OPENSSL
+ #ifndef LIBRESSL_VERSION_NUMBER
++#if OPENSSL_VERSION_NUMBER < 0x30000000L
+ FIPS_mode_set(0);
++#else
++ EVP_default_properties_enable_fips(NULL, 0);
++#endif
+ #endif
+ #ifdef NEED_CRYPTO_LOCKING
+ CRYPTO_set_locking_callback(nullptr);
+
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index 3d4306834839..8631192b5d0f 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
# Template file for 'nzbget'
pkgname=nzbget
version=21.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tlslib=OpenSSL
--with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
From c2a15f417369f06fcf6f2155e7212ea55b878058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 10 Feb 2023 22:58:16 +0700
Subject: [PATCH 336/356] python3-readability-lxml: remove python 2 file
Fix: #42178
---
srcpkgs/python3-readability-lxml/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 499692571812..4872e4b2addc 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,7 +1,7 @@
# Template file for 'python3-readability-lxml'
pkgname=python3-readability-lxml
version=0.8.1
-revision=6
+revision=7
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-lxml python3-chardet python3-cssselect"
@@ -12,3 +12,7 @@ homepage="https://github.com/buriy/python-readability"
distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
make_check=no # needs unpackaged timeout_decorator
+
+post_extract() {
+ rm -f readability/compat/two.py
+}
From c99b1c502496970aa1055a8ab942ae95bb6bce85 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sat, 26 Nov 2022 02:20:26 +0100
Subject: [PATCH 337/356] portage: update to 3.0.44.
with help by
https://github.com/void-linux/void-packages/pull/38353#issuecomment-1405626057
@liarimu
---
srcpkgs/portage/template | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template
index 8e20cd92b638..bb6c1ae41fe2 100644
--- a/srcpkgs/portage/template
+++ b/srcpkgs/portage/template
@@ -1,21 +1,24 @@
# Template file for 'portage'
pkgname=portage
-version=3.0.32
-revision=2
+version=3.0.44
+revision=1
build_style=python3-module
make_install_args="--sbindir=/usr/bin"
hostmakedepends="python3"
depends="python3 rsync xmlto eselect tar zstd"
-checkdepends="tar zstd"
+checkdepends="tar zstd gnupg"
short_desc="Gentoo's package management system"
maintainer="teldra <teldra@rotce.de>"
license="GPL-2.0-only"
homepage="https://wiki.gentoo.org/wiki/Portage"
-changelog="https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES"
-distfiles="https://github.com/gentoo/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=442c028fb8c8926491bc92f0d4d25a5ffabb1750d10f9c056471c1768a9202a2
+changelog="https://gitweb.gentoo.org/proj/portage.git/plain/NEWS"
+distfiles="https://github.com/gentoo/portage/archive/portage-${version}.tar.gz"
+checksum=c7171aae7a6d6228b3ecc37819ce4d5c7652a9f47dde4db21d5ce4437d0ae19a
+# unshare cannot be used in CI
+# https://bugs.gentoo.org/show_bug.cgi?id=680456
+# https://forums.gentoo.org/viewtopic-t-1113256-start-0.html
+make_check=ci-skip
-conf_files="
- /etc/dispatch-conf.conf
- /etc/etc-update.conf
- /etc/logrotate.d/elog-save-summary"
+conf_files="/etc/dispatch-conf.conf
+ /etc/etc-update.conf
+ /etc/logrotate.d/elog-save-summary"
From 4db58d2ba9c2d315f35c5507ed48f538218e56df Mon Sep 17 00:00:00 2001
From: Graham Scott <Grahamlrscott@gmail.com>
Date: Wed, 21 Dec 2022 19:07:24 -0600
Subject: [PATCH 338/356] glm: fix license, copy cmake config files
closes #36213
---
srcpkgs/glm/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template
index 7ccca2b74ebf..5f076e7a3d5c 100644
--- a/srcpkgs/glm/template
+++ b/srcpkgs/glm/template
@@ -1,7 +1,7 @@
# Template file for 'glm'
pkgname=glm
version=0.9.9.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="dos2unix unzip"
short_desc="C++ mathematics library for graphics programming"
@@ -16,9 +16,9 @@ checksum=37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c
do_install() {
local i
vmkdir usr/include
- for i in glm ; do
- vcopy $i usr/include
- done
+ vcopy glm usr/include
+ vmkdir usr/lib/cmake
+ vcopy cmake/glm usr/lib/cmake
vmkdir usr/share/pkgconfig
vinstall ${FILESDIR}/glm.pc 644 usr/share/pkgconfig
}
@@ -28,7 +28,6 @@ post_install() {
for f in $(find ${DESTDIR}/usr/include -type f); do
dos2unix "$f"
done
- rm -f "${DESTDIR}/usr/include/CMakeLists.txt"
- sed -n '88,110p' manual.md > LICENSE
- vlicense LICENSE
+ rm "${DESTDIR}/usr/include/glm/CMakeLists.txt"
+ vlicense copying.txt LICENSE
}
From af6c90f710e98c4678e916e021ae1df2bff1fcfc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 10 Feb 2023 19:43:29 +0100
Subject: [PATCH 339/356] xa: update to 2.3.14.
---
srcpkgs/xa/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index b6df10d76645..f421d2824b8d 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,8 +1,9 @@
# Template file for 'xa'
pkgname=xa
-version=2.3.13
+version=2.3.14
revision=1
build_style=gnu-makefile
+make_check_args="-j1"
make_check_target="test"
checkdepends="perl"
short_desc="6502/R65C02/65816 cross-assembler"
@@ -10,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.floodgap.com/retrotech/xa/"
distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86
+checksum=1b9bbabddbd8d3b9410b852e50a128eea41e681339e6f76c3e8076fa5420f02e
post_extract() {
vsed -i 's/${LD}/${CC}/' src/Makefile
From 4fea2742607d4e61b6d8acfdebc1aae8bc2a246c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 29 Jan 2023 18:39:18 -0500
Subject: [PATCH 340/356] New package: xmirror-0.1
---
srcpkgs/xmirror/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/xmirror/template
diff --git a/srcpkgs/xmirror/template b/srcpkgs/xmirror/template
new file mode 100644
index 000000000000..2768924411b1
--- /dev/null
+++ b/srcpkgs/xmirror/template
@@ -0,0 +1,17 @@
+# Template file for 'xmirror'
+pkgname=xmirror
+version=0.1
+revision=1
+build_style=gnu-makefile
+depends="bash dialog"
+short_desc="Interactive script for changing XBPS mirrors"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="BSD-2-Clause"
+homepage="https://github.com/void-linux/xmirror"
+distfiles="https://github.com/void-linux/xmirror/archive/refs/tags/v${version}.tar.gz"
+checksum=0792cc7425bfe46353568de99233d24d7456e0081e0f7947540018f1f831d360
+mutable_files="/usr/share/xmirror/mirrors.lst"
+
+post_install() {
+ vlicense LICENSE
+}
From 08bc4cbf8ca9c66f15a7ee867a11d1b178ed987c Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 9 Feb 2023 23:00:30 -0600
Subject: [PATCH 341/356] Signal-Desktop: update to 6.5.1.
---
srcpkgs/Signal-Desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index c7389f4ed0e2..baf639ca1bfa 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
-version=6.4.1
+version=6.5.1
revision=1
# Signal officially only supports x86_64 (also due to Electron)
# x86_64-musl fails because of its dependency on 'node-gyp' which depends on a glibc specific extension
@@ -13,7 +13,7 @@ maintainer="akierig <anelki@fastmail.de>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=899af104afe358413ebba2971ddb273ee788f7ffad9fdf96ece30e527eda3475
+checksum=553902fc571a0965538b6ade8e0bdd4056540c91165f49b5e7b826e0545302d8
nostrip_files="signal-desktop"
post_extract() {
From 93be0d31efdbf960c5061f29dbce6b3973962c46 Mon Sep 17 00:00:00 2001
From: Pascal Huber <pascal.huber@resolved.ch>
Date: Fri, 10 Feb 2023 20:22:26 +0100
Subject: [PATCH 342/356] Thunar: update to 4.18.3
---
srcpkgs/Thunar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index abb46eb9a794..f41c1d34cd88 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,6 @@
# Template file for 'Thunar'
pkgname=Thunar
-version=4.18.2
+version=4.18.3
revision=1
build_style=gnu-configure
build_helper="gir"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://docs.xfce.org/xfce/thunar/Start"
changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=adfedd9d25428ddb750088f81d24c853ef4699230911994c8dfb90c5c5daa2be
+checksum=f402ea38519f3f803b8f06933c05ddbf8c0c61d2e8ef93fcbe1fc7f6525e3297
Thunar-devel_package() {
depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"
From 56793ef6caf042e3f01d50caf49dae3630a43e00 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 30 Jan 2023 11:18:33 +0000
Subject: [PATCH 343/356] cloudflared: update to 2023.2.1
---
srcpkgs/cloudflared/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cloudflared/template b/srcpkgs/cloudflared/template
index 8219fbe0f0af..c16c4ad65be7 100644
--- a/srcpkgs/cloudflared/template
+++ b/srcpkgs/cloudflared/template
@@ -1,6 +1,6 @@
# Template file for 'cloudflared'
pkgname=cloudflared
-version=2022.10.3
+version=2023.2.1
revision=1
build_style=go
go_import_path=github.com/cloudflare/cloudflared
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://developers.cloudflare.com/argo-tunnel/"
changelog="https://raw.githubusercontent.com/cloudflare/cloudflared/master/CHANGES.md"
distfiles="https://github.com/cloudflare/cloudflared/archive/${version}.tar.gz"
-checksum=e49db875da7513d8ae950b20c636225016022866850ff3df2484c0f56cdc4bc4
+checksum=468b0953eca6ab189859073067857062c91ed9adb18e12a43527e0dba3aa6409
pre_build() {
go_ldflags+=" -X \"main.BuildTime=$(date -u '+%Y-%m-%d-%H:%M UTC')\""
From 1dc7865e3def8799d43384e0028957fc81bfb6aa Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 10 Feb 2023 13:48:59 +0100
Subject: [PATCH 344/356] drone-cli: update to 1.7.0.
---
srcpkgs/drone-cli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/drone-cli/template b/srcpkgs/drone-cli/template
index d6d78631c001..2d835921b02b 100644
--- a/srcpkgs/drone-cli/template
+++ b/srcpkgs/drone-cli/template
@@ -1,6 +1,6 @@
# Template file for 'drone-cli'
pkgname=drone-cli
-version=1.6.2
+version=1.7.0
revision=1
build_style=go
go_import_path=github.com/drone/drone-cli
@@ -12,4 +12,4 @@ license="Apache-2.0"
homepage="https://github.com/drone/drone-cli"
changelog="https://raw.githubusercontent.com/drone/drone-cli/master/CHANGELOG.md"
distfiles="https://github.com/drone/drone-cli/archive/v${version}.tar.gz"
-checksum=7f0fc4c884eda352511c6d39e1ff0e3ebe97242c60f9f5fd983376b607b83148
+checksum=75f06372feb6aea6c52f06b09ade5a569a3c289346b0fe31a55df041bce576dc
From 6369894ad2d9623836f71cebf01e68cf9b67e47f Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 9 Feb 2023 23:05:49 +0100
Subject: [PATCH 345/356] gdu: update to 5.22.0.
---
srcpkgs/gdu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 5ef4a36a2661..f38a76403169 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
# Template file for 'gdu'
pkgname=gdu
-version=5.21.1
+version=5.22.0
revision=1
build_style=go
go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/dundee/gdu"
distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=b28fa52e7cae22ed1aa505718168408567ed74844ea68ca4339b18dceb2ea40b
+checksum=cb655d2c609925fb137357704dcbebf7d80796d9011ed43df8c79c18cfa893d7
post_install() {
vman gdu.1
From 723f56e5a17e83eaacea8368aedadfcddba10360 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 9 Feb 2023 23:11:19 +0100
Subject: [PATCH 346/356] vscode: update to 1.75.1
---
srcpkgs/vscode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ac5a91cb37bf..991d7c522c6a 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
# Template file for 'vscode'
pkgname=vscode
-version=1.75.0
+version=1.75.1
revision=1
_electronver=19.0.8
_npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
license="MIT"
homepage="https://code.visualstudio.com/"
distfiles="https://github.com/microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=719c1efeca10a163b18618b5b689d4843247d3e86a27a6e898113219274cb99c
+checksum=97500f244eacd66556c2bcf2d9a63b2509e363f9bc8d587c6fc2feb6bb1a5e31
nocross=yes # x64 build does not cut it, it contains native code
if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
From 12ad66c855dff2c3693cba0818ed4e078145571d Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 30 Jan 2023 02:12:05 +0100
Subject: [PATCH 347/356] labwc: update to 0.6.1
---
srcpkgs/labwc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/labwc/template b/srcpkgs/labwc/template
index 2b898a51bfb6..833963dc0512 100644
--- a/srcpkgs/labwc/template
+++ b/srcpkgs/labwc/template
@@ -1,6 +1,6 @@
# Template file for 'labwc'
pkgname=labwc
-version=0.6.0
+version=0.6.1
revision=1
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
homepage="https://labwc.github.io/"
changelog="https://raw.githubusercontent.com/labwc/labwc/master/NEWS.md"
distfiles="https://github.com/labwc/labwc/archive/refs/tags/${version}.tar.gz"
-checksum=3a4ee960b4f764f276d581f83c95692c74c6a685e55438fb37ca6dd92e02f069
+checksum=c951050d4a2c2afc71d52d8138f8f4ef7ed2a2c9a337dc9de146c8b1e97cf952
post_install() {
local _example
From 9f526b707a37ee744cdc9dbcdb6cba3b31355509 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 8 Feb 2023 00:45:53 +0530
Subject: [PATCH 348/356] glab: update to 1.25.3.
---
srcpkgs/glab/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 840e13d8f160..3fe7ad7833a0 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
# Template file for 'glab'
pkgname=glab
-version=1.24.1
+version=1.25.3
revision=1
build_style=go
build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://gitlab.com/gitlab-org/cli"
distfiles="https://gitlab.com/gitlab-org/cli/-/archive/v$version/cli-v$version.tar.gz"
-checksum=dc942f7806aa417714483bd5323bfcde9eceadd7ed33154f7a77038b416bdd95
+checksum=4cc090b9ad7ee6608d70e3a7fb5ca91a505eff12cf967a944bd0581cb6a83972
post_install() {
for shell in bash fish zsh; do
From f0a692e4af3700431fea227a9e65d70899c68ef4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Feb 2023 21:58:14 -0500
Subject: [PATCH 349/356] bemenu: update to 0.6.14
---
srcpkgs/bemenu/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bemenu/template b/srcpkgs/bemenu/template
index 902198005c7a..d20d63c45d12 100644
--- a/srcpkgs/bemenu/template
+++ b/srcpkgs/bemenu/template
@@ -1,6 +1,6 @@
# Template file for 'bemenu'
pkgname=bemenu
-version=0.6.13
+version=0.6.14
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config wayland-devel scdoc"
@@ -12,7 +12,7 @@ maintainer="Issam Maghni <me@concati.me>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://github.com/Cloudef/bemenu"
distfiles="https://github.com/Cloudef/bemenu/archive/${version}.tar.gz"
-checksum=6032fae0253363a48171367c20982ef080ba5c163462732f0354dc8b606850f9
+checksum=bc945776f94901d0898d19725d3a4c3e1f5bc90712a5bae9ec98d89d24603a9d
bemenu-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 305e36a525bc0c2ead8fc73ea36f5d94086d4905 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 6 Feb 2023 22:08:38 -0500
Subject: [PATCH 350/356] python3-lsp-server: update to 1.7.1
---
srcpkgs/python3-lsp-server/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
index 42f8b7703a33..a1ccc1e317bf 100644
--- a/srcpkgs/python3-lsp-server/template
+++ b/srcpkgs/python3-lsp-server/template
@@ -1,6 +1,6 @@
# Template file for 'python3-lsp-server'
pkgname=python3-lsp-server
-version=1.6.0
+version=1.7.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
@@ -16,14 +16,15 @@ license="MIT"
homepage="https://github.com/python-lsp/python-lsp-server"
changelog="https://raw.githubusercontent.com/python-lsp/python-lsp-server/develop/CHANGELOG.md"
distfiles="${PYPI_SITE}/p/python-lsp-server/python-lsp-server-${version}.tar.gz"
-checksum=d75cdff9027c4212e5b9e861e9a0219219c8e2c69508d9f24949951dabd0dc1b
+checksum=67473bb301f35434b5fa8b21fc5ed5fac27dc8a8446ccec8bae456af52a0aef6
do_check() {
python3 -m pytest \
--ignore=test/plugins/test_completion.py \
--ignore=test/plugins/test_pydocstyle_lint.py \
--ignore=test/plugins/test_rope_rename.py \
- --ignore=test/plugins/test_yapf_format.py
+ --ignore=test/plugins/test_yapf_format.py \
+ --ignore=test/plugins/test_autoimport.py
}
post_install() {
From dcb8b38b7199594c6dcf6815b316e696ce42cd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 26 Jan 2023 15:13:23 +0100
Subject: [PATCH 351/356] comrak: update to 0.16.0.
---
srcpkgs/comrak/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/comrak/template b/srcpkgs/comrak/template
index 82bf9b884fb9..de5c8679d4bd 100644
--- a/srcpkgs/comrak/template
+++ b/srcpkgs/comrak/template
@@ -1,24 +1,21 @@
# Template file for 'comrak'
pkgname=comrak
-version=0.15.0
+version=0.16.0
revision=1
build_style=cargo
short_desc="CommonMark + GFM compatible Markdown parser and renderer"
maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="BSD-2-Clause"
homepage="https://github.com/kivikakk/comrak"
+changelog="https://github.com/kivikakk/comrak/raw/main/changelog.txt"
distfiles="https://github.com/kivikakk/comrak/archive/${version}.tar.gz"
-checksum=ffac6192d71733f0fa9a1097b98e80c8ad0bb34ce8bec6afc2502b58aa1012b7
+checksum=72f7ecbef6df715f14a61242fea0cbb450bbf1d10eb38acd99502daed04f8c07
case "$XBPS_TARGET_MACHINE" in
# Tests don't compile on i686: ran out of registers during register allocation
i686*) make_check=no ;;
esac
-post_patch() {
- cargo update -p autocfg:1.0.1 --precise 1.1.0
-}
-
post_install() {
vlicense COPYING
}
From d3a6c22db363568e57e86742379367b9e80f5ceb Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 5 Feb 2023 21:49:15 +0100
Subject: [PATCH 352/356] hyperrogue: update to 12.1i
---
srcpkgs/hyperrogue/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hyperrogue/template b/srcpkgs/hyperrogue/template
index 536d420d319f..6a08eb8fba8c 100644
--- a/srcpkgs/hyperrogue/template
+++ b/srcpkgs/hyperrogue/template
@@ -1,6 +1,6 @@
# Template file for 'hyperrogue'
pkgname=hyperrogue
-version=12.1h
+version=12.1i
revision=1
build_style=gnu-makefile
makedepends="glew-devel libpng-devel SDL-devel SDL_gfx-devel SDL_mixer-devel
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later, CC-BY-SA-4.0, CC-BY-SA-3.0, CC-BY-3.0, Public Domain"
homepage="https://www.roguetemple.com/z/hyper/"
changelog="https://raw.githubusercontent.com/zenorogue/hyperrogue/master/changelog.txt"
distfiles="https://github.com/zenorogue/hyperrogue/archive/refs/tags/v${version}.tar.gz"
-checksum=e13cd2a898f8cb216e30bafc2701d6d7a61ddde3fa2ccfe9ddf120436da72bc7
+checksum=8373264a1bbb9a77a1a71b6e2a544199ef3014f1fa7a661aab2bc6d8ba689817
nocross="Generates code from build output that must run on host"
# SDL_gfx-devel headers require that SDL.h be under the header search paths,
From ca5819d0ddd615853a6f7e7444300a75daad8d94 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 5 Feb 2023 15:44:48 -0500
Subject: [PATCH 353/356] kanshi: update to 1.3.1
---
srcpkgs/kanshi/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template
index b3a242a9df4b..e1dac36fc238 100644
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@@ -1,7 +1,7 @@
# Template file for 'kanshi'
pkgname=kanshi
-version=1.3.0
-revision=2
+version=1.3.1
+revision=1
build_style=meson
hostmakedepends="pkg-config scdoc wayland-devel"
makedepends="wayland-devel libvarlink-devel"
@@ -9,8 +9,9 @@ short_desc="Output profiles automatically enabled/disabled on hotplug"
maintainer="Stacy Harper <contact@stacyharper.net>"
license="MIT"
homepage="https://wayland.emersion.fr/kanshi/"
+changelog="https://git.sr.ht/~emersion/kanshi/refs"
distfiles="https://git.sr.ht/~emersion/kanshi/archive/v${version}.tar.gz"
-checksum=67a4fe896d97b7fbd3fcc51aab0fae550b4130b2df2b1df2a4d0e8d3221fe604
+checksum=733b2bdc8e57d0040f6f0ad91097548ced0188e8ae23b64fae96638a2be74375
post_install() {
vlicense LICENSE
From 4adb6b30ce3e3efa1f0c70b6d733cbd0b8901285 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 5 Feb 2023 13:22:07 +0100
Subject: [PATCH 354/356] chroma: update to 2.5.0.
---
srcpkgs/chroma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index a898b4192e70..94993e4d7afc 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
# Template file for 'chroma'
pkgname=chroma
-version=2.4.0
+version=2.5.0
revision=1
build_wrksrc="cmd/chroma"
build_style=go
@@ -11,7 +11,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
license="MIT"
homepage="https://github.com/alecthomas/chroma"
distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=15289ce536e734767e06816c6bb33537121c3b70c2ecbc3431afe95942bb0fce
+checksum=ad0bce3d6ba4397a866e5c8728c146fb370a2b0adb1d35fccdf7d515a9c7f553
do_check() {
go test -v
From 34725bc9e6ecf5a93a899f4ad80529cccca2cd7a Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 10 Feb 2023 21:37:20 +0100
Subject: [PATCH 355/356] litterbox: update to 1.9.
---
srcpkgs/litterbox/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 5017f7d5a6cf..5031c4fbc4ee 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,7 +1,7 @@
# Template file for 'litterbox'
pkgname=litterbox
-version=1.8
-revision=4
+version=1.9
+revision=1
build_style=gnu-configure
make_build_target="all"
hostmakedepends="pkg-config"
@@ -10,5 +10,6 @@ short_desc="IRC logger"
maintainer="Allen Sobot <chilledfrogs@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://git.causal.agency/litterbox/"
+changelog="https://git.causal.agency/litterbox/tag/?h=${version}"
distfiles="https://git.causal.agency/litterbox/snapshot/litterbox-$version.tar.gz"
-checksum=54bebc3750f390813a3720eb0301ac4d852b30cb7b7605b178ed59aa51688552
+checksum=ffb02ca75c743ce88593e30236b9ffbf808c1bcfc194459c52b2df70e0e9e5a9
From 01844cf348dc3d7618a3e431dc8e702bb3ef185d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:46:48 +0530
Subject: [PATCH 356/356] Manual.md: add AGPL & X11 to list of licenses which
needs to be included
---
Manual.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Manual.md b/Manual.md
index 31494036d5e2..0b6b5ab645fc 100644
--- a/Manual.md
+++ b/Manual.md
@@ -422,7 +422,7 @@ Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, cus
and thus have and require no license should use
`Public Domain`.
- Note: `MIT`, `BSD`, `ISC` and custom licenses
+ Note: `AGPL`, `MIT`, `BSD`, `ISC`, `X11`, and custom licenses
require the license file to be supplied with the binary package.
- `maintainer` A string in the form of `name <user@domain>`. The email for this field
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (4 preceding siblings ...)
2023-02-11 0:12 ` TrueTechie
@ 2023-02-11 0:27 ` TrueTechie
2023-02-11 0:27 ` [PR PATCH] [Updated] " TrueTechie
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-11 0:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 954 bytes --]
There's a closed pull request on the void-packages repository
budgie-desktop: update to 10.7.
https://github.com/void-linux/void-packages/pull/41944
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (5 preceding siblings ...)
2023-02-11 0:27 ` [PR PATCH] [Closed]: " TrueTechie
@ 2023-02-11 0:27 ` TrueTechie
2023-02-11 0:34 ` TrueTechie
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-11 0:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (6 preceding siblings ...)
2023-02-11 0:27 ` [PR PATCH] [Updated] " TrueTechie
@ 2023-02-11 0:34 ` TrueTechie
2023-02-12 1:01 ` TrueTechie
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-11 0:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
There is an updated pull request by TrueTechie against master on the void-packages repository
https://github.com/TrueTechie/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 1738 bytes --]
From 6c9b0e77de67848c40ce8b21e88d81311adc7cef Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Fri, 10 Feb 2023 19:33:36 -0500
Subject: [PATCH] budgie-desktop: update to 10.7
---
srcpkgs/budgie-desktop/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..dafe5e94b48e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (7 preceding siblings ...)
2023-02-11 0:34 ` TrueTechie
@ 2023-02-12 1:01 ` TrueTechie
2023-02-14 20:25 ` [PR REVIEW] " paper42
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: TrueTechie @ 2023-02-12 1:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by TrueTechie on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1426912322
Comment:
> please rebase this PR on top of master to get rid of the merge commit
Fixed!
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (8 preceding siblings ...)
2023-02-12 1:01 ` TrueTechie
@ 2023-02-14 20:25 ` paper42
2023-02-14 22:14 ` [PR PATCH] [Updated] " BlindRepublic
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: paper42 @ 2023-02-14 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#discussion_r1106334557
Comment:
wrap at 80 columns
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (9 preceding siblings ...)
2023-02-14 20:25 ` [PR REVIEW] " paper42
@ 2023-02-14 22:14 ` BlindRepublic
2023-02-14 22:19 ` BlindRepublic
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-14 22:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There is an updated pull request by BlindRepublic against master on the void-packages repository
https://github.com/BlindRepublic/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 1862 bytes --]
From 4301585f9017349d5f1ea46c0376ae3f2f6abaf0 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Fri, 10 Feb 2023 19:33:36 -0500
Subject: [PATCH] budgie-desktop: update to 10.7
Fix word wrap
---
srcpkgs/budgie-desktop/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..1db7c6f86914 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,13 +1,13 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
- budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
+ sassc budgie-screensaver"
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel accountsservice-devel libpeas-devel
libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (10 preceding siblings ...)
2023-02-14 22:14 ` [PR PATCH] [Updated] " BlindRepublic
@ 2023-02-14 22:19 ` BlindRepublic
2023-02-14 22:22 ` BlindRepublic
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-14 22:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There is an updated pull request by BlindRepublic against master on the void-packages repository
https://github.com/BlindRepublic/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 2285 bytes --]
From dd8a242ac2057f827be3c5d5dbbbf7dfa546929c Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Fri, 10 Feb 2023 19:33:36 -0500
Subject: [PATCH] budgie-desktop: update to 10.7
---
srcpkgs/budgie-desktop/template | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..d1fa30f1ced4 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,16 +1,17 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
- budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
- libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
+ sassc budgie-screensaver"
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
+ accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
+ gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
+ gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel
+ libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (11 preceding siblings ...)
2023-02-14 22:19 ` BlindRepublic
@ 2023-02-14 22:22 ` BlindRepublic
2023-02-14 23:20 ` BlindRepublic
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-14 22:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There is an updated pull request by BlindRepublic against master on the void-packages repository
https://github.com/BlindRepublic/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 2282 bytes --]
From 3185d913b270702aaa3d3251dadf35d4a9969ec6 Mon Sep 17 00:00:00 2001
From: TrueTechie <TrueTechie@mailo.com>
Date: Fri, 10 Feb 2023 19:33:36 -0500
Subject: [PATCH] budgie-desktop: update to 10.7
---
srcpkgs/budgie-desktop/template | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..bf6dd6bc7e72 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,16 +1,17 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
- budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
- libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
+ sassc budgie-screensaver"
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
+ accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
+ gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
+ gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel
+ libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (12 preceding siblings ...)
2023-02-14 22:22 ` BlindRepublic
@ 2023-02-14 23:20 ` BlindRepublic
2023-02-24 0:37 ` [PR PATCH] [Updated] " BlindRepublic
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-14 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by BlindRepublic on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1430521042
Comment:
Apologies for the extra commits, mixed up whitespace.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (13 preceding siblings ...)
2023-02-14 23:20 ` BlindRepublic
@ 2023-02-24 0:37 ` BlindRepublic
2023-02-24 0:47 ` BlindRepublic
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-24 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There is an updated pull request by BlindRepublic against master on the void-packages repository
https://github.com/BlindRepublic/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 2348 bytes --]
From f066987d9f97902de2bfb76022f3d74fd326a832 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:46:48 +0530
Subject: [PATCH] Manual.md: add AGPL & X11 to list of licenses which needs to
be included
budgie-desktop: update to 10.7
---
srcpkgs/budgie-desktop/template | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..bf6dd6bc7e72 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,16 +1,17 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
- budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
- libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
+ sassc budgie-screensaver"
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
+ accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
+ gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
+ gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel
+ libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (14 preceding siblings ...)
2023-02-24 0:37 ` [PR PATCH] [Updated] " BlindRepublic
@ 2023-02-24 0:47 ` BlindRepublic
2023-03-03 4:51 ` [PR PATCH] [Closed]: " BlindRepublic
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-02-24 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]
There is an updated pull request by BlindRepublic against master on the void-packages repository
https://github.com/BlindRepublic/void-packages budgie-10.7
https://github.com/void-linux/void-packages/pull/41944
budgie-desktop: update to 10.7.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/41944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-budgie-10.7-41944.patch --]
[-- Type: text/x-diff, Size: 3519 bytes --]
From 1a830753af9dcf3ea3ca2a9baeeb8d4ae7ee6656 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 7 Nov 2022 15:46:48 +0530
Subject: [PATCH 1/2] Manual.md: add AGPL & X11 to list of licenses which needs
to be included
budgie-desktop: update to 10.7
---
srcpkgs/budgie-desktop/template | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index d21c3b94badc..bf6dd6bc7e72 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,16 +1,17 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.6.4
-revision=2
+version=10.7
+revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
- budgie-screensaver"
-makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
- libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
- upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel
- gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection
+ sassc budgie-screensaver"
+makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel
+ accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel
+ gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel
+ gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libuuid-devel
+ libupower-glib3"
depends="gnome-session gnome-settings-daemon budgie-control-center elogind
gnome-themes-extra budgie-screensaver budgie-desktop-view"
short_desc="Modern desktop environment from the Solus Project"
@@ -18,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=7775699ea64d7317e4004b751ccd5ab1e38df172ce17abc241b8a22bb31c1cdb
+checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
budgie-desktop-devel_package() {
short_desc+=" - development files"
From bec59ec429886e19813f1d8247cd490acf60f342 Mon Sep 17 00:00:00 2001
From: Elliot <BlindRepublic@mailo.com>
Date: Thu, 23 Feb 2023 19:47:27 -0500
Subject: [PATCH 2/2] budgie-desktop: update to 10.7.1.
---
srcpkgs/budgie-desktop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index bf6dd6bc7e72..7e48276a73a2 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
-version=10.7
+version=10.7.1
revision=1
build_style=meson
build_helper=gir
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=348e8e17b074885d50d22dca609808c44762591ad3c37a257a6565c8c8d92d51
+checksum=f8b277fb674f4c9e9d1dac9e45a7f93a1364d2f25cb1b3b513ec8154cfd7d6bd
budgie-desktop-devel_package() {
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (15 preceding siblings ...)
2023-02-24 0:47 ` BlindRepublic
@ 2023-03-03 4:51 ` BlindRepublic
2023-03-05 18:02 ` JoshStrobl
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-03-03 4:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 954 bytes --]
There's a closed pull request on the void-packages repository
budgie-desktop: update to 10.7.
https://github.com/void-linux/void-packages/pull/41944
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (16 preceding siblings ...)
2023-03-03 4:51 ` [PR PATCH] [Closed]: " BlindRepublic
@ 2023-03-05 18:02 ` JoshStrobl
2023-03-05 22:47 ` BlindRepublic
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: JoshStrobl @ 2023-03-05 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 745 bytes --]
New comment by JoshStrobl on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1455160562
Comment:
Hey @BlindRepublic, I noticed that this was just closed without an update to 10.7 or 10.7.1, and missing some updates for other Budgie bits. Any chance you could provide some clarification on if the plan is to get this updated in Void? I'd like to get it added to the new [Buddies of Budgie "Getting Budgie" page](https://docs.buddiesofbudgie.org/user/getting-budgie on our documentation center, but want to make sure it has a maintainer behind it first before people risk installing an old release.
I don't use Void myself but do let me know if there is something I can do to help you.
Thanks!
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (17 preceding siblings ...)
2023-03-05 18:02 ` JoshStrobl
@ 2023-03-05 22:47 ` BlindRepublic
2023-03-06 5:24 ` paper42
2023-03-06 17:50 ` BlindRepublic
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-03-05 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]
New comment by BlindRepublic on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1455231976
Comment:
> Hey @BlindRepublic, I noticed that this was just closed without an update to 10.7 or 10.7.1, and missing some updates for other Budgie bits. Any chance you could provide some clarification on if the plan is to get this updated in Void? I'd like to get it added to the new [Buddies of Budgie "Getting Budgie" page](https://docs.buddiesofbudgie.org/user/getting-budgie on our documentation center, but want to make sure it has a maintainer behind it first before people risk installing an old release.
>
> I don't use Void myself but do let me know if there is something I can do to help you.
>
> Thanks!
Hi @JoshStrobl,
Budgie doesn't have a maintainer on Void. I'm just a regular user who likes the desktop. I don't have much experience with Github and I kind of messed up my repo. I fixed the issue afterwards, but this has stayed under review for three weeks...
Either way I appreciate you reaching out. I'll re-open it later today when I have time and try to fix it, but that's about as much as I can do.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (18 preceding siblings ...)
2023-03-05 22:47 ` BlindRepublic
@ 2023-03-06 5:24 ` paper42
2023-03-06 17:50 ` BlindRepublic
20 siblings, 0 replies; 22+ messages in thread
From: paper42 @ 2023-03-06 5:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1455476422
Comment:
We are definitely interested in merging this update when this PR doesn't contain unrelated changes and isn't closed.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: budgie-desktop: update to 10.7.
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
` (19 preceding siblings ...)
2023-03-06 5:24 ` paper42
@ 2023-03-06 17:50 ` BlindRepublic
20 siblings, 0 replies; 22+ messages in thread
From: BlindRepublic @ 2023-03-06 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
New comment by BlindRepublic on void-packages repository
https://github.com/void-linux/void-packages/pull/41944#issuecomment-1456636932
Comment:
> We are definitely interested in merging this update when this PR doesn't contain unrelated changes and isn't closed.
Okay... I had to force push and thus could not reopen this request. I won't do so again, but I recreated one at #42621.
Apologies for all of my mistakes.
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2023-03-06 17:50 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-29 19:57 [PR PATCH] budgie-desktop: update to 10.7 TrueTechie
2023-02-09 1:18 ` [PR PATCH] [Updated] " TrueTechie
2023-02-10 22:48 ` paper42
2023-02-10 23:59 ` [PR PATCH] [Updated] " TrueTechie
2023-02-11 0:12 ` TrueTechie
2023-02-11 0:12 ` TrueTechie
2023-02-11 0:27 ` [PR PATCH] [Closed]: " TrueTechie
2023-02-11 0:27 ` [PR PATCH] [Updated] " TrueTechie
2023-02-11 0:34 ` TrueTechie
2023-02-12 1:01 ` TrueTechie
2023-02-14 20:25 ` [PR REVIEW] " paper42
2023-02-14 22:14 ` [PR PATCH] [Updated] " BlindRepublic
2023-02-14 22:19 ` BlindRepublic
2023-02-14 22:22 ` BlindRepublic
2023-02-14 23:20 ` BlindRepublic
2023-02-24 0:37 ` [PR PATCH] [Updated] " BlindRepublic
2023-02-24 0:47 ` BlindRepublic
2023-03-03 4:51 ` [PR PATCH] [Closed]: " BlindRepublic
2023-03-05 18:02 ` JoshStrobl
2023-03-05 22:47 ` BlindRepublic
2023-03-06 5:24 ` paper42
2023-03-06 17:50 ` BlindRepublic
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).