* Re: [PR PATCH] [Updated] New package: swww-v0.7.2
2023-04-14 14:37 [PR PATCH] Added swww package Positive205
` (8 preceding siblings ...)
2023-04-15 22:10 ` [PR PATCH] [Updated] " Positive205
@ 2023-04-15 22:26 ` Positive205
2023-04-15 22:41 ` Positive205
` (38 subsequent siblings)
48 siblings, 0 replies; 50+ messages in thread
From: Positive205 @ 2023-04-15 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
There is an updated pull request by Positive205 against master on the void-packages repository
https://github.com/Positive205/void-packages new-packages
https://github.com/void-linux/void-packages/pull/43441
New package: swww-v0.7.2
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### 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/43441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new-packages-43441.patch --]
[-- Type: text/x-diff, Size: 127522 bytes --]
From 87cbb13eb704469696ff81ef5a7964c40286375c Mon Sep 17 00:00:00 2001
From: Faizudin bin Taufik Tuah <faizudinproman@gmail.com>
Date: Sat, 15 Apr 2023 23:53:25 +0800
Subject: [PATCH 1/2] Fixed vbin() path
---
srcpkgs/swww/template | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 srcpkgs/swww/template
diff --git a/srcpkgs/swww/template b/srcpkgs/swww/template
new file mode 100644
index 000000000000..1ba1c5694ba0
--- /dev/null
+++ b/srcpkgs/swww/template
@@ -0,0 +1,34 @@
+# Template file for 'swww'
+pkgname=swww
+version=0.7.2
+revision=1
+build_style=cargo
+hostmakedepends="rust cargo"
+makedepends="scdoc pkg-config libxkbcommon-devel"
+depends="lz4"
+short_desc="Efficient animated wallpaper daemon for wayland, controlled at runtime"
+maintainer="Posi+ive <faizudinproman@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Horus645/swww"
+changelog="https://github.com/Horus645/swww/blob/main/CHANGELOG.md"
+distfiles="https://github.com/Horus645/swww/archive/refs/tags/v${version}.tar.gz"
+checksum=bb961577387aefd64b54090b3a7d0db5a393120edc24fe71d149e77fe132025c
+
+do_install() {
+ vbin target/${XBPS_TARGET_MACHINE}-unknown-linux-gnu/release/swww
+ vbin target/${XBPS_TARGET_MACHINE}-unknown-linux-gnu/release/swww-daemon
+ vman doc/generated/swww-clear.1
+ vman doc/generated/swww-daemon.1
+ vman doc/generated/swww-img.1
+ vman doc/generated/swww-init.1
+ vman doc/generated/swww-kill.1
+ vman doc/generated/swww-query.1
+ vman doc/generated/swww.1
+
+ vcompletion completions/swww.bash bash
+ vcompletion completions/swww.fish fish
+}
+
+post_build() {
+ ./doc/gen.sh
+}
From 971e92c08eb3198e555a1f1ccb053ac1a7243032 Mon Sep 17 00:00:00 2001
From: Faizudin bin Taufik Tuah <faizudinproman@gmail.com>
Date: Sun, 16 Apr 2023 06:19:12 +0800
Subject: [PATCH 2/2] Revert "Merge branch 'void-linux:master' into
new-packages"
This reverts commit 4e8e9d898111a54e5a7778af2cf980e63e30e07b, reversing
changes made to 87cbb13eb704469696ff81ef5a7964c40286375c.
---
common/shlibs | 1 -
srcpkgs/bluedevil/template | 4 +-
srcpkgs/breeze-gtk/template | 4 +-
srcpkgs/breeze/template | 4 +-
...cc_rewrite_fqn-avoid-heap-corruption.patch | 65 -----
srcpkgs/chroot-distcc/patches/gcc-10.patch | 15 --
srcpkgs/chroot-distcc/template | 19 +-
srcpkgs/cloud-hypervisor/template | 4 +-
srcpkgs/cointop/template | 12 +-
srcpkgs/cproto/template | 6 +-
srcpkgs/cracklib/template | 8 +-
srcpkgs/cyrus-sasl/template | 10 +-
srcpkgs/dar/patches/fix-configure.patch | 36 +++
srcpkgs/dar/patches/musl-getopt.patch | 19 ++
srcpkgs/dar/template | 17 +-
srcpkgs/deheader/template | 9 +-
srcpkgs/dejagnu/template | 13 +-
...cc_rewrite_fqn-avoid-heap-corruption.patch | 65 -----
srcpkgs/distcc/patches/gcc-10.patch | 15 --
srcpkgs/distcc/patches/python-3.9.patch | 55 -----
srcpkgs/distcc/template | 20 +-
srcpkgs/docker-cli/template | 6 +-
srcpkgs/dropbear/template | 4 +-
srcpkgs/editorconfig/template | 4 +-
...flags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch | 54 ++++
...strncpy-by-memcpy-to-fix-some-GCC8-w.patch | 111 +++++++++
srcpkgs/efivar/patches/build-tester.patch | 10 -
.../patches/fix-compat-glibc-2.36.patch | 55 +++++
srcpkgs/efivar/patches/lfs64.patch | 46 ----
srcpkgs/efivar/patches/musl-compat.patch | 231 ------------------
srcpkgs/efivar/template | 34 +--
srcpkgs/elinks/template | 4 +-
srcpkgs/encodings/template | 4 +-
.../patches/default-constructor.patch | 27 ++
srcpkgs/flatpak-kcm/template | 4 +-
srcpkgs/font-go-ttf/template | 9 +-
srcpkgs/freeciv/template | 8 +-
srcpkgs/kactivitymanagerd/template | 4 +-
srcpkgs/kde-cli-tools/template | 4 +-
srcpkgs/kde-gtk-config5/template | 4 +-
srcpkgs/kdecoration/template | 4 +-
srcpkgs/kdeplasma-addons5/template | 6 +-
srcpkgs/kgamma5/template | 4 +-
srcpkgs/khotkeys/template | 4 +-
srcpkgs/kimageformats/template | 4 +-
srcpkgs/kinfocenter/template | 4 +-
srcpkgs/kmenuedit/template | 4 +-
srcpkgs/kpipewire/template | 4 +-
srcpkgs/kscreen/template | 4 +-
srcpkgs/kscreenlocker/template | 4 +-
srcpkgs/ksshaskpass/template | 4 +-
srcpkgs/ksystemstats/template | 6 +-
srcpkgs/kubernetes/template | 6 +-
srcpkgs/kwallet-pam/template | 4 +-
srcpkgs/kwayland-integration/template | 4 +-
srcpkgs/kwin/template | 6 +-
srcpkgs/kwrited/template | 4 +-
srcpkgs/layer-shell-qt/template | 4 +-
srcpkgs/libkscreen/template | 4 +-
srcpkgs/libksysguard/template | 6 +-
srcpkgs/libsasl/patches/CVE-2019-19906.patch | 15 ++
srcpkgs/libsasl/patches/cross.patch | 41 ++++
.../patches/cyrus-sasl-2.1.27-as_needed.patch | 29 +++
...yrus-sasl-2.1.27-avoid_pic_overwrite.patch | 20 ++
srcpkgs/libsasl/template | 10 +-
...x-use-after-free-in-fw-features-query.diff | 40 ---
srcpkgs/linux6.2/template | 4 +-
srcpkgs/milou/template | 4 +-
srcpkgs/moby/template | 6 +-
srcpkgs/nginx/template | 17 +-
srcpkgs/oxygen-sounds/template | 12 -
srcpkgs/oxygen/template | 4 +-
srcpkgs/pijul/template | 2 +-
srcpkgs/plasma-browser-integration/template | 4 +-
srcpkgs/plasma-desktop/template | 4 +-
srcpkgs/plasma-disks/template | 4 +-
srcpkgs/plasma-firewall/template | 4 +-
srcpkgs/plasma-integration/template | 4 +-
srcpkgs/plasma-nm/template | 4 +-
srcpkgs/plasma-pa/template | 4 +-
srcpkgs/plasma-sdk/template | 4 +-
srcpkgs/plasma-systemmonitor/template | 7 +-
srcpkgs/plasma-thunderbolt/template | 4 +-
srcpkgs/plasma-vault/template | 6 +-
srcpkgs/plasma-workspace-wallpapers/template | 6 +-
srcpkgs/plasma-workspace/template | 8 +-
srcpkgs/polkit-kde-agent/template | 6 +-
srcpkgs/powerdevil/template | 6 +-
srcpkgs/python3-PyICU/template | 6 +-
srcpkgs/python3-filelock/template | 6 +-
srcpkgs/runit-void/template | 8 +-
srcpkgs/scrot/template | 4 +-
srcpkgs/sddm-kcm/template | 6 +-
srcpkgs/systemsettings/template | 6 +-
srcpkgs/terraform/template | 6 +-
srcpkgs/terragrunt/template | 6 +-
srcpkgs/uwsgi/patches/musl-fix-python.patch | 13 +
srcpkgs/uwsgi/patches/musl-locking-fix.patch | 12 +
srcpkgs/uwsgi/patches/python-3.11.patch | 188 ++++++++++++++
srcpkgs/uwsgi/template | 12 +-
srcpkgs/xdg-desktop-portal-kde/template | 6 +-
101 files changed, 857 insertions(+), 815 deletions(-)
delete mode 100644 srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
delete mode 100644 srcpkgs/chroot-distcc/patches/gcc-10.patch
create mode 100644 srcpkgs/dar/patches/fix-configure.patch
create mode 100644 srcpkgs/dar/patches/musl-getopt.patch
delete mode 100644 srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
delete mode 100644 srcpkgs/distcc/patches/gcc-10.patch
delete mode 100644 srcpkgs/distcc/patches/python-3.9.patch
create mode 100644 srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
create mode 100644 srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
delete mode 100644 srcpkgs/efivar/patches/build-tester.patch
create mode 100644 srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch
delete mode 100644 srcpkgs/efivar/patches/lfs64.patch
delete mode 100644 srcpkgs/efivar/patches/musl-compat.patch
create mode 100644 srcpkgs/flatpak-kcm/patches/default-constructor.patch
create mode 100644 srcpkgs/libsasl/patches/CVE-2019-19906.patch
create mode 100644 srcpkgs/libsasl/patches/cross.patch
create mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
create mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
delete mode 100644 srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
delete mode 100644 srcpkgs/oxygen-sounds/template
create mode 100644 srcpkgs/uwsgi/patches/musl-fix-python.patch
create mode 100644 srcpkgs/uwsgi/patches/musl-locking-fix.patch
create mode 100644 srcpkgs/uwsgi/patches/python-3.11.patch
diff --git a/common/shlibs b/common/shlibs
index df30e9a925c0..605a8249c8e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1745,7 +1745,6 @@ libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
libefivar.so.1 libefivar-31_1
libefiboot.so.1 libefivar-31_1
-libefisec.so.1 libefivar-38_1
libportaudio.so.2 portaudio-19.20140130_1
libportaudiocpp.so.0 portaudio-cpp-19.20140130_1
libdar.so.6000 libdar-2.6.6_1
diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index decb0ff31839..38eeb9b1fc6a 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
# Template file for 'bluedevil'
pkgname=bluedevil
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/bluedevil"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=101871f56da19ae667d61ec32addc446eb94f81ce0c541cf0367de96c3c896a3
+checksum=2b302e45090a2470428594e8617ee18f4bfd651ec5dd96aef0ab8e2bdb161bd9
diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 04bde046f314..92d7b314716b 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
# Template file for 'breeze-gtk'
pkgname=breeze-gtk
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules sassc python3 python3-cairo qt5-devel"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/breeze-gtk"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cb967dcd258065f87a9cb43f8022378e7ead1db83590ca2eea4e77196226999f
+checksum=37b9b189c04ab21dc56c3e6b7447c454028beaf7f0abdcaa25983b59733fbf79
diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 3f4c8b43b157..a49cfb2cd1b0 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
# Template file for 'breeze'
pkgname=breeze
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/breeze"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=62d80ebd690c7822bf05b19bec8b37af67cc1cd4bb3f38d2a88d8360fd6b1901
+checksum=7764f5bcce91e487c8756ab7c0d8a14d2bc36f97c8c33f82a70d81380e78798a
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"
diff --git a/srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch b/srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
deleted file mode 100644
index 5d0a86d2f1aa..000000000000
--- a/srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 879b71d6e95673e58d33f6c3c341a893ee307161
-Author: Alexey Sheplyakov <asheplyakov@yandex.ru>
-Date: Sat Jul 10 22:18:14 2021 +0400
-
- dcc_gcc_rewrite_fqn: avoid heap corruption
-
- On ALT Linux I've run into the following bug:
-
- distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
- free(): invalid next size (fast)
- Aborted (core dumped)
-
- Apparently dcc_gcc_rewrite writes beyond the allocated memory:
-
- valgrind --leak-check=full -v ./distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
-
- ==11382== ERROR SUMMARY: 53 errors from 5 contexts (suppressed: 0 from 0)
- ==11382==
- ==11382== 1 errors in context 1 of 5:
- ==11382== Invalid write of size 1
- ==11382== at 0x4C349D8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382== Address 0x544e828 is 1 bytes after a block of size 23 alloc'd
- ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382==
- ==11382==
- ==11382== 1 errors in context 2 of 5:
- ==11382== Invalid write of size 1
- ==11382== at 0x4C349C8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382== Address 0x544e827 is 0 bytes after a block of size 23 alloc'd
- ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
-
- and ALT Linux' hardened glibc does not quite like that.
- Correctly compute the `newcmd_len` to avoid the problem.
-
- ALTBUG: #40425
-
-diff --git a/src/compile.c b/src/compile.c
-index 34964566fdd6..26d7d1821501 100644
---- a/src/compile.c
-+++ b/src/compile.c
-@@ -584,7 +584,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
- return -ENOENT;
-
-
-- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1);
-+ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1;
- newcmd = malloc(newcmd_len);
- if (!newcmd)
- return -ENOMEM;
diff --git a/srcpkgs/chroot-distcc/patches/gcc-10.patch b/srcpkgs/chroot-distcc/patches/gcc-10.patch
deleted file mode 100644
index 599de51e0d92..000000000000
--- a/srcpkgs/chroot-distcc/patches/gcc-10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream: Should be
-Reason: Fixes compilation under gcc-10 which has -fno-common
-
-diff --git a/src/stats.c b/src/stats.c
-index 35dbf7d..76bfbee 100644
---- a/src/stats.c
-+++ b/src/stats.c
-@@ -82,7 +82,7 @@ struct statsdata {
- char compiler[MAX_FILENAME_LEN];
- };
-
--const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
-+extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
- "COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN",
- "OTHER" };
diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index 00810870a7be..8391ec04cf75 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -1,6 +1,6 @@
# Template file for 'chroot-distcc'
pkgname=chroot-distcc
-version=3.4
+version=3.3.3
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -12,15 +12,24 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
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=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
+checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
repository=bootstrap
conflicts="distcc>=0"
+CFLAGS="-fcommon"
if [ "$CHROOT_READY" ]; then
makedepends="binutils-devel"
fi
+pre_configure() {
+ # Copy files generated by package distcc running autogen.sh
+ # Manual update is required for every new version
+ cp -p "${FILESDIR}"/configure ${wrksrc}
+ cp -p "${FILESDIR}"/Makefile.in ${wrksrc}
+ cp -p "${FILESDIR}"/config.h.in ${wrksrc}/src
+}
+
post_install() {
local f x
# Remove useless files.
@@ -30,13 +39,13 @@ post_install() {
# gcc wrappers
vmkdir usr/lib/distcc/bin
- for f in gcc cc c++ g++ cpp; do
+ for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
done
# cross-gcc wrappers
for x in arm-linux-gnueabi arm-linux-gnueabihf armv7l-linux-gnueabihf \
- arm-linux-musleabihf armv7l-linux-musleabihf aarch64-linux-gnu aarch64-linux-musl; do
- for f in gcc cc c++ g++ cpp; do
+ arm-linux-musleabihf armv7l-linux-musleabihf; do
+ for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index dfb482606c31..94773391890e 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
# Template file for 'cloud-hypervisor'
pkgname=cloud-hypervisor
-version=31.0
+version=30.0
revision=1
archs="aarch64* x86_64*"
build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0, BSD-3-Clause"
homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=a205bb62f22c98ed6d1d2040139c36404c0bda8ca8ad19a1e1aa0d30eb81ff42
+checksum=67f56f48b1a6414fc97b6f7b5037b94317d769fbf4ea78b1cf0ee27fe6a09460
post_install() {
vbin scripts/ch-trace-visualiser.py ch-trace-visualiser
diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index 343f2ad20a49..d5438bc845cb 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -1,12 +1,12 @@
# Template file for 'cointop'
pkgname=cointop
-version=1.6.10
-revision=1
+version=1.6.8
+revision=2
build_style=go
-go_import_path="github.com/cointop-sh/cointop"
+go_import_path="github.com/miguelmota/${pkgname}"
short_desc="Terminal based application for tracking cryptocurrencies"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
-homepage="https://github.com/cointop-sh/cointop"
-distfiles="https://github.com/cointop-sh/cointop/archive/v${version}.tar.gz"
-checksum=18da0d25288deec7156ddd1d6923960968ab4adcdc917f85726b97d555d9b1b7
+homepage="https://github.com/miguelmota/cointop"
+distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"
+checksum=ffbec93e12d62172c9859e673e7a4e49068c893450193cdea5c1f5f4a724c9f3
diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index f60ddecbe66f..aa1186238c74 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,6 +1,6 @@
# Template file for 'cproto'
pkgname=cproto
-version=4.7v
+version=4.7u
revision=1
build_style=gnu-configure
hostmakedepends="flex"
@@ -9,5 +9,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Public Domain"
homepage="https://invisible-island.net/cproto/cproto.html"
changelog="https://invisible-island.net/cproto/CHANGES"
-distfiles="https://invisible-island.net/archives/cproto/cproto-${version}.tgz"
-checksum=f3dec3f6102770196976459c4b44ac27355f6120da76e5231ec1323e379d1511
+distfiles="https://invisible-island.net/archives/cproto/${pkgname}-${version}.tgz"
+checksum=64ebbbcc5e0501aff296f431d06f9fb70863afe5b0ce66c3b3479072914fc51e
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index 6f49ca33094e..b976ed48e1b2 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -1,7 +1,7 @@
# Template file for 'cracklib'
pkgname=cracklib
-version=2.9.11
-revision=1
+version=2.9.7
+revision=2
create_wrksrc=yes
build_style=gnu-configure
configure_args="--disable-static"
@@ -12,8 +12,8 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/cracklib/cracklib"
distfiles="https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-${version}.tar.gz
https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz"
-checksum="6213b986a5209fc0d4ca93734e349b8f66b36bfe9a3fae6eead14a15d82a68dc
- a68a711a3135739d7b67e9f360b33f0d4eccf9bd7fac4d17c0d5e456a91c517a"
+checksum="8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd
+ 7f0c45faf84a2494f15d1e2720394aca4a379163a70c4acad948186c0047d389"
lib32disabled=yes
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 3ee25aeb1178..b259152139fd 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,8 +1,7 @@
# Template file for 'cyrus-sasl'
-# keep in sync with libsasl
pkgname=cyrus-sasl
-version=2.1.28
-revision=1
+version=2.1.27
+revision=9
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
@@ -11,8 +10,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
--enable-sql --enable-ldapdb --disable-macos-framework --with-pam
--with-saslauthd=/run/saslauthd --with-ldap --with-devrandom=/dev/urandom
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
- --with-mysql=${XBPS_CROSS_BASE}/usr
- ac_cv_gssapi_supports_spnego=yes"
+ --with-mysql=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool groff pkg-config"
makedepends="libsasl-devel openssl-devel db-devel libldap-devel
mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
@@ -23,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause-Attribution"
homepage="https://www.cyrusimap.org/sasl/"
distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${version}/cyrus-sasl-${version}.tar.gz"
-checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
+checksum=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/dar/patches/fix-configure.patch b/srcpkgs/dar/patches/fix-configure.patch
new file mode 100644
index 000000000000..f6b6a04578cb
--- /dev/null
+++ b/srcpkgs/dar/patches/fix-configure.patch
@@ -0,0 +1,36 @@
+Disable cross compile checks for libgcrypt usability
+tests. They are not required.
+
+--- a/configure 2015-10-18 14:02:02.423216637 +0200
++++ b/configure 2015-10-18 14:04:45.198228372 +0200
+@@ -22294,7 +22294,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt usability" >&5
+ $as_echo_n "checking for libgcrypt usability... " >&6; }
+- if test "$cross_compiling" = yes; then :
++ if test "$cross_compiling" = xxx; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+@@ -22334,7 +22334,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+- if test "$cross_compiling" = yes; then :
++ if test "$cross_compiling" = xxx; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+diff --git configure configure
+index 157b7a9..7c6a50d 100755
+--- a/configure
++++ b/configure
+@@ -25481,7 +25481,7 @@ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libthreadar() operationability" >&5
+ $as_echo_n "checking for libthreadar() operationability... " >&6; }
+- if test "$cross_compiling" = yes; then :
++ if test "$cross_compiling" = xxx; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
diff --git a/srcpkgs/dar/patches/musl-getopt.patch b/srcpkgs/dar/patches/musl-getopt.patch
new file mode 100644
index 000000000000..1200567a30de
--- /dev/null
+++ b/srcpkgs/dar/patches/musl-getopt.patch
@@ -0,0 +1,19 @@
+Since the musl libc constellation results in unistd.h being
+included, which defines the getopt() function but not the
+getopt globals, define them here as well.
+
+--- a/src/dar_suite/my_getopt_long.h 2015-10-17 10:42:50.000000000 +0200
++++ b/src/dar_suite/my_getopt_long.h 2015-10-18 13:13:32.631006858 +0200
+@@ -27,6 +27,12 @@
+ #ifndef MY_GETOPT_LONG_H
+ #define MY_GETOPT_LONG_H
+
++#if !defined(__GLIBC__)
++// declare externs which would be defined when including getopt.h
++extern char *optarg;
++extern int optind, opterr, optopt, optreset;
++#endif
++
+ // getopt may be declated in <unistd.h> on systems like FreeBSD.
+ // if you want to use libgnugetopt you need to include <getopt.h>
+ // on this system. Thus a conflict appear because the getopt is
diff --git a/srcpkgs/dar/template b/srcpkgs/dar/template
index 51aa02f6aed0..c289909e8122 100644
--- a/srcpkgs/dar/template
+++ b/srcpkgs/dar/template
@@ -1,19 +1,19 @@
# Template file for 'dar'
pkgname=dar
-version=2.7.9
+version=2.6.13
revision=1
build_style=gnu-configure
configure_args="--disable-upx --disable-build-html"
conf_files="/etc/darrc"
-hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config"
makedepends="acl-devel bzip2-devel e2fsprogs-devel libgcrypt-devel liblzma-devel
- lzo-devel librsync-devel libcurl-devel libargon2-devel"
+ lzo-devel librsync-devel libcurl-devel"
short_desc="Shell command that backs up directory trees and files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://dar.linux.free.fr/"
distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz"
-checksum=1c609f691f99e6a868c0a6fcf70d2f5d2adee5dc3c0cbf374e69983129677df5
+checksum=3fea9ff9e55fb9827e17a080de7d1a2605b82c2320c0dec969071efefdbfd097
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
@@ -21,15 +21,6 @@ if [ "$CROSS_BUILD" ]; then
LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lgcrypt"
fi
-post_extract() {
- if [ "$CROSS_BUILD" ]; then
- # skip building checks, its trying to execute a target
- # binary and we don't run the checks for cross builds
- # anywyas.
- vsed -e '/SUBDIRS =/s/check//g' -i src/Makefile.in
- fi
-}
-
do_check() {
# need to be run as root
:
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index 529dabd4af17..8b763179efd2 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,15 +1,14 @@
# Template file for 'deheader'
pkgname=deheader
-version=1.10
+version=1.7
revision=1
depends="python3"
short_desc="C and C++ header analyzer"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://www.catb.org/~esr/deheader/"
-distfiles="http://www.catb.org/~esr/deheader/deheader-${version}.tar.gz"
-changelog="https://gitlab.com/esr/deheader/-/raw/master/NEWS.adoc"
-checksum=909d2683a3e62da54bfc660814b4d8af93f582e23858810cc41bfa081571f593
+distfiles="http://www.catb.org/~esr/deheader/${pkgname}-${version}.tar.gz"
+checksum=6856e4fa3efa664a0444b81c2e1f0209103be3b058455625c79abe65cf8db70d
python_version=3
do_install() {
diff --git a/srcpkgs/dejagnu/template b/srcpkgs/dejagnu/template
index 971f22236ecf..5a2572644c11 100644
--- a/srcpkgs/dejagnu/template
+++ b/srcpkgs/dejagnu/template
@@ -1,14 +1,17 @@
# Template file for 'dejagnu'
pkgname=dejagnu
-version=1.6.3
+version=1.6.2
revision=1
build_style=gnu-configure
makedepends="expect-devel"
depends="expect"
short_desc="Framework for running test suites on GNU tools"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/dejagnu/"
-changelog="http://git.savannah.gnu.org/gitweb/?p=dejagnu.git;a=blob_plain;f=NEWS"
-distfiles="${GNU_SITE}/dejagnu/dejagnu-${version}.tar.gz"
-checksum=87daefacd7958b4a69f88c6856dbd1634261963c414079d0c371f589cd66a2e3
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends="${makedepends}"
+fi
diff --git a/srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch b/srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
deleted file mode 100644
index 5d0a86d2f1aa..000000000000
--- a/srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 879b71d6e95673e58d33f6c3c341a893ee307161
-Author: Alexey Sheplyakov <asheplyakov@yandex.ru>
-Date: Sat Jul 10 22:18:14 2021 +0400
-
- dcc_gcc_rewrite_fqn: avoid heap corruption
-
- On ALT Linux I've run into the following bug:
-
- distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
- free(): invalid next size (fast)
- Aborted (core dumped)
-
- Apparently dcc_gcc_rewrite writes beyond the allocated memory:
-
- valgrind --leak-check=full -v ./distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c
-
- ==11382== ERROR SUMMARY: 53 errors from 5 contexts (suppressed: 0 from 0)
- ==11382==
- ==11382== 1 errors in context 1 of 5:
- ==11382== Invalid write of size 1
- ==11382== at 0x4C349D8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382== Address 0x544e828 is 1 bytes after a block of size 23 alloc'd
- ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382==
- ==11382==
- ==11382== 1 errors in context 2 of 5:
- ==11382== Invalid write of size 1
- ==11382== at 0x4C349C8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
- ==11382== Address 0x544e827 is 0 bytes after a block of size 23 alloc'd
- ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
- ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588)
- ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725)
- ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014)
- ==11382== by 0x10E380: main (distcc.c:352)
-
- and ALT Linux' hardened glibc does not quite like that.
- Correctly compute the `newcmd_len` to avoid the problem.
-
- ALTBUG: #40425
-
-diff --git a/src/compile.c b/src/compile.c
-index 34964566fdd6..26d7d1821501 100644
---- a/src/compile.c
-+++ b/src/compile.c
-@@ -584,7 +584,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
- return -ENOENT;
-
-
-- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1);
-+ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1;
- newcmd = malloc(newcmd_len);
- if (!newcmd)
- return -ENOMEM;
diff --git a/srcpkgs/distcc/patches/gcc-10.patch b/srcpkgs/distcc/patches/gcc-10.patch
deleted file mode 100644
index 599de51e0d92..000000000000
--- a/srcpkgs/distcc/patches/gcc-10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream: Should be
-Reason: Fixes compilation under gcc-10 which has -fno-common
-
-diff --git a/src/stats.c b/src/stats.c
-index 35dbf7d..76bfbee 100644
---- a/src/stats.c
-+++ b/src/stats.c
-@@ -82,7 +82,7 @@ struct statsdata {
- char compiler[MAX_FILENAME_LEN];
- };
-
--const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
-+extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD",
- "COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN",
- "OTHER" };
diff --git a/srcpkgs/distcc/patches/python-3.9.patch b/srcpkgs/distcc/patches/python-3.9.patch
deleted file mode 100644
index 0f55826549a6..000000000000
--- a/srcpkgs/distcc/patches/python-3.9.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 83e030a852daf1d4d8c906e46f86375d421b781e Mon Sep 17 00:00:00 2001
-From: hephooey <hephooey@users.noreply.github.com>
-Date: Sun, 15 Jan 2023 15:43:50 -0500
-Subject: [PATCH] Replace int with Py_ssize_t for distcc pump extension
-
-Defining PY_SSIZE_T_CLEAN is required since python 3.10, and I have to
-modify the type of length to match it. Otherwise functions like
-OsPathExists will always return False.
-
-The PY_SSIZE_T_CLEAN macro is supported at least back to python 3.5
-according to docs.python.org, that is why I included it without any
-python version conditions
----
- .../c_extensions/distcc_pump_c_extensions_module.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/include_server/c_extensions/distcc_pump_c_extensions_module.c b/include_server/c_extensions/distcc_pump_c_extensions_module.c
-index 763dd425..a4c6e9eb 100644
---- a/include_server/c_extensions/distcc_pump_c_extensions_module.c
-+++ b/include_server/c_extensions/distcc_pump_c_extensions_module.c
-@@ -21,6 +21,7 @@
- /* distcc_pump_c_extensions_module.c -- Python bindings for distcc-pump
- * extensions */
-
-+#define PY_SSIZE_T_CLEAN
- #include "Python.h"
-
- static const char *version = ".01";
-@@ -56,7 +57,7 @@ static PyObject *
- CompressLzo1xAlloc(PyObject *dummy, PyObject *args) {
- PyObject *string_object;
- const char *in_buf;
-- int in_len;
-+ Py_ssize_t in_len;
- char *out_buf;
- size_t out_len;
- UNUSED(dummy);
-@@ -241,7 +242,7 @@ static /* const */ char OsPathExists_doc__[] =
- static PyObject *
- OsPathExists(PyObject *dummy, PyObject *args) {
- const char *in;
-- int len;
-+ Py_ssize_t len;
- int res;
-
- struct stat buf;
-@@ -275,7 +276,7 @@ static /* const */ char OsPathIsFile_doc__[] =
- static PyObject *
- OsPathIsFile(PyObject *dummy, PyObject *args) {
- const char *in;
-- int len;
-+ Py_ssize_t len;
- int res;
-
- struct stat buf;
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index a5ff057b2362..de16773fc33b 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,23 +1,23 @@
# Template file for 'distcc'
pkgname=distcc
-version=3.4
-revision=1
+version=3.3.3
+revision=7
build_style=gnu-configure
configure_args="--disable-Werror"
conf_files="
- /etc/distcc/hosts
- /etc/distcc/clients.allow"
+ /etc/distcc/hosts
+ /etc/distcc/clients.allow"
hostmakedepends="automake libtool pkg-config which"
makedepends="binutils-devel popt-devel avahi-libs-devel"
-checkdepends="procps-ng"
short_desc="Distributed compilation for faster C/C++ builds"
maintainer="Orphaned <orphan@voidlinux.org>"
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=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
+checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+conflicts="chroot-distcc>=0"
-disable_parallel_check=yes
+CFLAGS="-fcommon"
subpackages=" "
@@ -43,13 +43,13 @@ post_install() {
# cc wrappers
vmkdir usr/lib/distcc/bin
- for f in gcc cc c++ g++ clang clang++ cpp; do
+ for f in gcc cc c++ g++ clang clang++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f}
done
# cross-gcc wrappers
for x in arm-linux-gnueabi arm-linux-gnueabihf armv7l-linux-gnueabihf \
- arm-linux-musleabihf armv7l-linux-musleabihf aarch64-linux-gnu aarch64-linux-musl; do
- for f in gcc cc c++ g++ cpp; do
+ arm-linux-musleabihf armv7l-linux-musleabihf; do
+ for f in gcc cc c++ g++; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 4d71bd63623f..02f8d107e6d3 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,8 +1,8 @@
# Template file for 'docker-cli'
# should be kept in sync with moby
pkgname=docker-cli
-version=23.0.3
-revision=1
+version=23.0.2
+revision=2
build_style=go
go_package="github.com/docker/cli/cmd/docker"
go_import_path="github.com/docker/cli"
@@ -16,7 +16,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://www.docker.com"
distfiles="https://github.com/docker/cli/archive/v${version}.tar.gz"
-checksum=7d67500372b560110e8200815f7111962ccec7d0eb3b743f80e262c38e2f7b82
+checksum=bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d
system_groups="docker"
pre_build() {
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 5a8f80c6c7e5..8b792314536d 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,6 +1,6 @@
# Template file for 'dropbear'
pkgname=dropbear
-version=2022.83
+version=2022.82
revision=1
build_style=gnu-configure
configure_args="--enable-zlib --disable-bundled-libtom"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
changelog="https://matt.ucc.asn.au/dropbear/CHANGES"
distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
-checksum=bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b
+checksum=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1
make_dirs="/etc/dropbear 0755 root root"
# These tests don't work from within xbps-src
diff --git a/srcpkgs/editorconfig/template b/srcpkgs/editorconfig/template
index c9c834cf98c0..3c2be4ac3e80 100644
--- a/srcpkgs/editorconfig/template
+++ b/srcpkgs/editorconfig/template
@@ -1,6 +1,6 @@
# Template file for 'editorconfig'
pkgname=editorconfig
-version=0.12.6
+version=0.12.4
revision=1
build_style=cmake
makedepends="pcre2-devel"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://editorconfig.org/"
changelog="https://github.com/editorconfig/editorconfig-core-c/releases"
distfiles="https://github.com/editorconfig/editorconfig-core-c/archive/v${version}.tar.gz"
-checksum=36052a5371731d915b53d9c7a24a11c4032585ccacb392ec9d58656eef4c0edf
+checksum=c2671595f1793b498cdf50b9dc03d632cc724891de7909f2ea78588fbffba289
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch b/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
new file mode 100644
index 000000000000..64aa449c9a45
--- /dev/null
+++ b/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
@@ -0,0 +1,54 @@
+From 41d039a327a6a9254a1580699188413a7e7363af Mon Sep 17 00:00:00 2001
+From: Elie ROUDNINSKI <xademax@gmail.com>
+Date: Sun, 7 Oct 2018 18:02:24 +0100
+Subject: [PATCH] Support custom c(cld)flags for CC(LD)_FOR_BUILD
+
+---
+ Make.defaults | 11 +++++++++++
+ src/Makefile | 1 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/Make.defaults b/Make.defaults
+index 57cee6e..814b0ef 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -36,6 +36,11 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/ \
+ $(if $(findstring ccc-analyzer,$(CC)),$(clang_cflags),) \
+ $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
+ $(call pkg-config-cflags)
++cflags_for_build = $(CFLAGS_FOR_BUILD) -I${TOPDIR}/src/include/ \
++ $(if $(findstring clang,$(CC_FOR_BUILD)),$(clang_cflags),) \
++ $(if $(findstring ccc-analyzer,$(CC_FOR_BUILD)),$(clang_cflags),) \
++ $(if $(findstring gcc,$(CC_FOR_BUILD)),$(gcc_cflags),) \
++ $(call pkg-config-cflags)
+ clang_ccldflags =
+ gcc_ccldflags =
+ ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
+@@ -44,6 +49,12 @@ ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
+ $(if $(findstring ccc-analyzer,$(CCLD)),$(clang_ccldflags),) \
+ $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \
+ $(call pkg-config-ldflags)
++ccldflags_for_build = $(cflags_for_build) -L. $(CCLDFLAGS) $(LDFLAGS) \
++ -Wl,-z,muldefs \
++ $(if $(findstring clang,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
++ $(if $(findstring ccc-analyzer,$(CCLD_FOR_BUILD)),$(clang_ccldflags),) \
++ $(if $(findstring gcc,$(CCLD_FOR_BUILD)),$(gcc_ccldflags),) \
++ $(call pkg-config-ldflags)
+ SOFLAGS=-shared
+ LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
+
+diff --git a/src/Makefile b/src/Makefile
+index 76bc474..287bb1d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -56,6 +56,7 @@ makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT
+ makeguids : LIBS=dl
+ makeguids : $(MAKEGUIDS_SOURCES)
+ makeguids : CCLD=$(CCLD_FOR_BUILD)
++makeguids : ccldflags=$(ccldflags_for_build)
+
+ guids.o : guids.S | guids.bin names.bin
+
+--
+2.19.0
+
diff --git a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch b/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
new file mode 100644
index 000000000000..649a57d7bac8
--- /dev/null
+++ b/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
@@ -0,0 +1,111 @@
+From 9fc8c48fa59a6d7aaa4c7df7642bfd316086d3b7 Mon Sep 17 00:00:00 2001
+From: Elie ROUDNINSKI <xademax@gmail.com>
+Date: Sun, 7 Oct 2018 18:38:47 +0100
+Subject: [PATCH] Replace call to strncpy by memcpy to fix some GCC8 warnings
+
+---
+ src/guid.h | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/guid.h b/src/guid.h
+index d4a06f9..c03a362 100644
+--- a/src/guid.h
++++ b/src/guid.h
+@@ -103,7 +103,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(eightbytes, text, 8);
++ memcpy(eightbytes, text, 8);
++ eightbytes[8] = 0;
+ if (check_segment_sanity(eightbytes, 8) < 0)
+ return -1;
+ guid->a = (uint32_t)strtoul(eightbytes, NULL, 16);
+@@ -111,7 +112,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(fourbytes, text+9, 4);
++ memcpy(fourbytes, text+9, 4);
++ fourbytes[4] = 0;
+ if (check_segment_sanity(fourbytes, 4) < 0)
+ return -1;
+ guid->b = (uint16_t)strtoul(fourbytes, NULL, 16);
+@@ -119,7 +121,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(fourbytes, text+14, 4);
++ memcpy(fourbytes, text+14, 4);
++ fourbytes[4] = 0;
+ if (check_segment_sanity(fourbytes, 4) < 0)
+ return -1;
+ guid->c = (uint16_t)strtoul(fourbytes, NULL, 16);
+@@ -127,7 +130,8 @@ text_to_guid(const char *text, efi_guid_t *guid)
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(fourbytes, text+19, 4);
++ memcpy(fourbytes, text+19, 4);
++ fourbytes[4] = 0;
+ if (check_segment_sanity(fourbytes, 4) < 0)
+ return -1;
+ guid->d = (uint16_t)strtoul(fourbytes, NULL, 16);
+@@ -135,42 +139,48 @@ text_to_guid(const char *text, efi_guid_t *guid)
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+24, 2);
++ memcpy(twobytes, text+24, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[0] = (uint8_t)strtoul(twobytes, NULL, 16);
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+26, 2);
++ memcpy(twobytes, text+26, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[1] = (uint8_t)strtoul(twobytes, NULL, 16);
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+28, 2);
++ memcpy(twobytes, text+28, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[2] = (uint8_t)strtoul(twobytes, NULL, 16);
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+30, 2);
++ memcpy(twobytes, text+30, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[3] = (uint8_t)strtoul(twobytes, NULL, 16);
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+32, 2);
++ memcpy(twobytes, text+32, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[4] = (uint8_t)strtoul(twobytes, NULL, 16);
+
+ /* 84be9c3e-8a32-42c0-891c-4cd3b072becc
+ * ^ */
+- strncpy(twobytes, text+34, 2);
++ memcpy(twobytes, text+34, 2);
++ twobytes[2] = 0;
+ if (check_segment_sanity(twobytes, 2) < 0)
+ return -1;
+ guid->e[5] = (uint8_t)strtoul(twobytes, NULL, 16);
+--
+2.19.0
+
diff --git a/srcpkgs/efivar/patches/build-tester.patch b/srcpkgs/efivar/patches/build-tester.patch
deleted file mode 100644
index 74f1d1cd98aa..000000000000
--- a/srcpkgs/efivar/patches/build-tester.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -42,6 +42,7 @@
- endif
-
- all : $(TARGETS)
-+ $(MAKE) -C test
-
- static : $(STATICTARGETS)
-
diff --git a/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch b/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch
new file mode 100644
index 000000000000..fcc83aef20cf
--- /dev/null
+++ b/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch
@@ -0,0 +1,55 @@
+From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 28 Jul 2022 16:11:24 -0400
+Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts)
+
+glibc has decided that sys/mount.h and linux/mount.h are no longer
+usable at the same time. This broke the build, since linux/fs.h itself
+includes linux/mount.h. For now, fix the build by only including
+sys/mount.h where we need it.
+
+See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+Resolves: #227
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ src/gpt.c | 1 +
+ src/linux.c | 1 +
+ src/util.h | 1 -
+ 3 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gpt.c b/src/gpt.c
+index 1eda0497..21413c3b 100644
+--- a/src/gpt.c
++++ b/src/gpt.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mount.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+diff --git a/src/linux.c b/src/linux.c
+index 47e45ae4..1780816f 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -20,6 +20,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/mount.h>
+ #include <sys/socket.h>
+ #include <sys/sysmacros.h>
+ #include <sys/types.h>
+diff --git a/src/util.h b/src/util.h
+index 3300666f..1e67e447 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <tgmath.h>
diff --git a/srcpkgs/efivar/patches/lfs64.patch b/srcpkgs/efivar/patches/lfs64.patch
deleted file mode 100644
index b84e91aa391b..000000000000
--- a/srcpkgs/efivar/patches/lfs64.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patch-Source: https://github.com/rhboot/efivar/commit/914c686cc54b2405dab08bff77cd60827aab54b1
---
-From 914c686cc54b2405dab08bff77cd60827aab54b1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Dec 2022 16:55:51 -0800
-Subject: [PATCH] Use off_t instead of off64_t
-
-Pass _FILE_OFFSET_BITS=64 to ensure 64bit off_t
-
-This helps building efivar for 32bit arches on systems using musl C
-library. It works with glibc since _GNU_SOURCE defines
-_LARGEFILE64_SOURCE as well, this feature test macro enables the 64bit
-interfaces which were done as intermediate steps when transition to
-66-bit off_t was done as part olf LFS64 support.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/error.c | 2 +-
- src/include/defaults.mk | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/error.c b/src/error.c
-index fcbba0d6..9530e22c 100644
---- a/src/error.c
-+++ b/src/error.c
-@@ -191,7 +191,7 @@ dbglog_write(void *cookie, const char *buf, size_t size)
- }
-
- static int
--dbglog_seek(void *cookie UNUSED, off64_t *offset, int whence)
-+dbglog_seek(void *cookie UNUSED, off_t *offset, int whence)
- {
- FILE *log = efi_errlog ? efi_errlog : stderr;
- int rc;
-diff --git a/src/include/defaults.mk b/src/include/defaults.mk
-index 42bd3d6e..bb9c997f 100644
---- a/src/include/defaults.mk
-+++ b/src/include/defaults.mk
-@@ -34,6 +34,7 @@ CPPFLAGS ?=
- override _CPPFLAGS := $(CPPFLAGS)
- override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \
- -D_GNU_SOURCE \
-+ -D_FILE_OFFSET_BITS=64 \
- -I$(TOPDIR)/src/include/
- CFLAGS ?= $(OPTIMIZE) $(DEBUGINFO) $(WARNINGS) $(ERRORS)
- CFLAGS_GCC ?= -specs=$(TOPDIR)/src/include/gcc.specs \
diff --git a/srcpkgs/efivar/patches/musl-compat.patch b/srcpkgs/efivar/patches/musl-compat.patch
deleted file mode 100644
index 00229be5c723..000000000000
--- a/srcpkgs/efivar/patches/musl-compat.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 28 Jan 2022 12:13:30 +0100
-Subject: [PATCH 1/2] efisecdb: fix build with musl libc
-
-Refactor code to use POSIX atexit(3) instead of the GNU specific
-on_exit(3).
-
-Resolves: #197
-Resolves: #202
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- src/compiler.h | 2 --
- src/efisecdb.c | 68 +++++++++++++++++++-------------------------------
- 2 files changed, 26 insertions(+), 44 deletions(-)
-
-diff --git a/src/compiler.h b/src/compiler.h
-index e2f18f0b..d95fb014 100644
---- a/src/compiler.h
-+++ b/src/compiler.h
-@@ -7,8 +7,6 @@
- #ifndef COMPILER_H_
- #define COMPILER_H_
-
--#include <sys/cdefs.h>
--
- /* GCC version checking borrowed from glibc. */
- #if defined(__GNUC__) && defined(__GNUC_MINOR__)
- # define GNUC_PREREQ(maj,min) \
-diff --git a/src/efisecdb.c b/src/efisecdb.c
-index f8823737..6bd5ad90 100644
---- a/src/efisecdb.c
-+++ b/src/efisecdb.c
-@@ -25,6 +25,10 @@
- extern char *optarg;
- extern int optind, opterr, optopt;
-
-+static efi_secdb_t *secdb = NULL;
-+static list_t infiles;
-+static list_t actions;
-+
- struct hash_param {
- char *name;
- efi_secdb_type_t algorithm;
-@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner,
- }
-
- static void
--free_actions(int status UNUSED, void *actionsp)
-+free_actions(void)
- {
-- list_t *actions = (list_t *)actionsp;
- list_t *pos, *tmp;
-
-- for_each_action_safe(pos, tmp, actions) {
-+ for_each_action_safe(pos, tmp, &actions) {
- action_t *action = list_entry(pos, action_t, list);
-
- list_del(&action->list);
-@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp)
- }
-
- static void
--free_infiles(int status UNUSED, void *infilesp)
-+free_infiles(void)
- {
-- list_t *infiles = (list_t *)infilesp;
- list_t *pos, *tmp;
-
-- for_each_ptr_safe(pos, tmp, infiles) {
-+ for_each_ptr_safe(pos, tmp, &infiles) {
- ptrlist_t *entry = list_entry(pos, ptrlist_t, list);
-
- list_del(&entry->list);
-@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp)
- }
-
- static void
--maybe_free_secdb(int status UNUSED, void *voidp)
-+maybe_free_secdb(void)
- {
-- efi_secdb_t **secdbp = (efi_secdb_t **)voidp;
--
-- if (secdbp == NULL || *secdbp == NULL)
-+ if (secdb == NULL)
- return;
-
-- efi_secdb_free(*secdbp);
--}
--
--static void
--maybe_do_unlink(int status, void *filep)
--{
-- char **file = (char **)filep;
--
-- if (status == 0)
-- return;
-- if (file == NULL || *file == NULL)
-- return;
--
-- unlink(*file);
-+ efi_secdb_free(secdb);
- }
-
- static void
-@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
- return status;
- }
-
--/*
-- * These need to be static globals so that they're not on main's stack when
-- * on_exit() fires.
-- */
--static efi_secdb_t *secdb = NULL;
--static list_t infiles;
--static list_t actions;
--static char *outfile = NULL;
--
- int
- main(int argc, char *argv[])
- {
-@@ -351,6 +329,7 @@ main(int argc, char *argv[])
- bool do_sort_data = false;
- bool sort_descending = false;
- int status = 0;
-+ char *outfile = NULL;
-
- const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?";
- const struct option lopts[] = {
-@@ -376,10 +355,9 @@ main(int argc, char *argv[])
- INIT_LIST_HEAD(&infiles);
- INIT_LIST_HEAD(&actions);
-
-- on_exit(free_actions, &actions);
-- on_exit(free_infiles, &infiles);
-- on_exit(maybe_free_secdb, &secdb);
-- on_exit(maybe_do_unlink, &outfile);
-+ atexit(free_actions);
-+ atexit(free_infiles);
-+ atexit(maybe_free_secdb);
-
- /*
- * parse the command line.
-@@ -587,24 +565,30 @@ main(int argc, char *argv[])
- outfd = open(outfile, flags, 0600);
- if (outfd < 0) {
- char *tmpoutfile = outfile;
-- if (errno == EEXIST)
-- outfile = NULL;
-+ if (errno != EEXIST)
-+ unlink(outfile);
- err(1, "could not open \"%s\"", tmpoutfile);
- }
-
- rc = ftruncate(outfd, 0);
-- if (rc < 0)
-+ if (rc < 0) {
-+ unlink(outfile);
- err(1, "could not truncate output file \"%s\"", outfile);
-+ }
-
- void *output;
- size_t size = 0;
- rc = efi_secdb_realize(secdb, &output, &size);
-- if (rc < 0)
-+ if (rc < 0) {
-+ unlink(outfile);
- secdb_err(1, "could not realize signature list");
-+ }
-
- rc = write(outfd, output, size);
-- if (rc < 0)
-+ if (rc < 0) {
-+ unlink(outfile);
- err(1, "could not write signature list");
-+ }
-
- close(outfd);
- xfree(output);
-
-From df09b472419466987f2f30176dd00937e640aa9a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 28 Jan 2022 12:29:00 +0100
-Subject: [PATCH 2/2] efisecdb: do not free optarg
-
-The *outfile passed to parse_input_files can only be either set to
-optarg or be NULL. optarg should not be free'd and NULL does not need
-to.
-
-Since we no longer use on_exit to unlink outfile we also don't need to
-set *outfile to NULL.
-
-Fixes commit d91787035bc1 (efisecdb: add efisecdb)
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- src/efisecdb.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/src/efisecdb.c b/src/efisecdb.c
-index 6bd5ad90..70fa1847 100644
---- a/src/efisecdb.c
-+++ b/src/efisecdb.c
-@@ -255,8 +255,7 @@ list_guids(void)
- * failure.
- */
- static int
--parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
-- bool dump)
-+parse_input_files(list_t *infiles, efi_secdb_t **secdb, bool dump)
- {
- int status = 0;
- list_t *pos, *tmp;
-@@ -297,8 +296,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
- if (!dump)
- exit(1);
- status = 1;
-- xfree(*outfile);
-- *outfile = NULL;
- break;
- }
- }
-@@ -528,7 +525,7 @@ main(int argc, char *argv[])
- efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DATA, do_sort_data);
- efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DESCENDING, sort_descending);
-
-- status = parse_input_files(&infiles, &outfile, &secdb, dump);
-+ status = parse_input_files(&infiles, &secdb, dump);
- if (status == 0) {
- for_each_action_safe(pos, tmp, &actions) {
- action_t *action = list_entry(pos, action_t, list);
diff --git a/srcpkgs/efivar/template b/srcpkgs/efivar/template
index ef6298a311d7..9a21d44175b9 100644
--- a/srcpkgs/efivar/template
+++ b/srcpkgs/efivar/template
@@ -1,39 +1,23 @@
# Template file for 'efivar'
pkgname=efivar
-version=38
-revision=1
+version=37
+revision=2
build_style=gnu-makefile
make_build_args="libdir=/usr/lib"
-make_check_args="GRUB_PREFIX=grub"
-make_check_target="test"
+make_build_target="all test"
make_install_args="libdir=/usr/lib"
-hostmakedepends="pkg-config mdocml"
-checkdepends="grub"
+hostmakedepends="pkg-config"
short_desc="Tools to manipulate EFI variables"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/rhboot/efivar"
+homepage="https://github.com/rhinstaller/efivar"
distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2"
-checksum=f018ed6e49c5f1c16d336d9fd7687ce87023276591921db1e49a314ad6515349
+checksum=3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f
-disable_parallel_check=yes
+CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member"
-post_extract() {
- vsed -e 's/-march=native//' -i src/include/defaults.mk
- if [ "$CROSS_BUILD" ]; then
- # we build makeguids manually, make sure its not rebuild
- vsed -e '/$(MAKEGUIDS_OUTPUT) : makeguids/d' -i src/Makefile
- fi
-}
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- # work around broken cross build support by building makeguids
- # and then cleaning up shared objects.
- make ${makejobs} -C src makeguids HOSTCC=gcc HOSTCCLD=gcc \
- HOST_CFLAGS= HOST_LDFLAGS= SRCDIR=${wrksrc} TOPDIR=${wrksrc}
- rm -f src/*.o
- fi
+post_build() {
+ make -C src/test
}
post_install() {
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index c01ad2ece3cf..bf1e16ed14ec 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,6 +1,6 @@
# Template file for 'elinks'
pkgname=elinks
-version=0.16.0
+version=0.15.1
revision=1
build_style=gnu-configure
configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
@@ -13,7 +13,7 @@ license="GPL-2.0-only"
homepage="https://github.com/rkd77/elinks"
changelog="https://raw.githubusercontent.com/rkd77/elinks/master/NEWS"
distfiles="https://github.com/rkd77/elinks/archive/v${version}.tar.gz"
-checksum=5494a73737eeb182fe2333b74e9b6192170f583c7722a0650dcd14ef088b9dfb
+checksum=a3ebb14e179fcf97f93874b7771b4b05c1b7fdc704807334e865273d9de8428f
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index 797c47619449..f29dcc1c2f67 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,6 +1,6 @@
# Template file for 'encodings'
pkgname=encodings
-version=1.0.7
+version=1.0.6
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config font-util"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Public domain"
homepage="http://xorg.freedesktop.org"
distfiles="${XORG_SITE}/font/encodings-${version}.tar.xz"
-checksum=3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4
+checksum=77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26
pre_build() {
vsed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
diff --git a/srcpkgs/flatpak-kcm/patches/default-constructor.patch b/srcpkgs/flatpak-kcm/patches/default-constructor.patch
new file mode 100644
index 000000000000..768588fb3046
--- /dev/null
+++ b/srcpkgs/flatpak-kcm/patches/default-constructor.patch
@@ -0,0 +1,27 @@
+commit 331105fa44a0b03c7f7f5a543b92aab3ec659385
+Author: ivan tkachenko <me@ratijas.tk>
+Date: Wed Mar 15 21:43:15 2023 +0600
+
+ FlatpakPermission: Add back no-args default constructor
+
+ Older toolchain such as Kubuntu requires default constructor to use this
+ class with QVector. Do not use this constructor manually.
+
+ BUG: 467399
+ (cherry picked from commit 7e644d8f39e38f5713938424fef6064261270023)
+
+diff --git a/flatpakpermission.h b/flatpakpermission.h
+index 8f24354..7b9a5c7 100644
+--- a/flatpakpermission.h
++++ b/flatpakpermission.h
+@@ -99,6 +99,10 @@ public:
+ Advanced
+ };
+
++ // Default constructor is required for meta-type registration.
++ /** Default constructor. Creates an invalid entry. */
++ FlatpakPermission() = default;
++
+ /**
+ * Create a Dummy entry for the Advanced and user-editable sections, just so
+ * that ListView shows a section header even if there are no permission row
diff --git a/srcpkgs/flatpak-kcm/template b/srcpkgs/flatpak-kcm/template
index b90605935277..c9a99ea96241 100644
--- a/srcpkgs/flatpak-kcm/template
+++ b/srcpkgs/flatpak-kcm/template
@@ -1,6 +1,6 @@
# Template file for 'flatpak-kcm'
pkgname=flatpak-kcm
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/flatpak-kcm"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ad6156443c3da839eed26e2577352af0d2e2b5729254243006175546223d2145
+checksum=3691c87e639d4015affd800bb1eb69878c1754b2491845a74c2cae91d13d5bfe
diff --git a/srcpkgs/font-go-ttf/template b/srcpkgs/font-go-ttf/template
index b40a2ccd8f44..fb133a2b1e1a 100644
--- a/srcpkgs/font-go-ttf/template
+++ b/srcpkgs/font-go-ttf/template
@@ -1,14 +1,13 @@
# Template file for 'font-go-ttf'
pkgname=font-go-ttf
-version=2.010
+version=0.1.0
revision=1
-_git_rev="41969df76e82aeec85fa3821b1e24955ea993001"
short_desc="Typeface designed for go source code"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://go.dev/blog/go-fonts"
-distfiles="https://github.com/golang/image/archive/${_git_rev}.tar.gz"
-checksum=2e3e6ebdd62a0825468a155524efb65b9bbe211db20a07906f417f12db58cc6e
+distfiles="https://github.com/golang/image/archive/refs/tags/v${version}.tar.gz"
+checksum=50d8069c455f934fc7fc0902e9065e4b6401f23ae29616de402c19f8497aae59
do_install() {
cd font/gofont/ttfs
diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template
index 14a116e4f2b3..01067c53f119 100644
--- a/srcpkgs/freeciv/template
+++ b/srcpkgs/freeciv/template
@@ -1,7 +1,7 @@
# Template file for 'freeciv'
pkgname=freeciv
-version=3.0.7
-revision=1
+version=3.0.3
+revision=3
build_style=gnu-configure
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
hostmakedepends="pkg-config"
@@ -11,9 +11,9 @@ short_desc="Free and Open Source empire-building strategy game - server/data"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.freeciv.org/"
-changelog="https://www.freeciv.org/wiki/NEWS"
+changelog="https://www.freeciv.org/wiki/NEWS-${version}"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f6e606f17ed03d971272883f1a4879f5c1c2c247f64b8edefa6a25c8a2a8dac4
+checksum=13215adc96be9f2894d5f3a12c78b8ebb9ae06ecdab25fe6bb1794f6e6d2b61b
nopie_files="/usr/bin/freeciv-ruledit"
# gtk3.22 is a client supporting gtk+>=3.22
diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 7ecbeed46e47..15762f3dbb41 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
# Template file for 'kactivitymanagerd'
pkgname=kactivitymanagerd
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
build_helper="qemu"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kactivitymanagerd"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d9e1fd492012127e20c8ae76cf6462c5690cf842f241ffa95f83c9bf6a91da72
+checksum=64104a3a8c40b0e60f4d2fb0c314cfb93ebe4f7fd4c74af48311d388f3e8ee24
diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 4afaf139842b..e92ddbeeb282 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
# Template file for 'kde-cli-tools'
pkgname=kde-cli-tools
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kde-cli-tools"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c594fde05df078eb9d0455b0e298c201a3143b949c1c3b1ff5526b5e4340b419
+checksum=a1a20176752b0d3e9af7ae063d5077855c0438ec4dc280dc85f0bb34f6f93aa4
post_install() {
ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin
diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index a24f9bd57c58..4c3fd9a45fad 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
# Template file for 'kde-gtk-config5'
pkgname=kde-gtk-config5
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kde-gtk-config"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=98f5adf85bc56e01956f749849694d21c222e98d082e9b82ee8b469ffa6220e2
+checksum=aaac548e0e3e17cd2751f7a6912e9b43e58bedd01a46381dc700116b5ae97111
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kcoreaddons"
diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 2e81ce495d71..ad0378c275f0 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
# Template file for 'kdecoration'
pkgname=kdecoration
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kdecoration"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=415f22a21073dcc8024eba45a5a8f19b83d3af8335404d3a253554b1a483fa6e
+checksum=070e184f79768198af6490f33a82677f27a7231da80c8d07981adfe3b0a9fedb
kdecoration-devel_package() {
short_desc+=" - development"
diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index b6f1a148d8f3..083c86325c59 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,7 +1,7 @@
# Template file for 'kdeplasma-addons5'
pkgname=kdeplasma-addons5
-version=5.27.4
-revision=1
+version=5.27.3
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools pkg-config
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kdeplasma-addons"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6a82a57988f336345738630217f49b191a379eeea586565a802bcebed7941f89
+checksum=1ca9b8b27ade05b2092f36c584bc901c88d3012658939afd2e7569175ed73b9f
diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 0f1b7de1767f..f98dcf300752 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
# Template file for 'kgamma5'
pkgname=kgamma5
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kgamma5"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4a81c50b7f96b5a6f0e60b58a1d38fc375f445595e2e349e692d4c40d8355802
+checksum=de89a5146eff62f633a068d0fa1eddb1c9fb77d7a296320941ffa747777cb67c
diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 9c05eaf4f201..739d42675497 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
# Template file for 'khotkeys'
pkgname=khotkeys
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only, LGPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/khotkeys"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=841224dea79b4607ecebe79b5c94e36bfbc290b623d5efe5dbe1cd566a921023
+checksum=e61bcbf598078980c4d5b37800e040d457f55f463ad141d6ea4dceb884b806eb
if [ "$CROSS_BUILD" ]; then
configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c32f6466251a..16b4098bff9a 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,12 +1,12 @@
# Template file for 'kimageformats'
pkgname=kimageformats
version=5.103.0
-revision=3
+revision=2
build_style=cmake
configure_args="-DKIMAGEFORMATS_HEIF=ON"
hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
pkg-config"
-makedepends="karchive-devel libopenexr-devel libheif-devel libraw-devel libavif-devel"
+makedepends="karchive-devel libopenexr-devel libheif-devel"
short_desc="KDE Plugins to allow QImage to support extra file formats"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index c9508298f487..0417b713d535 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
# Template file for 'kinfocenter'
pkgname=kinfocenter
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
homepage="https://invent.kde.org/plasma/kinfocenter"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6875ca14c4fc139f007bc4b318fa3812f7d73ef26fa2ae54a49bd48bda67e495
+checksum=847f6bb3b7c3f37ea6554a3526d8b89b32df28afff4c806850416f089fcf988b
diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 5649e619d048..e2f20f2d48d3 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
# Template file for 'kmenuedit'
pkgname=kmenuedit
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kmenuedit"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=37abb72d193ae1273b9a5265e8decfeeebee12811eb9977ba69af8850c8ca7b3
+checksum=f71038297852b53e04fc5e6da8f1b9af54113b9a70cdab98bbdc2e850667dc88
diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template
index 467ab823a5e1..374beda24b6a 100644
--- a/srcpkgs/kpipewire/template
+++ b/srcpkgs/kpipewire/template
@@ -1,6 +1,6 @@
# Template file for 'kpipewire'
pkgname=kpipewire
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules plasma-wayland-protocols gettext
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://invent.kde.org/plasma/kpipewire"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a653408693ea16fee1b12a447982af48823aae86e5813b30b5a889cd2b883165
+checksum=a6ac260158e2a9b7b92fa91f9cd4c2d3193b0db7e79a3e1a156ccfeba694252d
kpipewire-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 554fb82deb63..999da3ace6c4 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
# Template file for 'kscreen'
pkgname=kscreen
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kscreen"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=456f249772f53807dcc0b5076dcf6975d5b29b0b2b6a037ca0a5e45017a4c5ed
+checksum=c10e67f36d325f96747613f2dd707cba21764941bf186e01b8cbe05f3368bd35
diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index f328878846fd..258486c13782 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
# Template file for 'kscreenlocker'
pkgname=kscreenlocker
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kscreenlocker"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9da7f59b3fe35879adae4c67d1b2263085ee5c79004cd2bec46ce6901b97191
+checksum=1aa99a34be2688fe3f0464467dae5bd79385b92dc15b1842abfa9684b35c8854
kscreenlocker-devel_package() {
short_desc+=" - development"
diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 84987f1d8ef8..870ffc2d5a43 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
# Template file for 'ksshaskpass'
pkgname=ksshaskpass
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/ksshaskpass"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a9050264181d58eafb7aa36d797cf510eb55d3f4d8057746dfd76565cf3ef46a
+checksum=a541353eeaedde7c54d723b26e3940cde399325a9b2a81e73542093341eff62d
alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"
diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index e46a66c0357a..aff97ab2c0b7 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,15 +1,15 @@
# Template file for 'ksystemstats'
pkgname=ksystemstats
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake gettext
kcoreaddons pkg-config qt5-host-tools"
-makedepends="qt5-devel networkmanager-qt5-devel ksolid-devel libnl3-devel
+makedepends="qt5-devel networkmanager-qt5-devel ksolid-devel
kio-devel kdbusaddons-devel libksysguard-devel libsensors-devel"
short_desc="Plugin based system monitoring daemon"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3-only"
homepage="https://invent.kde.org/plasma/ksystemstats"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1fd68961450fb8c37c6969a3a9b927a59aa7d13e0820898f2fe73d6fdc9edece
+checksum=426848657dfaf5b0c5b88d8fab3ea49a0b0ce58927d55060007cfeb2d5256366
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 6c3ccbff817c..035b1408919c 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,7 +1,7 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.27.0
-revision=1
+version=1.26.3
+revision=2
archs="aarch64* x86_64* ppc64le*"
build_style=go
go_import_path="github.com/kubernetes/kubernetes"
@@ -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=536025dba2714ee5e940bb0a6b1df9ca97c244fa5b00236e012776a69121c323
+checksum=e9db7e0a2e8cb40e478564de22530c5e582ae7136558994130b3ae7d8828ab31
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 264e3f3ad422..b237ad6c4711 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
# Template file for 'kwallet-pam'
pkgname=kwallet-pam
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kwallet-pam"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=cea13f6b4cc17cb692cf0f94880926e4a072f6af8f4c0bce343ef3d5eafc126c
+checksum=e218299df53fcf0369f6b65eb907a0fbac602a8a75a85c6fc7d8a7d92fea1fdb
diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index c84cc73bf343..c87632b59ad0 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
# Template file for 'kwayland-integration'
pkgname=kwayland-integration
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/kwayland-integration"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f74a856a93e0bd91ad7c34905603c2ed74df1dc85e687354d9d588274026fe08
+checksum=cd0118f39855eff157ef88ff7ddce7affe74305ceefd6bc5593edc9fe09f6f4a
diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 5d17ba513ad0..77ff82974775 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
# Template file for 'kwin'
pkgname=kwin
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
build_helper=qemu
@@ -21,8 +21,8 @@ short_desc="KDE Window manager"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kwin"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b39f1d3cc528505213dbb72958e80d6cdad75617cb26c215607d6f12bf0e02b1
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=e82c12813813e09352083362aea4052b6355b0cc3742eec90a9e9e0315afc0e7
replaces="kwayland-server>=0"
kwin-devel_package() {
diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 182daf30f919..d9d111d061f9 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
# Template file for 'kwrited'
pkgname=kwrited
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/kwrited"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed3a4b80d6c32c6a9ce4a5be1b6b02a662d2eb0a90ee7dfc6307a335b87407fc
+checksum=c20851605e0e6e0951b1ef8f7b03394722e5ed02ca010f80c2cb0eac2d6658d4
diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index d1b188a704fb..0ac12b6d84aa 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
# Template file for 'layer-shell-qt'
pkgname=layer-shell-qt
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://invent.kde.org/plasma/layer-shell-qt"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3b3aedc14b23023c8e8a4e5d0a16711f24b505cd8a2f470baf595a6ed0e3d0fe
+checksum=0e9ccdc7d6b6c73abb38bf67b7e54118ab0ec476b09095a80392751b029f72e7
layer-shell-qt-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 3fa88086bb73..54826af41aad 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
# Template file for 'libkscreen'
pkgname=libkscreen
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/libkscreen"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a89dfb5e8c40958a41c264f9b26ec4c39b386c2e416aa29a17967a22c107fa7e
+checksum=85d77116323d6792e2b82263a240eff263cb2a25d2f4d1a6e2c4b005a8e9c65f
libkscreen-devel_package() {
short_desc+=" - development"
diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index ebcecd70ba10..2c8d7dafa8c2 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,7 +1,7 @@
# Template file for 'libksysguard'
pkgname=libksysguard
-version=5.27.4
-revision=1
+version=5.27.3
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
kpackage"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/libksysguard"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e0128d0c515cba3fde36c4a5cf5872dbf4e58c29a0d297b84f32bcfbe622f8f8
+checksum=3ff2bb6f7cd614e081729dd4dd99ae627b3a4a2f0e6953654db70093afd1bb1f
build_options="webengine"
diff --git a/srcpkgs/libsasl/patches/CVE-2019-19906.patch b/srcpkgs/libsasl/patches/CVE-2019-19906.patch
new file mode 100644
index 000000000000..f7edb521e89f
--- /dev/null
+++ b/srcpkgs/libsasl/patches/CVE-2019-19906.patch
@@ -0,0 +1,15 @@
+https://github.com/cyrusimap/cyrus-sasl/issues/587
+
+diff --git a/lib/common.c b/lib/common.c
+index bc3bf1df..9969d6aa 100644
+--- a/lib/common.c
++++ b/lib/common.c
+@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen,
+
+ if (add==NULL) add = "(null)";
+
+- addlen=strlen(add); /* only compute once */
++ addlen=strlen(add)+1; /* only compute once */
+ if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
+ return SASL_NOMEM;
+
diff --git a/srcpkgs/libsasl/patches/cross.patch b/srcpkgs/libsasl/patches/cross.patch
new file mode 100644
index 000000000000..6d14b83ac667
--- /dev/null
+++ b/srcpkgs/libsasl/patches/cross.patch
@@ -0,0 +1,41 @@
+Upstream: No
+Reason: Tries to run cross compiled binary
+
+diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
+index 56e0504..c1d8e35 100644
+--- a/m4/sasl2.m4
++++ b/m4/sasl2.m4
+@@ -315,31 +315,8 @@ if test "$gssapi" != no; then
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
+
+ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
+- AC_TRY_RUN([
+-#ifdef HAVE_GSSAPI_H
+-#include <gssapi.h>
+-#else
+-#include <gssapi/gssapi.h>
+-#endif
+-
+-int main(void)
+-{
+- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" };
+- gss_OID_set mech_set;
+- OM_uint32 min_stat;
+- int have_spnego = 0;
+-
+- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) {
+- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego);
+- gss_release_oid_set(&min_stat, &mech_set);
+- }
+-
+- return (!have_spnego); // 0 = success, 1 = failure
+-}
+-],
+- [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+- AC_MSG_RESULT(yes) ],
+- AC_MSG_RESULT(no))
++ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
++ AC_MSG_RESULT(yes)
+ LIBS="$cmu_save_LIBS"
+
+ else
diff --git a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
new file mode 100644
index 000000000000..7ba335559b80
--- /dev/null
+++ b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
@@ -0,0 +1,29 @@
+Source: https://git.alpinelinux.org/aports/tree/main/cyrus-sasl/cyrus-sasl-2.1.27-as_needed.patch
+Upstream: No
+Reason: FTBFS
+
+Author: Matthias Klose <doko@ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- cyrus-sasl-2.1.27/saslauthd/Makefile.am
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
+@@ -25,7 +25,7 @@
+ saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
+ saslauthd_LDADD = @SASL_KRB_LIB@ \
+ @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
+
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- cyrus-sasl-2.1.27/sasldb/Makefile.am
++++ cyrus-sasl-2.1.27/sasldb/Makefile.am
+@@ -54,6 +54,6 @@
+
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ libsasldb_la_LDFLAGS = -no-undefined
diff --git a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
new file mode 100644
index 000000000000..9154a5a66d38
--- /dev/null
+++ b/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
@@ -0,0 +1,20 @@
+Source: https://git.alpinelinux.org/aports/tree/main/cyrus-sasl/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+Upstream: No
+
+Author: Fabian Fagerholm <fabbe@debian.org>
+Description: This patch makes sure the non-PIC version of libsasldb.a, which
+is created out of non-PIC objects, is not going to overwrite the PIC version,
+which is created out of PIC objects. The PIC version is placed in .libs, and
+the non-PIC version in the current directory. This ensures that both non-PIC
+and PIC versions are available in the correct locations.
+--- cyrus-sasl-2.1.27/lib/Makefile.am
++++ cyrus-sasl-2.1.27/lib/Makefile.am
+@@ -98,7 +98,7 @@
+
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+ @echo adding static plugins and dependencies
+- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
++ $(AR) cru $@ $(SASL_STATIC_OBJS)
+ @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+ if test ! -f $$i; then continue; fi; . $$i; \
+ for j in $$dependency_libs foo; do \
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 79afba2f332d..2e2abe818e2b 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,15 +1,13 @@
# Template file for 'libsasl'
-# keep in sync with cyrus-sasl
pkgname=libsasl
-version=2.1.28
-revision=1
+version=2.1.27
+revision=2
build_style=gnu-configure
configure_args="--enable-cram --enable-digest --enable-auth-sasldb
--enable-plain --enable-anon --enable-login --enable-gssapi --enable-ntlm
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
--disable-otp --disable-srp --disable-srp-setpass --disable-krb4
- --with-devrandom=/dev/random
- ac_cv_gssapi_supports_spnego=yes"
+ --with-devrandom=/dev/random"
hostmakedepends="automake libtool pkg-config"
makedepends="db-devel"
short_desc="Cyrus SASL - runtime shared libraries"
@@ -17,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause-Attribution"
homepage="https://www.cyrusimap.org/sasl/"
distfiles="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${version}/cyrus-sasl-${version}.tar.gz"
-checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
+checksum=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
pre_configure() {
autoreconf -fi
diff --git a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff b/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
deleted file mode 100644
index f508877af224..000000000000
--- a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Taken from https://patchwork.kernel.org/project/linux-wireless/patch/51fd8f76494348aa9ecbf0abc471ebe47a983dfd.1679502607.git.lorenzo@kernel.org/
-
-diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-index 80c71acfe159..cc94531185da 100644
---- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
-@@ -171,12 +171,12 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
-
- u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- {
-- struct mt7921_fw_features *features = NULL;
- const struct mt76_connac2_fw_trailer *hdr;
- struct mt7921_realease_info *rel_info;
- const struct firmware *fw;
- int ret, i, offset = 0;
- const u8 *data, *end;
-+ u8 offload_caps = 0;
-
- ret = request_firmware(&fw, fw_wm, dev);
- if (ret)
-@@ -208,7 +208,10 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- data += sizeof(*rel_info);
-
- if (rel_info->tag == MT7921_FW_TAG_FEATURE) {
-+ struct mt7921_fw_features *features;
-+
- features = (struct mt7921_fw_features *)data;
-+ offload_caps = features->data;
- break;
- }
-
-@@ -218,7 +221,7 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
- out:
- release_firmware(fw);
-
-- return features ? features->data : 0;
-+ return offload_caps;
- }
- EXPORT_SYMBOL_GPL(mt7921_check_offload_capability);
-
diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template
index 9bd2d5779d6f..812d3b69f524 100644
--- a/srcpkgs/linux6.2/template
+++ b/srcpkgs/linux6.2/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.2'
pkgname=linux6.2
-version=6.2.11
+version=6.2.8
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 923cbd9f2120a7972a45cfdfcfd1871f76735de36cee2630d10a6a3d5c845149"
+ 3d53cfde45e0c38921dd96fb8d4fee2b2730da6ad86d324ce9ed61ebbeb029dc"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 08da9b3637c8..915753aaf873 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
# Template file for 'milou'
pkgname=milou
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LPGL-2.1-or-later"
homepage="https://invent.kde.org/plasma/milou"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4d0f67b80f0580dbd4479dfa65e597fed2b8f9ab671eca3d7f5156f6871f57a8
+checksum=eb6c2d92a63b8ab1209ae1360d6b51f21872dc91b8f0853212bc5a6962156e1f
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 6a72732456ea..4135a2493de7 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,8 +1,8 @@
# Template file for 'moby'
# should be kept in sync with docker-cli
pkgname=moby
-version=23.0.3
-revision=1
+version=23.0.2
+revision=2
# libnetwork commit is mentioned in vendor.conf
_libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
create_wrksrc=yes
@@ -18,7 +18,7 @@ homepage="https://www.docker.com"
changelog="https://github.com/moby/moby/releases"
distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
-checksum="2f74aef0eadf5bfe652b1822f1349fa0baf7412f83b856a9cfb9a8fbfd686880
+checksum="4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39
5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
system_groups="docker"
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 174b57623603..0d082a042222 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -3,10 +3,10 @@
# Consider using mime.types from mime-types package
# See comments in mime-types template
pkgname=nginx
-version=1.24.0
-revision=1
-_tests_commit=36a4563f7f00
-_njs_version=0.7.12
+version=1.22.1
+revision=2
+_tests_commit=18ac4d9e5a2a
+_njs_version=0.7.7
create_wrksrc=yes
build_wrksrc="nginx-${version}"
build_style=gnu-makefile
@@ -55,18 +55,17 @@ configure_args="--prefix=${_cfgdir}
hostmakedepends="geoip geoip-devel openssl-devel pcre2-devel perl libxslt-devel
which"
makedepends="${hostmakedepends}"
-checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which uwsgi uwsgi-python3"
+checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which"
short_desc="High performance web and reverse proxy server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://nginx.org"
-changelog="https://nginx.org/en/CHANGES-${version%.*}"
distfiles="https://nginx.org/download/nginx-${version}.tar.gz
https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz
https://hg.nginx.org/njs/archive/${_njs_version}.tar.gz"
-checksum="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
- a90641a75314427b6c02e3a5e811c66d6fe7c0cad93752a6a2725d0129e08fbf
- af648336c236f625311edcd90b83f37702fadad160c2a5ed57b34656609e918a"
+checksum="9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31
+ e34ef2f38512e1c04ee201c3b68f7ba7ec8f1537dc6a500278bc2219ab435228
+ 4dac9cbf071e5a7dfe135b4d87e20112d207fcbf5fb620854af8dab44ec3e7bd"
# Tests fail when nginx run as root and there is no nginx user
make_check=ci-skip
diff --git a/srcpkgs/oxygen-sounds/template b/srcpkgs/oxygen-sounds/template
deleted file mode 100644
index ab3324ecd9fb..000000000000
--- a/srcpkgs/oxygen-sounds/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'oxygen-sounds'
-pkgname=oxygen-sounds
-version=5.27.4
-revision=1
-build_style=cmake
-hostmakedepends="extra-cmake-modules"
-short_desc="Oxygen Sound Theme"
-maintainer="John <me@johnnynator.dev>"
-license="LGPL-3.0-or-later"
-homepage="https://invent.kde.org/plasma/oxygen-sounds"
-distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9ea3ad7497c74e796b49f36b23da1d0facda8d2c05466fd8c477cf0f3c9384ec
diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 750cc3b3bab3..1a8e8ca61708 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
# Template file for 'oxygen'
pkgname=oxygen
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/oxygen"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e20e969b7b71eb19673153103142ad4fc6b78b0b6f152b87a54b61f4b5cde3eb
+checksum=9011f8edd2c63594f129e0744823dde1b44fa25ffc20e4ef7fa9feb7909335b7
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 4d18c61450c7..ba0d9c8def65 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -11,7 +11,7 @@ short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://pijul.org/"
-distfiles="https://static.crates.io/crates/pijul/pijul-${version}.crate
+distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${version}.tar.gz
https://gitlab.com/sequoia-pgp/sequoia/-/archive/v${_sequoia_ver}/sequoia-v${_sequoia_ver}.tar.gz"
checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index f092b56b0f44..dd0de474d909 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-browser-integration'
pkgname=plasma-browser-integration
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://invent.kde.org/plasma/plasma-browser-integration"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d37af781b11ec1622476b51af25ac82c8d2373bb8ff9c23981cb8a1c6d97f466
+checksum=cde2c04b0ee5bde50cf19921192982ade30250bd57fec8440b5aac1e86a73b82
diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 709be32ceabb..7ddf4229880c 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-desktop'
pkgname=plasma-desktop
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
@@ -19,6 +19,6 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
homepage="https://invent.kde.org/plasma/plasma-desktop"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b94f1cd5f121312268d757078041d83220556c90f73e895518fb19542ae3c800
+checksum=e2ddd1a219b178068e4a91425185c752ff0616a8b09a80b6ccdbbb1104f334e1
replaces="user-manager>=0"
python_version=3
diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index 990de15817f3..af7005af18f0 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-disks'
pkgname=plasma-disks
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/plasma-disks"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=97f4aee2e2db0ce2dbc1bfbe4b5ad85253f435f58af5f402916ff2d1e0e98323
+checksum=2ec52b16702a6469c01b27858952b93ee2d8c52f4d30c3ee9a868c191c6e3c55
diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 91063515e3ef..59298af68225 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-firewall'
pkgname=plasma-firewall
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only OR GPL-3.0-only"
homepage="https://invent.kde.org/network/plasma-firewall"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=349db4a0908d7a6565eb8b80971eb2ed4f6d4f1730ee65de2fd23f2b1343a3ac
+checksum=01d8bde505459c4b1a959e54ad562b193995f2dd479bac6bb71f98f66004a461
diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index 66e01e2ed938..20f5a994aff3 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-integration'
pkgname=plasma-integration
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/plasma-integration"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9aa095f628d601d71283bb7b3274e2b8bfebd913c5804e3b371a5326f24b892e
+checksum=260518daaa7a608b488a4ed979ffb17ab1b447a97921a8dce6e1e04f3278998e
diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index cd076036ecee..7ffa07c3aef6 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-nm'
pkgname=plasma-nm
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,4 +16,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/plasma-nm"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2ee6bff818e5168062e1e4358851697e4397d8b666e4a58a4883489c1a51214b
+checksum=765b575ded2fac766dbf6ff61c9ff17189c57c1fe7f507435848608ca834c408
diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 326295cc3871..1e8cef4cb930 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-pa'
pkgname=plasma-pa
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/plasma-pa"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ed344553bd7516579f0c647414811f46b19789ebf4f5544181299ee52ad3f2e6
+checksum=2179107ee434fc92f7f73f69b268b4927ab90c7c61456846062ef672b2e6f09c
diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index e54873841579..3464eb26b988 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-sdk'
pkgname=plasma-sdk
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/plasma-sdk"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f98849e361c19b192998bb4966f561ea8539d6ceb98fc967e783edb36c36db21
+checksum=4460e17a5f5176db5ffd71bb315a81608914905461d40f4afa8de6d10d415f67
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"
diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 024f9d1371d7..d4d0b94ea0c4 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,16 +1,15 @@
# Template file for 'plasma-systemmonitor'
pkgname=plasma-systemmonitor
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
kpackage kconfig kcoreaddons"
-makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel
- knewstuff-devel"
+makedepends="kirigami2-devel libksysguard-devel kitemmodels-devel"
depends="kirigami2 qqc2-desktop-style kquickcharts ksystemstats"
short_desc="Application for monitoring system resources"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=294847847d9ade0cad8723f4af95bf5b36588c43c69ae4e624aaee3c2b45c3eb
+checksum=c70c35ed996645f264520c8ee74c3085ac401a2565aed0104060c2ef2ce25988
diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 30511dad8cc9..70858a496c04 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-thunderbolt'
pkgname=plasma-thunderbolt
-version=5.27.4
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=28f605034102572d406978b81f891ff5a15d50979116dd3bebc849e5712af4ff
+checksum=a5d4a0d5277fd997f5cc51cff13a468c6838f44a4624dda74d6dd293730d1a9e
do_check() {
: # Requires running dbus and bolt services
diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index db994f5c2cda..3a47686ae70a 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-vault'
pkgname=plasma-vault
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -13,5 +13,5 @@ short_desc="Plasma applet and services for creating encrypted vaults"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/KDE/plasma-vault"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e7d0d8f06767b849bd27937415b1098619d804f3870c62f7c40537f8843102ae
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=9ab2682122001f113f41a53e0ed6f521e37aad00ba384fa7f8e9390b5a9b9746
diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index ff45328b2e51..81734ebd8560 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
# Template file for 'plasma-workspace-wallpapers'
pkgname=plasma-workspace-wallpapers
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -9,5 +9,5 @@ short_desc="KDE Plasma wallpapers"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e44d7bc716f99ce13bf034d4eeed99cdd33e12db7068d74ac37d2304ee44656b
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=8c4c1066328f2aad3a503d2be95497850e2dab9667fccab1e5e97ac36289fade
diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index bfb480b88d94..427d11524b7e 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
# Template file for 'plasma-workspace'
pkgname=plasma-workspace
-version=5.27.4.1
-revision=1
+version=5.27.3
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
@@ -22,8 +22,8 @@ short_desc="KDE Window manager"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
homepage="https://invent.kde.org/plasma/plasma-workspace"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb3906ac954bfd0784614843b1aaf9abda640ea3ed944d8651aaa4149baf65a5
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=f4d337edb03178a1b8381dfaf21c4aee19bb670366866c9eb4fd42418307e13c
build_options="pipewire"
build_options_default="pipewire"
diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 64af642c6368..a1da9e51f717 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
# Template file for 'polkit-kde-agent'
pkgname=polkit-kde-agent
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -11,5 +11,5 @@ short_desc="KDE PolKit auth agent"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://commits.kde.org/polkit-kde-agent"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-1-${version}.tar.xz"
-checksum=26e795f6016e6e64e3fd4518b2a49e8df66716fab073784d943a3b7782ce70c6
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
+checksum=9d4115fb4cff03257131586bd285bb27c2ed115c5b22ce73c622d47ec0c3afab
diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 4398c8730892..886da8518be5 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
# Template file for 'powerdevil'
pkgname=powerdevil
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -12,5 +12,5 @@ short_desc="Power consumption settings of a Plasma"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/powerdevil"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=644994c77d071480d9df221b1d8f798ecc468380c174da24a3271ce5d83cd368
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=c807d4ddfa173a7bf2b6d6476eec21d6359386d7e0b7f99fe75595674ab56c99
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index b6292f67504b..d78acc5426e9 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
# Template file for 'python3-PyICU'
pkgname=python3-PyICU
-version=2.10.2
-revision=1
+version=2.9
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel icu-devel"
@@ -13,7 +13,7 @@ license="MIT"
homepage="https://pypi.org/project/PyICU/"
changelog="https://gitlab.pyicu.org/main/pyicu/-/raw/main/CHANGES"
distfiles="https://gitlab.pyicu.org/main/pyicu/-/archive/v${version}/pyicu-v${version}.tar.bz2"
-checksum=b127b633a458addc0f547092b57cbff67a1ecc2fcca7aea9dd6a8e66d600ebbb
+checksum=85bce6410b207f21b3158f7ad35925f03ac6ed44f7ffb64f53e6d2c05cdd3257
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template
index cd61df3fda1b..e5acb7b46bb5 100644
--- a/srcpkgs/python3-filelock/template
+++ b/srcpkgs/python3-filelock/template
@@ -1,16 +1,16 @@
# Template file for 'python3-filelock'
pkgname=python3-filelock
-version=3.11.0
+version=3.9.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling hatch-vcs"
depends="python3"
-checkdepends="python3-pytest python3-pytest-cov python3-coverage python3-pytest-mock"
+checkdepends="python3-pytest python3-pytest-cov python3-coverage"
short_desc="Platform independent file lock"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="Unlicense"
homepage="https://py-filelock.readthedocs.io/en/latest/"
changelog="https://raw.githubusercontent.com/tox-dev/py-filelock/main/docs/changelog.rst"
distfiles="${PYPI_SITE}/f/filelock/filelock-${version}.tar.gz"
-checksum=3618c0da67adcc0506b015fd11ef7faf1b493f0b40d87728e19986b536890c37
+checksum=7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de
make_check_pre="env PYTHONPATH=src/"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 9c46593c7d58..8f077e46efdc 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,14 +1,14 @@
# Template file for 'runit-void'
pkgname=runit-void
-version=20230413
-revision=1
+version=20220329
+revision=2
build_style=gnu-makefile
short_desc="Void Linux runit scripts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="CC0-1.0"
homepage="https://github.com/void-linux/void-runit"
-distfiles="https://github.com/void-linux/void-runit/archive/refs/tags/${version}.tar.gz"
-checksum=1049555eb27c370ec482ab576382ff951c2c33da6e8f5d165b3733c4a6d157cb
+distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
+checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718
depends="virtual?awk procps-ng runit"
conf_files="
diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template
index 4e5b5b44492e..2349c0cd3f9c 100644
--- a/srcpkgs/scrot/template
+++ b/srcpkgs/scrot/template
@@ -1,6 +1,6 @@
# Template file for 'scrot'
pkgname=scrot
-version=1.9
+version=1.8.1
revision=1
build_style=gnu-configure
make_install_args="docsdir=/usr/share/doc/scrot"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/resurrecting-open-source-projects/scrot"
distfiles="https://github.com/resurrecting-open-source-projects/scrot/archive/${version}.tar.gz"
-checksum=c4bf3fc88331a1fb0c78dba541a873b43fdeb6f7cde673162950a1290d0bf688
+checksum=dabc59ee1aa8478eb8d77d715d3e9321f07fbbc551091dcb57d10c142034e271
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" musl-legacy-compat"
diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index 2e9f1cfed4ff..4054762fe1e0 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
# Template file for 'sddm-kcm'
pkgname=sddm-kcm
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -13,5 +13,5 @@ short_desc="KDE Config Module for SDDM"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later"
homepage="https://invent.kde.org/plasma/sddm-kcm"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=977a526713fed18483234e6dd33347eece8bd02c7ca46fd473e50d59d1ac0551
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=ba85b5553c279f134d7607bdf4cb833985f988493f33d3aa1a3954eff5bf2c42
diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 03969adefe6b..c785f12cab41 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
# Template file for 'systemsettings'
pkgname=systemsettings
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
@@ -13,5 +13,5 @@ short_desc="KDE System settings"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later, GFDL-1.2-only"
homepage="https://invent.kde.org/plasma/systemsettings"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9d1d2f2f829d75467798ceea471b79ecc7c91437fbcb5b8f36bd67d512730e
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=04bca4105361416318c652d7fbf6a04ec2344365ba588d312b5d40e02d4c503e
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index a2546b11654d..4b39a9f7ed0a 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,7 +1,7 @@
# Template file for 'terraform'
pkgname=terraform
-version=1.4.5
-revision=1
+version=1.4.4
+revision=2
build_style=go
go_import_path="github.com/hashicorp/$pkgname"
short_desc="Tool for building, changing, and combining infrastructure"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MPL-2.0"
homepage="https://www.terraform.io/"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=65c2ec58448fe22a72288430d44d3269db040f3c191500d35bd065e863b3bad7
+checksum=ab9e6d743c0a00be8c6c1a2723f39191e3cbd14517acbc3e6ff2baa753865074
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 227c2bf3d373..f22814663a5b 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,7 +1,7 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.45.2
-revision=1
+version=0.45.0
+revision=2
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
depends="terraform"
@@ -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=a216317a7621013185c32bb4f68164ed32136e30242f64da61dcdbff845dfdc2
+checksum=e6161d99125a0116d0085bd1e875dd579ce88361f7bb5db29b5b7bce31015fdd
post_install() {
vlicense LICENSE.txt
diff --git a/srcpkgs/uwsgi/patches/musl-fix-python.patch b/srcpkgs/uwsgi/patches/musl-fix-python.patch
new file mode 100644
index 000000000000..b4b8fd240f57
--- /dev/null
+++ b/srcpkgs/uwsgi/patches/musl-fix-python.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
+index 0c5c1c8..5c0dc6d 100644
+--- a/plugins/python/uwsgi_python.h
++++ b/plugins/python/uwsgi_python.h
+@@ -1,4 +1,8 @@
+ #include <uwsgi.h>
++/* seems like Python.h explicitlyl redefines _GNU_SOURCE */
++#ifdef _GNU_SOURCE
++#undef _GNU_SOURCE
++#endif
+ #include <Python.h>
+
+ #include <frameobject.h>
diff --git a/srcpkgs/uwsgi/patches/musl-locking-fix.patch b/srcpkgs/uwsgi/patches/musl-locking-fix.patch
new file mode 100644
index 000000000000..2177ccdfd3fc
--- /dev/null
+++ b/srcpkgs/uwsgi/patches/musl-locking-fix.patch
@@ -0,0 +1,12 @@
+--- a/core/lock.c
++++ b/core/lock.c
+@@ -108,7 +108,9 @@ retry:
+ break;
+ default:
+ uwsgi_log("unable to set PTHREAD_PRIO_INHERIT\n");
++#if 0
+ exit(1);
++#endif
+ }
+ }
+ if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST)) {
diff --git a/srcpkgs/uwsgi/patches/python-3.11.patch b/srcpkgs/uwsgi/patches/python-3.11.patch
new file mode 100644
index 000000000000..99a03a9afa29
--- /dev/null
+++ b/srcpkgs/uwsgi/patches/python-3.11.patch
@@ -0,0 +1,188 @@
+From 2768aea6cb20d6e8d171618f2217e29f5ded4ab5 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Thu, 30 Jun 2022 11:59:54 +0200
+Subject: [PATCH] Add Python 3.11 support
+
+Link: https://github.com/unbit/uwsgi/pull/2453
+
+* Use PyFrame_GetCode().
+* Add PyFrame_GetCode() for Python 3.8 and older.
+* Add UWSGI_PY311 macro: defined on Python 3.11 and newer.
+* struct uwsgi_python: "current_recursion_depth" becomes
+ "current_recursion_remaining" and current_frame type becomes
+ _PyCFrame** on Python 3.11.
+
+Related Python 3.11 changes:
+
+* https://docs.python.org/dev/whatsnew/3.11.html#id6
+* The PyFrameObject structure became opaque.
+* PyThreadState.frame (PyFrameObject) became PyThreadState.cframe
+ (_PyCFrame) in Python 3.11.
+* PyThreadState: recursion_depth was replaced with
+ recursion_remaining + recursion_limit.
+---
+ plugins/python/profiler.c | 25 ++++++++++++++++++++-----
+ plugins/python/python_plugin.c | 26 +++++++++++++++++++++++++-
+ plugins/python/uwsgi_python.h | 12 ++++++++++++
+ 3 files changed, 57 insertions(+), 6 deletions(-)
+
+--- a/plugins/python/profiler.c
++++ b/plugins/python/profiler.c
+@@ -13,6 +13,14 @@ int PyFrame_GetLineNumber(PyFrameObject
+ }
+ #endif
+
++#if PY_VERSION_HEX < 0x030900B1
++PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
++{
++ Py_INCREF(frame->f_code);
++ return frame->f_code;
++}
++#endif
++
+ #ifdef PYTHREE
+ #undef PyString_AsString
+ static char *PyString_AsString(PyObject *o) {
+@@ -27,27 +35,32 @@ int uwsgi_python_profiler_call(PyObject
+ static uint64_t last_ts = 0;
+ uint64_t now = uwsgi_micros();
+ uint64_t delta = 0;
++ PyCodeObject *code;
+
+ switch(what) {
+ case PyTrace_CALL:
+ if (last_ts == 0) delta = 0;
+ else delta = now - last_ts;
+ last_ts = now;
++ code = PyFrame_GetCode(frame);
+ uwsgi_log("[uWSGI Python profiler %llu] CALL: %s (line %d) -> %s %d args, stacksize %d\n",
+ (unsigned long long) delta,
+- PyString_AsString(frame->f_code->co_filename),
++ PyString_AsString(code->co_filename),
+ PyFrame_GetLineNumber(frame),
+- PyString_AsString(frame->f_code->co_name), frame->f_code->co_argcount, frame->f_code->co_stacksize);
++ PyString_AsString(code->co_name), code->co_argcount, code->co_stacksize);
++ Py_DECREF(code);
+ break;
+ case PyTrace_C_CALL:
+ if (last_ts == 0) delta = 0;
+ else delta = now - last_ts;
+ last_ts = now;
++ code = PyFrame_GetCode(frame);
+ uwsgi_log("[uWSGI Python profiler %llu] C CALL: %s (line %d) -> %s %d args, stacksize %d\n",
+ (unsigned long long) delta,
+- PyString_AsString(frame->f_code->co_filename),
++ PyString_AsString(code->co_filename),
+ PyFrame_GetLineNumber(frame),
+- PyEval_GetFuncName(arg), frame->f_code->co_argcount, frame->f_code->co_stacksize);
++ PyEval_GetFuncName(arg), code->co_argcount, code->co_stacksize);
++ Py_DECREF(code);
+ break;
+ }
+
+@@ -68,7 +81,9 @@ int uwsgi_python_tracer(PyObject *obj, P
+ delta = now - last_ts;
+ }
+ last_ts = now;
+- uwsgi_log("[uWSGI Python profiler %llu] file %s line %d: %s argc:%d\n", (unsigned long long)delta, PyString_AsString(frame->f_code->co_filename), PyFrame_GetLineNumber(frame), PyString_AsString(frame->f_code->co_name), frame->f_code->co_argcount);
++ PyCodeObject *code = PyFrame_GetCode(frame);
++ uwsgi_log("[uWSGI Python profiler %llu] file %s line %d: %s argc:%d\n", (unsigned long long)delta, PyString_AsString(code->co_filename), PyFrame_GetLineNumber(frame), PyString_AsString(code->co_name), code->co_argcount);
++ Py_DECREF(code);
+ }
+
+ return 0;
+--- a/plugins/python/python_plugin.c
++++ b/plugins/python/python_plugin.c
+@@ -1138,8 +1138,12 @@ void uwsgi_python_init_apps() {
+
+ // prepare for stack suspend/resume
+ if (uwsgi.async > 1) {
++#ifdef UWSGI_PY311
++ up.current_recursion_remaining = uwsgi_malloc(sizeof(int)*uwsgi.async);
++#else
+ up.current_recursion_depth = uwsgi_malloc(sizeof(int)*uwsgi.async);
+- up.current_frame = uwsgi_malloc(sizeof(struct _frame)*uwsgi.async);
++#endif
++ up.current_frame = uwsgi_malloc(sizeof(up.current_frame[0])*uwsgi.async);
+ }
+
+ // setup app loaders
+@@ -1530,12 +1534,22 @@ void uwsgi_python_suspend(struct wsgi_re
+ PyGILState_Release(pgst);
+
+ if (wsgi_req) {
++#ifdef UWSGI_PY311
++ up.current_recursion_remaining[wsgi_req->async_id] = tstate->recursion_remaining;
++ up.current_frame[wsgi_req->async_id] = tstate->cframe;
++#else
+ up.current_recursion_depth[wsgi_req->async_id] = tstate->recursion_depth;
+ up.current_frame[wsgi_req->async_id] = tstate->frame;
++#endif
+ }
+ else {
++#ifdef UWSGI_PY311
++ up.current_main_recursion_remaining = tstate->recursion_remaining;
++ up.current_main_frame = tstate->cframe;
++#else
+ up.current_main_recursion_depth = tstate->recursion_depth;
+ up.current_main_frame = tstate->frame;
++#endif
+ }
+
+ }
+@@ -1763,12 +1777,22 @@ void uwsgi_python_resume(struct wsgi_req
+ PyGILState_Release(pgst);
+
+ if (wsgi_req) {
++#ifdef UWSGI_PY311
++ tstate->recursion_remaining = up.current_recursion_remaining[wsgi_req->async_id];
++ tstate->cframe = up.current_frame[wsgi_req->async_id];
++#else
+ tstate->recursion_depth = up.current_recursion_depth[wsgi_req->async_id];
+ tstate->frame = up.current_frame[wsgi_req->async_id];
++#endif
+ }
+ else {
++#ifdef UWSGI_PY311
++ tstate->recursion_remaining = up.current_main_recursion_remaining;
++ tstate->cframe = up.current_main_frame;
++#else
+ tstate->recursion_depth = up.current_main_recursion_depth;
+ tstate->frame = up.current_main_frame;
++#endif
+ }
+
+ }
+--- a/plugins/python/uwsgi_python.h
++++ b/plugins/python/uwsgi_python.h
+@@ -18,6 +18,10 @@
+ #define UWSGI_PYTHON_OLD
+ #endif
+
++#if (PY_VERSION_HEX >= 0x030b0000)
++# define UWSGI_PY311
++#endif
++
+ #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7
+ #define HAS_NOT_PyMemoryView_FromBuffer
+ #endif
+@@ -165,11 +169,19 @@ struct uwsgi_python {
+
+ char *callable;
+
++#ifdef UWSGI_PY311
++ int *current_recursion_remaining;
++ _PyCFrame **current_frame;
++
++ int current_main_recursion_remaining;
++ _PyCFrame *current_main_frame;
++#else
+ int *current_recursion_depth;
+ struct _frame **current_frame;
+
+ int current_main_recursion_depth;
+ struct _frame *current_main_frame;
++#endif
+
+ void (*swap_ts)(struct wsgi_request *, struct uwsgi_app *);
+ void (*reset_ts)(struct wsgi_request *, struct uwsgi_app *);
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index f9adf6d463b8..d41ab59c8df3 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,15 +1,15 @@
# Template file for 'uwsgi'
pkgname=uwsgi
-version=2.0.21
-revision=1
+version=2.0.20
+revision=2
hostmakedepends="python3"
-makedepends="python3-devel openssl-devel"
+makedepends="python3-devel"
short_desc="Fast, self-healing application container server"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only WITH GCC-exception-2.0"
homepage="http://projects.unbit.it/uwsgi"
distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
-checksum=35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9
+checksum=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
_libdir=usr/lib/uwsgi
@@ -42,7 +42,6 @@ do_install() {
}
uwsgi-python3_package() {
- depends="${sourcepkg}>=${version}_${revision}"
short_desc="$short_desc (Python3 plugin)"
pkg_install() {
vinstall python3_plugin.so 644 $_libdir
@@ -50,7 +49,6 @@ uwsgi-python3_package() {
}
uwsgi-cgi_package() {
- depends="${sourcepkg}>=${version}_${revision}"
short_desc="$short_desc (CGI plugin)"
pkg_install() {
vinstall cgi_plugin.so 644 $_libdir
diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 771f4d988b8f..2248ec7b9c04 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
# Template file for 'xdg-desktop-portal-kde'
pkgname=xdg-desktop-portal-kde
-version=5.27.4.1
+version=5.27.3
revision=1
build_style=cmake
configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,5 +12,5 @@ short_desc="Backend implementation for xdg-desktop-portal that is using Qt/KF5"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efc6c2dda2893507acc574b7327140b8982752d6ed71740e1f4bf91128a63d43
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=cdba28348d165195da7db7f6c5a8f4e17f67de0e41133c6ca5de2de2539f8734
^ permalink raw reply [flat|nested] 50+ messages in thread