* [PR PATCH] Aide 0.18.2
@ 2023-04-18 11:48 abenson
2023-04-18 11:48 ` [PR PATCH] [Updated] " abenson
2023-04-19 2:00 ` [PR PATCH] [Merged]: " abenson
0 siblings, 2 replies; 3+ messages in thread
From: abenson @ 2023-04-18 11:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
There is a new pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages aide_0.18.2
https://github.com/void-linux/void-packages/pull/43509
Aide 0.18.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
~~~
pkg host target cross result
aide x86_64 x86_64 n OK
aide x86_64-musl x86_64-musl n OK
aide i686 i686 n OK
aide x86_64 aarch64-musl y OK
aide x86_64 aarch64 y OK
aide x86_64 armv7l-musl y OK
aide x86_64 armv7l y OK
aide x86_64 armv6l-musl y OK
aide x86_64 armv6l y OK
~~~
A patch file from https://github.com/void-linux/void-packages/pull/43509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aide_0.18.2-43509.patch --]
[-- Type: text/x-diff, Size: 100225 bytes --]
From 793431b6bdc8c96b4bb1dc1adfba626d3cd26d5c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 15:55:23 +0200
Subject: [PATCH 01/47] libsasl: update to 2.1.28.
---
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 +++--
5 files changed, 6 insertions(+), 109 deletions(-)
delete mode 100644 srcpkgs/libsasl/patches/CVE-2019-19906.patch
delete mode 100644 srcpkgs/libsasl/patches/cross.patch
delete mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
delete mode 100644 srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
diff --git a/srcpkgs/libsasl/patches/CVE-2019-19906.patch b/srcpkgs/libsasl/patches/CVE-2019-19906.patch
deleted file mode 100644
index f7edb521e89f..000000000000
--- a/srcpkgs/libsasl/patches/CVE-2019-19906.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 6d14b83ac667..000000000000
--- a/srcpkgs/libsasl/patches/cross.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
deleted file mode 100644
index 7ba335559b80..000000000000
--- a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-as_needed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index 9154a5a66d38..000000000000
--- a/srcpkgs/libsasl/patches/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 2e2abe818e2b..79afba2f332d 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,13 +1,15 @@
# Template file for 'libsasl'
+# keep in sync with cyrus-sasl
pkgname=libsasl
-version=2.1.27
-revision=2
+version=2.1.28
+revision=1
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"
+ --with-devrandom=/dev/random
+ ac_cv_gssapi_supports_spnego=yes"
hostmakedepends="automake libtool pkg-config"
makedepends="db-devel"
short_desc="Cyrus SASL - runtime shared libraries"
@@ -15,7 +17,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=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
+checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
pre_configure() {
autoreconf -fi
From ffbe352b3ec59006a0ecc8f34116b6e015934761 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 15:55:31 +0200
Subject: [PATCH 02/47] cyrus-sasl: update to 2.1.28.
Co-authored-by: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
---
srcpkgs/cyrus-sasl/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index b259152139fd..3ee25aeb1178 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,8 @@
# Template file for 'cyrus-sasl'
+# keep in sync with libsasl
pkgname=cyrus-sasl
-version=2.1.27
-revision=9
+version=2.1.28
+revision=1
build_style=gnu-configure
configure_args="--disable-static --enable-shared --enable-checkapop
--enable-cram --enable-digest --disable-otp --disable-srp
@@ -10,7 +11,8 @@ 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"
+ --with-mysql=${XBPS_CROSS_BASE}/usr
+ ac_cv_gssapi_supports_spnego=yes"
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
@@ -21,7 +23,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=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
+checksum=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
pre_configure() {
autoreconf -fi
From f10595afb20dc1118d94135f0205367effabdc4a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 17:09:10 +0200
Subject: [PATCH 03/47] dar: update to 2.7.9.
---
srcpkgs/dar/patches/fix-configure.patch | 36 -------------------------
srcpkgs/dar/patches/musl-getopt.patch | 19 -------------
srcpkgs/dar/template | 17 +++++++++---
3 files changed, 13 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/dar/patches/fix-configure.patch
delete mode 100644 srcpkgs/dar/patches/musl-getopt.patch
diff --git a/srcpkgs/dar/patches/fix-configure.patch b/srcpkgs/dar/patches/fix-configure.patch
deleted file mode 100644
index f6b6a04578cb..000000000000
--- a/srcpkgs/dar/patches/fix-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 1200567a30de..000000000000
--- a/srcpkgs/dar/patches/musl-getopt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 c289909e8122..51aa02f6aed0 100644
--- a/srcpkgs/dar/template
+++ b/srcpkgs/dar/template
@@ -1,19 +1,19 @@
# Template file for 'dar'
pkgname=dar
-version=2.6.13
+version=2.7.9
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"
+hostmakedepends="automake gettext-devel gpgme-devel libtool pkg-config which"
makedepends="acl-devel bzip2-devel e2fsprogs-devel libgcrypt-devel liblzma-devel
- lzo-devel librsync-devel libcurl-devel"
+ lzo-devel librsync-devel libcurl-devel libargon2-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=3fea9ff9e55fb9827e17a080de7d1a2605b82c2320c0dec969071efefdbfd097
+checksum=1c609f691f99e6a868c0a6fcf70d2f5d2adee5dc3c0cbf374e69983129677df5
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr
@@ -21,6 +21,15 @@ 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
:
From 7b79040199fdd762a524a7861f50673943537410 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 17:18:30 +0200
Subject: [PATCH 04/47] chroot-distcc: update to 3.4.
---
...cc_rewrite_fqn-avoid-heap-corruption.patch | 65 +++++++++++++++++++
srcpkgs/chroot-distcc/patches/gcc-10.patch | 15 +++++
srcpkgs/chroot-distcc/template | 19 ++----
3 files changed, 85 insertions(+), 14 deletions(-)
create mode 100644 srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
create mode 100644 srcpkgs/chroot-distcc/patches/gcc-10.patch
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
new file mode 100644
index 000000000000..5d0a86d2f1aa
--- /dev/null
+++ b/srcpkgs/chroot-distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 000000000000..599de51e0d92
--- /dev/null
+++ b/srcpkgs/chroot-distcc/patches/gcc-10.patch
@@ -0,0 +1,15 @@
+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 8391ec04cf75..00810870a7be 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.3.3
+version=3.4
revision=1
bootstrap=yes
build_style=gnu-configure
@@ -12,24 +12,15 @@ 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=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+checksum=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
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.
@@ -39,13 +30,13 @@ post_install() {
# gcc wrappers
vmkdir usr/lib/distcc/bin
- for f in gcc cc c++ g++; do
+ for f in gcc cc c++ g++ cpp; 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; do
- for f in gcc cc c++ g++; do
+ arm-linux-musleabihf armv7l-linux-musleabihf aarch64-linux-gnu aarch64-linux-musl; do
+ for f in gcc cc c++ g++ cpp; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
From bb3bb59a115b901f67697d774f6af77c0b0171a3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 18:11:53 +0200
Subject: [PATCH 05/47] distcc: update to 3.4.
---
...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 +++---
4 files changed, 145 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
create mode 100644 srcpkgs/distcc/patches/gcc-10.patch
create mode 100644 srcpkgs/distcc/patches/python-3.9.patch
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
new file mode 100644
index 000000000000..5d0a86d2f1aa
--- /dev/null
+++ b/srcpkgs/distcc/patches/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 000000000000..599de51e0d92
--- /dev/null
+++ b/srcpkgs/distcc/patches/gcc-10.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..0f55826549a6
--- /dev/null
+++ b/srcpkgs/distcc/patches/python-3.9.patch
@@ -0,0 +1,55 @@
+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 de16773fc33b..a5ff057b2362 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,23 +1,23 @@
# Template file for 'distcc'
pkgname=distcc
-version=3.3.3
-revision=7
+version=3.4
+revision=1
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=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
-conflicts="chroot-distcc>=0"
+checksum=2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d
-CFLAGS="-fcommon"
+disable_parallel_check=yes
subpackages=" "
@@ -43,13 +43,13 @@ post_install() {
# cc wrappers
vmkdir usr/lib/distcc/bin
- for f in gcc cc c++ g++ clang clang++; do
+ for f in gcc cc c++ g++ clang clang++ cpp; 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; do
- for f in gcc cc c++ g++; do
+ arm-linux-musleabihf armv7l-linux-musleabihf aarch64-linux-gnu aarch64-linux-musl; do
+ for f in gcc cc c++ g++ cpp; do
ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${x}-${f}
done
done
From 598196ff3b8034d7d1cf1a354167075c571acc73 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 29 Jan 2023 11:19:58 +0200
Subject: [PATCH 06/47] dropbear: update to 2022.83.
---
srcpkgs/dropbear/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 8b792314536d..5a8f80c6c7e5 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,6 +1,6 @@
# Template file for 'dropbear'
pkgname=dropbear
-version=2022.82
+version=2022.83
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=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1
+checksum=bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b
make_dirs="/etc/dropbear 0755 root root"
# These tests don't work from within xbps-src
From 16e9c941f5f138de285cfcfbf60dac7dbda2219a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 18:18:55 +0200
Subject: [PATCH 07/47] dejagnu: update to 1.6.3.
---
srcpkgs/dejagnu/template | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/dejagnu/template b/srcpkgs/dejagnu/template
index 5a2572644c11..971f22236ecf 100644
--- a/srcpkgs/dejagnu/template
+++ b/srcpkgs/dejagnu/template
@@ -1,17 +1,14 @@
# Template file for 'dejagnu'
pkgname=dejagnu
-version=1.6.2
+version=1.6.3
revision=1
build_style=gnu-configure
makedepends="expect-devel"
depends="expect"
short_desc="Framework for running test suites on GNU tools"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/dejagnu/"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="${makedepends}"
-fi
+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
From a1df56cabd2f29a352a3b1e8aa1b5c617f28539c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 18:22:03 +0200
Subject: [PATCH 08/47] deheader: update to 1.10.
---
srcpkgs/deheader/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template
index 8b763179efd2..529dabd4af17 100644
--- a/srcpkgs/deheader/template
+++ b/srcpkgs/deheader/template
@@ -1,14 +1,15 @@
# Template file for 'deheader'
pkgname=deheader
-version=1.7
+version=1.10
revision=1
depends="python3"
short_desc="C and C++ header analyzer"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://www.catb.org/~esr/deheader/"
-distfiles="http://www.catb.org/~esr/deheader/${pkgname}-${version}.tar.gz"
-checksum=6856e4fa3efa664a0444b81c2e1f0209103be3b058455625c79abe65cf8db70d
+distfiles="http://www.catb.org/~esr/deheader/deheader-${version}.tar.gz"
+changelog="https://gitlab.com/esr/deheader/-/raw/master/NEWS.adoc"
+checksum=909d2683a3e62da54bfc660814b4d8af93f582e23858810cc41bfa081571f593
python_version=3
do_install() {
From c8a950db84c954aa0a653d806d94c27f7ae2ec6d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 18:58:22 +0200
Subject: [PATCH 09/47] efivar: update to 38.
---
common/shlibs | 1 +
...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 ++-
8 files changed, 313 insertions(+), 229 deletions(-)
delete mode 100644 srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
delete mode 100644 srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
create mode 100644 srcpkgs/efivar/patches/build-tester.patch
delete mode 100644 srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch
create mode 100644 srcpkgs/efivar/patches/lfs64.patch
create mode 100644 srcpkgs/efivar/patches/musl-compat.patch
diff --git a/common/shlibs b/common/shlibs
index 605a8249c8e2..df30e9a925c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1745,6 +1745,7 @@ 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/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
deleted file mode 100644
index 64aa449c9a45..000000000000
--- a/srcpkgs/efivar/patches/0001-Support-custom-cflags-for-CC_FOR_BUILD-and-CCLD_FOR_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index 649a57d7bac8..000000000000
--- a/srcpkgs/efivar/patches/0002-Replace-call-to-strncpy-by-memcpy-to-fix-some-GCC8-w.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-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
new file mode 100644
index 000000000000..74f1d1cd98aa
--- /dev/null
+++ b/srcpkgs/efivar/patches/build-tester.patch
@@ -0,0 +1,10 @@
+--- 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
deleted file mode 100644
index fcc83aef20cf..000000000000
--- a/srcpkgs/efivar/patches/fix-compat-glibc-2.36.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
new file mode 100644
index 000000000000..b84e91aa391b
--- /dev/null
+++ b/srcpkgs/efivar/patches/lfs64.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 000000000000..00229be5c723
--- /dev/null
+++ b/srcpkgs/efivar/patches/musl-compat.patch
@@ -0,0 +1,231 @@
+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 9a21d44175b9..ef6298a311d7 100644
--- a/srcpkgs/efivar/template
+++ b/srcpkgs/efivar/template
@@ -1,23 +1,39 @@
# Template file for 'efivar'
pkgname=efivar
-version=37
-revision=2
+version=38
+revision=1
build_style=gnu-makefile
make_build_args="libdir=/usr/lib"
-make_build_target="all test"
+make_check_args="GRUB_PREFIX=grub"
+make_check_target="test"
make_install_args="libdir=/usr/lib"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config mdocml"
+checkdepends="grub"
short_desc="Tools to manipulate EFI variables"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
-homepage="https://github.com/rhinstaller/efivar"
+homepage="https://github.com/rhboot/efivar"
distfiles="https://github.com/rhboot/efivar/releases/download/${version}/efivar-${version}.tar.bz2"
-checksum=3c67feb93f901b98fbb897d5ca82931a6698b5bcd6ac34f0815f670d77747b9f
+checksum=f018ed6e49c5f1c16d336d9fd7687ce87023276591921db1e49a314ad6515349
-CFLAGS="-D_GNU_SOURCE -Wno-error=address-of-packed-member"
+disable_parallel_check=yes
-post_build() {
- make -C src/test
+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_install() {
From 6a73c25edc9bd13421ed52b73ca2c038e1e9277a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 15 Apr 2023 19:46:52 +0200
Subject: [PATCH 10/47] python3-filelock: update to 3.11.0.
---
srcpkgs/python3-filelock/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template
index e5acb7b46bb5..cd61df3fda1b 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.9.0
+version=3.11.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling hatch-vcs"
depends="python3"
-checkdepends="python3-pytest python3-pytest-cov python3-coverage"
+checkdepends="python3-pytest python3-pytest-cov python3-coverage python3-pytest-mock"
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=7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de
+checksum=3618c0da67adcc0506b015fd11ef7faf1b493f0b40d87728e19986b536890c37
make_check_pre="env PYTHONPATH=src/"
From 36fafe602c2598868db948d6e5376e740cb2b846 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 20:06:07 +0200
Subject: [PATCH 11/47] font-go-ttf: update to 2.010.
---
srcpkgs/font-go-ttf/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/font-go-ttf/template b/srcpkgs/font-go-ttf/template
index fb133a2b1e1a..b40a2ccd8f44 100644
--- a/srcpkgs/font-go-ttf/template
+++ b/srcpkgs/font-go-ttf/template
@@ -1,13 +1,14 @@
# Template file for 'font-go-ttf'
pkgname=font-go-ttf
-version=0.1.0
+version=2.010
revision=1
+_git_rev="41969df76e82aeec85fa3821b1e24955ea993001"
short_desc="Typeface designed for go source code"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://go.dev/blog/go-fonts"
-distfiles="https://github.com/golang/image/archive/refs/tags/v${version}.tar.gz"
-checksum=50d8069c455f934fc7fc0902e9065e4b6401f23ae29616de402c19f8497aae59
+distfiles="https://github.com/golang/image/archive/${_git_rev}.tar.gz"
+checksum=2e3e6ebdd62a0825468a155524efb65b9bbe211db20a07906f417f12db58cc6e
do_install() {
cd font/gofont/ttfs
From 69437128e16e22e33705cc51561e5e04f229af48 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 20:07:36 +0200
Subject: [PATCH 12/47] elinks: update to 0.16.0.
---
srcpkgs/elinks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index bf1e16ed14ec..c01ad2ece3cf 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,6 +1,6 @@
# Template file for 'elinks'
pkgname=elinks
-version=0.15.1
+version=0.16.0
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=a3ebb14e179fcf97f93874b7771b4b05c1b7fdc704807334e865273d9de8428f
+checksum=5494a73737eeb182fe2333b74e9b6192170f583c7722a0650dcd14ef088b9dfb
pre_configure() {
autoreconf -fi
From 461634977f0dbcd97b177508e70f2b6c3b244575 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 20:09:24 +0200
Subject: [PATCH 13/47] encodings: update to 1.0.7.
---
srcpkgs/encodings/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index f29dcc1c2f67..797c47619449 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,6 +1,6 @@
# Template file for 'encodings'
pkgname=encodings
-version=1.0.6
+version=1.0.7
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=77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26
+checksum=3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4
pre_build() {
vsed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
From 2f9133505dbff86f34cc2ef5a7a9d85d08cdd47d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 15 Apr 2023 20:10:08 +0200
Subject: [PATCH 14/47] editorconfig: update to 0.12.6.
---
srcpkgs/editorconfig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/editorconfig/template b/srcpkgs/editorconfig/template
index 3c2be4ac3e80..c9c834cf98c0 100644
--- a/srcpkgs/editorconfig/template
+++ b/srcpkgs/editorconfig/template
@@ -1,6 +1,6 @@
# Template file for 'editorconfig'
pkgname=editorconfig
-version=0.12.4
+version=0.12.6
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=c2671595f1793b498cdf50b9dc03d632cc724891de7909f2ea78588fbffba289
+checksum=36052a5371731d915b53d9c7a24a11c4032585ccacb392ec9d58656eef4c0edf
post_install() {
vlicense LICENSE
From f3eba2269ea8b8d0d1bc60912bacafe17fe44394 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 16 Apr 2023 11:07:14 +0200
Subject: [PATCH 15/47] wine: update to 8.6.
---
srcpkgs/wine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index a2feac405c08..88e16b563fba 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
# Template file for 'wine'
pkgname=wine
-version=8.5
+version=8.6
revision=1
_pkgver=${version/r/-r}
create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.winehq.org/"
distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="c09766401b30bb425e132e114b26dafa4276497e40ccbe15fb77e751fb09be17
- 1934dba09508bd23f1bce91a2dc0175a3816201ccd6d856c02ac4595a6162616"
+checksum="3ed526b2f9d78dfe186e20cf23d393ccdce57c9015b47eb6231f645a424c89c9
+ 4bfc508ff26a16c8adc68fc518061f4f9feb7efc89288a9bc1d89cd0cfec3546"
build_options="mingw staging xshm"
build_options_default="mingw xshm"
From 32b6b80b3feba55026abd1e6160420996dd0e3b2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 11:25:53 +0200
Subject: [PATCH 16/47] docker-compose: update to 2.17.2.
---
srcpkgs/docker-compose/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index 64e0368fc6f3..5d33c60c9209 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,7 +1,7 @@
# Template file for 'docker-compose'
pkgname=docker-compose
-version=2.16.0
-revision=2
+version=2.17.2
+revision=1
build_style=go
go_import_path="github.com/docker/compose/v2/cmd"
go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://docs.docker.com/compose/"
changelog="https://github.com/docker/compose/releases"
distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
-checksum=556dc59075280442128f5b45a8ff37638fb357c2a956bd751dd0ba747c93e71d
+checksum=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d707308d8ad3167450c8094
post_install() {
mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
From 7ec0ebf193fe04ebf4f158b7aa31acf20b74aa60 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 11:31:38 +0200
Subject: [PATCH 17/47] libhandy1: update to 1.8.2.
---
srcpkgs/libhandy1/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 25788c2ec019..6d6f63febd98 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
# Template file for 'libhandy1'
pkgname=libhandy1
-version=1.8.1
+version=1.8.2
revision=1
build_style=meson
build_helper="gir"
@@ -17,16 +17,13 @@ homepage="https://gitlab.gnome.org/GNOME/libhandy/"
#changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/main/NEWS"
changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/libhandy-1-8/NEWS"
distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=3766b9a881fe0658cc6080453a2219086c3f6dbd82069de409b8ab3f59948a70
+checksum=d11aa2cd3e570ac6d0efdba46d173147c11f45826457e924c05990bb2e0df9ad
+make_check_pre="xvfb-run"
build_options="gir glade gtk_doc"
desc_option_glade="Generate glade modules and catalog files"
build_options_default="gir glade gtk_doc"
-do_check() {
- xvfb-run ninja -C build test
-}
-
libhandy1-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
short_desc+=" - development files"
From 58095f1e031f393eac3e78e87f88ae516dd6b9db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 11:32:48 +0200
Subject: [PATCH 18/47] python3-charset-normalizer: update to 3.1.0.
---
srcpkgs/python3-charset-normalizer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 74b6a32d5707..9091108dd602 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
# Template file for 'python3-charset-normalizer'
pkgname=python3-charset-normalizer
-version=3.0.1
+version=3.1.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://charset-normalizer.readthedocs.io/"
changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=e20e078e48e03b493674443bd005d360128a440394e2bc8cbb7a01610cb652d9
+checksum=0ca96d2ffef13e7062c53df8619e97b910343d1e14b4b92ee71bc61d2d18ced4
pre_check() {
vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg
From afb8f29047ffbb6799ae40a6e471f17d1a637967 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 12:12:15 +0200
Subject: [PATCH 19/47] esptool: update to 4.5.1.
---
srcpkgs/esptool/template | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/esptool/template b/srcpkgs/esptool/template
index 2adcc46099bf..098a28f026d7 100644
--- a/srcpkgs/esptool/template
+++ b/srcpkgs/esptool/template
@@ -1,15 +1,22 @@
# Template file for 'esptool'
pkgname=esptool
-version=4.2.1
-revision=2
+version=4.5.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-bitstring python3-cryptography python3-ecdsa python3-pyserial
python3-reedsolo"
-checkdepends="$depends"
+checkdepends="python3-pytest ${depends} python3-pyelftools"
short_desc="Espressif SoC serial bootloader utility"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://github.com/espressif/esptool"
-distfiles="${PYPI_SITE}/e/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=b967faed94dd43f547953fde362d3ba5b63dddca0a0ff7982750054702cbc238
+distfiles="https://github.com/espressif/esptool/archive/refs/tags/v${version}.tar.gz"
+checksum=759e0c9a5e69d21e13a5fcf53d46cb567cb3a8e4a6cefda334b6d3a3d540b5f4
+
+post_extract() {
+ # needs access to hardware
+ rm test/test_esptool.py
+ # needs python3-pkcs11
+ rm test/test_espsecure_hsm.py
+}
From a73b686f5a4d93cd33532ec2a178217649fe44fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 12:12:19 +0200
Subject: [PATCH 20/47] python3-reedsolo: update to 1.5.11.
---
srcpkgs/python3-reedsolo/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-reedsolo/template b/srcpkgs/python3-reedsolo/template
index 87080ea41c7d..124ecbc0aedb 100644
--- a/srcpkgs/python3-reedsolo/template
+++ b/srcpkgs/python3-reedsolo/template
@@ -1,7 +1,7 @@
# Template file for 'python3-reedsolo'
pkgname=python3-reedsolo
-version=1.5.4
-revision=2
+version=1.5.11
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3"
@@ -10,4 +10,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="Public Domain"
homepage="https://github.com/tomerfiliba/reedsolomon"
distfiles="${PYPI_SITE}/r/reedsolo/reedsolo-${version}.tar.gz"
-checksum=b8b25cdc83478ccb06361a0e8fadc27b376a3dfabbb1dc6bb583a998a22c0127
+checksum=37c268d9ec86784e2f11d62097b7473c8444ab740c3c127a355f5077460d0097
From 5392074145908d804dfde53621ce2c7f6501b608 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 12:29:31 +0200
Subject: [PATCH 21/47] python3-astroid: update to 2.15.2.
---
srcpkgs/python3-astroid/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 5618646ac4a9..2a3a75090be5 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
# Template file for 'python3-astroid'
pkgname=python3-astroid
-version=2.14.2
+version=2.15.2
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -12,9 +12,4 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://github.com/PyCQA/astroid"
changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
distfiles="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=f0c84b29ef02e271a65d535b7c7a9942b951ffacdcdb266e837c96fd7239f555
-
-post_extract() {
- # relax build tool version restrictions
- vsed -e '/^requires =/s/~=[0-9.]\+//g' -i pyproject.toml
-}
+checksum=eb9a4ee7ca74a6f4f2a26e3cb68db2f0dc0a4350555782f3b61cb5bc7c1794e4
From d07006325e8a436ed63425c050f70f43509414ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 12:32:25 +0200
Subject: [PATCH 22/47] pylint: update to 2.17.2.
---
srcpkgs/pylint/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 2c4042ff71f4..b1e2221920db 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,13 +1,13 @@
# Template file for 'pylint'
pkgname=pylint
-version=2.16.2
+version=2.17.2
revision=1
build_style=python3-pep517
make_build_args="--skip-dependency-check --no-isolation --wheel"
make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
hostmakedepends="python3-wheel"
depends="python3-astroid python3-isort python3-mccabe python3-tomlkit
- python3-tomli python3-platformdirs python3-dill"
+ python3-platformdirs python3-dill"
checkdepends="$depends python3-pytest python3-tkinter python3-six
python3-GitPython git"
short_desc="Python code static checker"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-2.0-or-later"
homepage="https://pylint.pycqa.org"
distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=55e7cb236f706807bfecd2e3d710e98fb5657adffb5c8ef7fd7eb843c41c5841
+checksum=4e1052a2cf2d9c3098382e395519abaa3ebec8d5b749cad8d249cccb799adb05
make_check=no # FIXME
post_install() {
From f4d347a1277ab28588ac2f263701bf71e9aee51e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:09:46 +0200
Subject: [PATCH 23/47] rdiff-backup: update to 2.2.4.
---
srcpkgs/rdiff-backup/patches/python-3.11.patch | 16 ----------------
srcpkgs/rdiff-backup/template | 10 +++++-----
2 files changed, 5 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/rdiff-backup/patches/python-3.11.patch
diff --git a/srcpkgs/rdiff-backup/patches/python-3.11.patch b/srcpkgs/rdiff-backup/patches/python-3.11.patch
deleted file mode 100644
index 617873bc5d0b..000000000000
--- a/srcpkgs/rdiff-backup/patches/python-3.11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/_librsyncmodule.c
-+++ b/src/_librsyncmodule.c
-@@ -540,8 +540,13 @@ PyMODINIT_FUNC PyInit__librsync(void)
- {
- PyObject *m, *d;
-
-+#if PY_VERSION_HEX >= 0x03090000
-+ Py_SET_TYPE(&_librsync_SigMakerType, &PyType_Type);
-+ Py_SET_TYPE(&_librsync_DeltaMakerType, &PyType_Type);
-+#else
- Py_TYPE(&_librsync_SigMakerType) = &PyType_Type;
- Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
-+#endif
- static struct PyModuleDef librsync_def = {
- PyModuleDef_HEAD_INIT, "_librsync", "RSync Lib", -1, _librsyncMethods, };
- m = PyModule_Create(&librsync_def);
diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index fad6d4398c11..0329d02505ba 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,15 +1,15 @@
# Template file for 'rdiff-backup'
pkgname=rdiff-backup
-version=2.0.5
-revision=5
+version=2.2.4
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+hostmakedepends="python3 python3-setuptools_scm python3-pip"
makedepends="python3-devel librsync-devel"
-depends="python3-pyxattr"
+depends="python3-pyxattr python3-yaml"
short_desc="Local/remote mirroring and incremental backups"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://rdiff-backup.net/"
changelog="https://github.com/rdiff-backup/rdiff-backup/raw/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/r/rdiff-backup/rdiff-backup-${version}.tar.gz"
-checksum=54d16038e62014ed916c71c8303b07d2fa61a6a68038ca189fc2d31534b0f38b
+checksum=948151492a42c2ad47ca90dfb2d1cbe7a5bb90f2bc2b9b6f3ef4238a7bf0dbf5
From 2d39ac61474019f3e65a886a089f0c45da242244 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sun, 16 Apr 2023 15:28:35 +0200
Subject: [PATCH 24/47] kubernetes: update to 1.27.1.
---
srcpkgs/kubernetes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kubernetes/template b/srcpkgs/kubernetes/template
index 6c3ccbff817c..2cd3a8e544a2 100644
--- a/srcpkgs/kubernetes/template
+++ b/srcpkgs/kubernetes/template
@@ -1,6 +1,6 @@
# Template file for 'kubernetes'
pkgname=kubernetes
-version=1.27.0
+version=1.27.1
revision=1
archs="aarch64* x86_64* ppc64le*"
build_style=go
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="http://kubernetes.io"
distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=536025dba2714ee5e940bb0a6b1df9ca97c244fa5b00236e012776a69121c323
+checksum=3a3f7c6b8cf1d9f03aa67ba2f04669772b1205b89826859f1636062d5f8bec3f
nocross=yes
system_accounts="kube"
make_dirs="/var/lib/kubelet 0755 kube kube"
From 2df91d662ff6cc54721effd93d1000695facee92 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:36:26 +0200
Subject: [PATCH 25/47] dbus: update to 1.14.6.
---
srcpkgs/dbus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 2554bea742c3..4b3a4fc6cfd1 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
# Template file for 'dbus'
# NOTE: keep this pkg synchronized with dbus-elogind
pkgname=dbus
-version=1.14.4
+version=1.14.6
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e
+checksum=fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b
python_version=3
conf_files="/etc/dbus-1/*.conf"
From 4fae8a744612da8146deceaaccb0068e7f576610 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:36:30 +0200
Subject: [PATCH 26/47] dbus-elogind: update to 1.14.6.
---
srcpkgs/dbus-elogind/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbus-elogind/template b/srcpkgs/dbus-elogind/template
index f15ed03122e7..2f6b4bdfee41 100644
--- a/srcpkgs/dbus-elogind/template
+++ b/srcpkgs/dbus-elogind/template
@@ -1,7 +1,7 @@
# Template file for 'dbus-elogind'
# NOTE: keep this pkg synchronized with dbus
pkgname=dbus-elogind
-version=1.14.4
+version=1.14.6
revision=1
build_style=gnu-configure
configure_args="--disable-selinux --enable-inotify --with-dbus-user=dbus
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
homepage="https://dbus.freedesktop.org/"
changelog="https://raw.githubusercontent.com/freedesktop/dbus/dbus-1.14/NEWS"
distfiles="https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"
-checksum=7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e
+checksum=fd2bdf1bb89dc365a46531bff631536f22b0d1c6d5ce2c5c5e59b55265b3d66b
conf_files="/etc/dbus-1/*.conf"
replaces="dbus>=0"
provides="dbus-${version}_${revision}"
From 08f97c7dfd1a4835b561f62e46fbde7da3c9595e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:47:33 +0200
Subject: [PATCH 27/47] exfat-utils: update to 1.4.0.
---
srcpkgs/exfat-utils/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/exfat-utils/template b/srcpkgs/exfat-utils/template
index 6c62704fa511..1a21f1b3caca 100644
--- a/srcpkgs/exfat-utils/template
+++ b/srcpkgs/exfat-utils/template
@@ -1,11 +1,13 @@
# Template file for 'exfat-utils'
+# Note: keep in sync with fuse-exfat
pkgname=exfat-utils
-version=1.3.0
+version=1.4.0
revision=1
build_style=gnu-configure
short_desc="Utilities for exFAT file system"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/relan/exfat"
-distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835
+changelog="https://github.com/relan/exfat/raw/master/ChangeLog"
+distfiles="https://github.com/relan/exfat/releases/download/v${version}/exfat-utils-${version}.tar.gz"
+checksum=241575fa93104406a47e79e53e4d907bae69886f11621f70a45276c62b75bf69
From 5d04d5ad795d6683d0b28d8a4239e9a9e51d722b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:47:36 +0200
Subject: [PATCH 28/47] fuse-exfat: update to 1.4.0.
---
srcpkgs/fuse-exfat/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/fuse-exfat/template b/srcpkgs/fuse-exfat/template
index 1f182f77019d..2ad1ad12177c 100644
--- a/srcpkgs/fuse-exfat/template
+++ b/srcpkgs/fuse-exfat/template
@@ -1,6 +1,7 @@
# Template file for 'fuse-exfat'
+# Note: keep in sync with exfat-utils
pkgname=fuse-exfat
-version=1.3.0
+version=1.4.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config exfat-utils"
@@ -10,5 +11,6 @@ short_desc="Free exFAT file system implementation"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/relan/exfat"
-distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=07652136064da5e4d32df5555f88c138ffa4835a23b88a5bae2015f21006e0d3
+changelog="https://github.com/relan/exfat/raw/master/ChangeLog"
+distfiles="https://github.com/relan/exfat/releases/download/v${version}/fuse-exfat-${version}.tar.gz"
+checksum=a1cfedc55e0e7a12c184605aa0f0bf44b24a3fb272449b20b2c8bbe6edb3001e
From 0b450b1bac2183194353ebf030331888169fb5bc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 16 Apr 2023 15:57:18 +0200
Subject: [PATCH 29/47] fswatch: update to 1.17.1.
---
common/shlibs | 2 +-
srcpkgs/fswatch/template | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index df30e9a925c0..3350bff8180d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1729,7 +1729,7 @@ libLinearMath.so.3.17 bullet-3.17_1
libBulletSoftBody.so.3.17 bullet-3.17_1
libBullet3Common.so.3.17 bullet-3.17_1
libinotifytools.so.0 libinotify-tools-3.14_2
-libfswatch.so.11 libfswatch-1.13.0_1
+libfswatch.so.13 libfswatch-1.17.1_1
libopensc.so.8 libopensc-0.22.0_1
libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
librtlsdr.so.0 librtlsdr-0.5.3_1
diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template
index fbb044d3b9b9..dfb86f725819 100644
--- a/srcpkgs/fswatch/template
+++ b/srcpkgs/fswatch/template
@@ -1,16 +1,17 @@
# Template file for 'fswatch'
pkgname=fswatch
-version=1.16.0
+version=1.17.1
revision=1
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="doxygen"
-short_desc="A cross-platform file change monitor with multiple backends"
+short_desc="Cross-platform file change monitor with multiple backends"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://emcrisostomo.github.io/fswatch/"
+changelog="https://github.com/emcrisostomo/fswatch/raw/master/NEWS"
distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/fswatch-${version}.tar.gz"
-checksum=95ece85eb01af71e99afef0173755fcedb737b639163f8efc7fed674f6f5372f
+checksum=c38e341c567f5f16bfa64b72fc48bba5e93873d8572522e670e6f320bbc2122f
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
@@ -18,7 +19,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_install() {
- rm -r -- "${DESTDIR}/usr/share/doc"
+ rm -vr -- "${DESTDIR}/usr/share/doc"
}
libfswatch_package() {
From 7010ff7d7993ccd2fbf3f7f2ffe692f4aea474c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 16 Apr 2023 10:58:53 -0400
Subject: [PATCH 30/47] typst-lsp: update to 0.4.0.
---
srcpkgs/typst-lsp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/typst-lsp/template b/srcpkgs/typst-lsp/template
index 60fe47d4d0f0..31aebfe84426 100644
--- a/srcpkgs/typst-lsp/template
+++ b/srcpkgs/typst-lsp/template
@@ -1,6 +1,6 @@
# Template file for 'typst-lsp'
pkgname=typst-lsp
-version=0.3.2
+version=0.4.0
revision=1
build_style=cargo
short_desc="Language server for Typst"
@@ -8,7 +8,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="Apache-2.0, MIT"
homepage="https://github.com/nvarner/typst-lsp"
distfiles="https://github.com/nvarner/typst-lsp/archive/refs/tags/v${version}.tar.gz"
-checksum=9bb55c8a0421da98c99ef80e60b6014b2e6b7cf8b3b107d6db710ccf3aab96aa
+checksum=3819fdcca6bbdb29e7f97e7301eac870588df32ff2555e2d99cf659c1b69c98e
post_install() {
vlicense LICENSE-MIT.txt
From cfb7d93dee7a64f6864ff95791017ee729b3ed62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Apr 2023 17:01:38 +0200
Subject: [PATCH 31/47] tcsh: update to 6.24.10.
---
srcpkgs/tcsh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 9e331a8b34ed..d736217b7e0b 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
# Template file for 'tcsh'
pkgname=tcsh
-version=6.24.09
+version=6.24.10
revision=1
build_style=gnu-configure
conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://www.tcsh.org/"
distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c2e78a0c837c673410fe4b14de412bb642dc2dc61f56776e052860f82ad9eb9e
+checksum=13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664
register_shell="/bin/tcsh /bin/csh"
post_extract() {
From 8a7ac9ff58a1d585ea966cfff6e620f726343fec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 16 Apr 2023 17:04:42 +0200
Subject: [PATCH 32/47] graphviz: update to 8.0.2.
---
srcpkgs/graphviz/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index fe9851657c75..aaac6f6b4738 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,6 +1,6 @@
# Template file for 'graphviz'
pkgname=graphviz
-version=7.1.0
+version=8.0.2
revision=1
build_style=gnu-configure
configure_args="--with-gts --with-ann=no"
@@ -16,7 +16,7 @@ license="EPL-1.0"
homepage="https://www.graphviz.org"
changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
-checksum=8b28a283644a8442e6925b15d95055228d25172c7c30681810625616cbb23913
+checksum=3d243a7db7b21643c795e4fdad03efaed71313723bf46932d99c17920160bb0d
# `make check` is broken:
# https://gitlab.com/graphviz/graphviz/-/issues/2112
From 1e2966bad83152fcaff4a805ce76c64a490a723d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 19:24:54 +0200
Subject: [PATCH 33/47] arti: use system libzstd
---
srcpkgs/arti/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/arti/template b/srcpkgs/arti/template
index 7a9c4a9bea1e..fd1660136676 100644
--- a/srcpkgs/arti/template
+++ b/srcpkgs/arti/template
@@ -1,12 +1,12 @@
# Template file for 'arti'
pkgname=arti
version=1.1.2
-revision=1
+revision=2
archs="x86_64* i686* aarch64* arm*" # ring
build_style=cargo
make_install_args="--path crates/arti"
hostmakedepends="pkg-config"
-makedepends="openssl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel libzstd-devel"
short_desc="Tor implementation in Rust"
maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
license="Apache-2.0, MIT"
From 9df67e56e78cea015d98e4a45023225019cc217f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 19:24:54 +0200
Subject: [PATCH 34/47] rust-sccache: use system libzstd
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 413008d37623..ff1b3a4d27bf 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,13 +1,13 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
version=0.4.1
-revision=1
+revision=2
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
make_check_args="-- --skip test_s3_invalid_args --skip test_sccache_command
--skip dist::pkg::toolchain_imp::test_ldd_parse_v2_30"
hostmakedepends="pkg-config"
-makedepends="openssl-devel"
+makedepends="openssl-devel libzstd-devel"
short_desc="Sccache is a ccache-like tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
From dd961bc9a502cb218ede8f702e7b23753914b111 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 19:25:06 +0200
Subject: [PATCH 35/47] broot: use system oniguruma
---
srcpkgs/broot/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/broot/template b/srcpkgs/broot/template
index 4a8f8a3d80f6..266e1470a053 100644
--- a/srcpkgs/broot/template
+++ b/srcpkgs/broot/template
@@ -1,8 +1,10 @@
# Template file for 'broot'
pkgname=broot
version=1.18.0
-revision=2
+revision=3
build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="oniguruma-devel"
short_desc="Interactive directory tree view, fuzzy search, balanced BFS descent"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="MIT"
From 3d7dfbf443ee7c2ca8968b2991c2ed76cb476cb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 19:25:06 +0200
Subject: [PATCH 36/47] xh: use system oniguruma
---
srcpkgs/xh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index d9d00310586b..9028e3ea1eb5 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,11 +1,11 @@
# Template file for 'xh'
pkgname=xh
version=0.18.0
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features --features online-tests,native-tls"
hostmakedepends="pkg-config"
-makedepends="openssl-devel"
+makedepends="openssl-devel oniguruma-devel"
short_desc="Friendly and fast tool for sending HTTP requests"
maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
license="MIT"
From 8b3a0f454b5e4e76c48da69a75cd39ecbe0d8a5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 16 Apr 2023 20:21:42 +0200
Subject: [PATCH 37/47] xh: fix cross build
---
srcpkgs/xh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index 9028e3ea1eb5..54b380f9f0c0 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -4,7 +4,7 @@ version=0.18.0
revision=2
build_style=cargo
configure_args="--no-default-features --features online-tests,native-tls"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config oniguruma-devel"
makedepends="openssl-devel oniguruma-devel"
short_desc="Friendly and fast tool for sending HTTP requests"
maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
From 88c09c6dc197d781203a1f67b804916994ec49b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 17 Apr 2023 13:13:03 +0200
Subject: [PATCH 38/47] oksh: update to 7.3.
---
srcpkgs/oksh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index c7abff34de3c..aca704f5bf62 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
# Template file for 'oksh'
pkgname=oksh
-version=7.2
+version=7.3
revision=1
build_style=gnu-configure
makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Public Domain"
homepage="https://github.com/ibara/oksh"
distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=3340ca98b1d5a2800ebe7dba75312d8a4971a3fcff20fcd0d0ec5cf7b719427e
+checksum=9f176ff6841435a55f27bfd3ebbfc951c8cca6fdf3638f0123f44617e3992f93
register_shell="/bin/oksh"
alternatives="
From 779e5b5bb4d63b0a6f818b0080ce416c2dc5babe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 17 Apr 2023 13:14:29 +0200
Subject: [PATCH 39/47] pysolfc: update to 2.20.1.
---
srcpkgs/pysolfc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index e356e023c254..d41f073ed9b9 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -1,6 +1,6 @@
# Template file for 'pysolfc'
pkgname=pysolfc
-version=2.20.0
+version=2.20.1
revision=1
build_style=python3-module
hostmakedepends="gettext python3-pygame python3-random2 python3-six
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
homepage="https://pysolfc.sourceforge.io/"
distfiles="https://github.com/shlomif/PySolFC/archive/pysolfc-${version}.tar.gz"
-checksum=530c7b4f6350293c7fa8efbadc80d4a8643a3d66fe513693396308640abbe14d
+checksum=46f48b8bc5ac6b3c83504e5e263e018057da990a1418f1408f8b4b8a0a2e2eb4
post_build() {
make mo rules
From d3907fc66fd47e4525304d802a99fc430f9b38fb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 06:40:03 -0500
Subject: [PATCH 40/47] gef: update to 2023.06.
---
srcpkgs/gef/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index c19cdf5f77a9..7886be122ba3 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,7 +1,7 @@
# Template file for 'gef'
pkgname=gef
-version=2022.06
-revision=2
+version=2023.06
+revision=1
pycompile_dirs="usr/lib/gef"
depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
short_desc="GDB Enhanced Features for exploit devs & reversers"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://hugsy.github.io/gef/"
distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=ae93f55c081753203b05f427ba0fa9e9e92d25139e10e946a081cd5d6a379329
+checksum=9fc17c90f3130495224229e0ffe4c5332936ef4a3ba412039078d19c7eb4b88e
python_version="3"
do_install() {
From eba707ceeeca726ef39225f420bd0290587e7a74 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 06:41:50 -0500
Subject: [PATCH 41/47] python3-rich: update to 13.3.4.
---
srcpkgs/python3-rich/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 485dfdf13ce5..fe8319469110 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
# Template file for 'python3-rich'
pkgname=python3-rich
-version=13.3.3
+version=13.3.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-poetry-core"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
homepage="https://github.com/willmcgugan/rich"
distfiles="${PYPI_SITE}/r/rich/rich-${version}.tar.gz"
-checksum=dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15
+checksum=b5d573e13605423ec80bdd0cd5f8541f7844a0e71a13f74cf454ccb2f490708b
make_check=extended # some checks only work on windows
post_install() {
From 748f6946f2cb0de4172aa7119dbe375edd339b86 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 06:43:14 -0500
Subject: [PATCH 42/47] xml2rfc: update to 3.17.1.
---
srcpkgs/xml2rfc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template
index 83d65375d522..6ed6c1c8fabc 100644
--- a/srcpkgs/xml2rfc/template
+++ b/srcpkgs/xml2rfc/template
@@ -1,6 +1,6 @@
# Template file for 'xml2rfc'
pkgname=xml2rfc
-version=3.17.0
+version=3.17.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
homepage="https://ietf-tools.github.io/xml2rfc/"
distfiles="https://github.com/ietf-tools/xml2rfc/releases/download/v${version}/xml2rfc-${version}.tar.gz"
-checksum=33a4a11178c791db25fdf733e04fdc28c3660c94d0fe83b3b2799ef23f547003
+checksum=977e5de43c6eb2855f20cd69fa4634912daa312334b3e6d7495c1e6946e267c2
make_check=no # too many dependencies
post_install() {
From a96302f30e03591ae85f7909491cf9bb126b772f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 06:51:44 -0500
Subject: [PATCH 43/47] pahole: update to 1.25.
---
srcpkgs/pahole/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index 66f6c9ce7331..70a3d15ccebe 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,8 +1,7 @@
# Template file for 'pahole'
pkgname=pahole
-reverts="1.24_1"
-version=1.23
-revision=4
+version=1.25
+revision=1
build_style=cmake
configure_args="-D__LIB=lib"
makedepends="elfutils-devel zlib-devel"
@@ -11,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-only"
homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=f085c25f068627d10e54bd030464f8952f5b2211d4ba26047fe209377470862a
+checksum=e7d45955f6f4eca25a4c8c3bd6611059b35dc217e45976681d7db170fccdec4a
case $XBPS_TARGET_MACHINE in
*-musl) makedepends+=" musl-obstack-devel argp-standalone"
From f4b46de06acaed905a922b25b6f9ca0ac1f0c931 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 07:20:28 -0500
Subject: [PATCH 44/47] ghostwriter: update to 23.03.90.
---
srcpkgs/ghostwriter/template | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 6f86fc4b2c41..287c777b5e4a 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,19 +1,20 @@
# Template file for 'ghostwriter'
pkgname=ghostwriter
-reverts="23.03.80_1"
-version=2.2.0
-revision=2
-build_style=qmake
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
+version=23.03.90
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools"
makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
- qt5-webengine-devel qt5-location-devel qt5-webchannel-devel qt5-declarative-devel"
+ qt5-webengine-devel qt5-location-devel qt5-webchannel-devel
+ qt5-declarative-devel sonnet-devel kcoreaddons-devel kxmlgui-devel
+ kconfigwidgets-devel"
depends="hicolor-icon-theme qt5-svg"
short_desc="Distraction-free Markdown editor"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="http://kde.github.io/ghostwriter"
-distfiles="https://github.com/KDE/ghostwriter/archive/${version}.tar.gz"
-checksum=bb1968a157fe6a30e75cd18b0222154e1e1b20011ba460b20088e8ab61df0955
+distfiles="https://invent.kde.org/office/ghostwriter/-/archive/v${version}/ghostwriter-v${version}.tar.bz2"
+checksum=38a2598ea27e5c72d8678c1a085814d1e889b22f92f42eb3beed9a92f03ff432
case "$XBPS_TARGET_MACHINE" in
armv5tel*) broken="qtwebengine not built for this platform";;
From 707ce9cdedb0cac683c11f6fb54fac092014bb55 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 17 Apr 2023 09:20:28 -0500
Subject: [PATCH 45/47] ghostwriter: add missing hostmakedeps
---
srcpkgs/ghostwriter/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 287c777b5e4a..d8ede7e67dd1 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -3,7 +3,8 @@ pkgname=ghostwriter
version=23.03.90
revision=1
build_style=cmake
-hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config extra-cmake-modules qt5-qmake qt5-host-tools
+ kcoreaddons kdoctools"
makedepends="hunspell-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
qt5-webengine-devel qt5-location-devel qt5-webchannel-devel
qt5-declarative-devel sonnet-devel kcoreaddons-devel kxmlgui-devel
From 9dee1b837918d61ecfef94e5d7a5cc9d7f366365 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 14 Apr 2023 23:33:41 +0100
Subject: [PATCH 46/47] cups-filters: update to 1.28.17.
---
srcpkgs/cups-filters/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 0f41b8f1d318..4521bdeef61f 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,6 +1,6 @@
# Template file for 'cups-filters'
pkgname=cups-filters
-version=1.28.16
+version=1.28.17
revision=1
build_style=gnu-configure
configure_args="--disable-static --with-rcdir=no --enable-avahi
@@ -17,10 +17,14 @@ short_desc="OpenPrinting CUPS Filters"
maintainer="Mohammed Anas <triallax@tutanota.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-distfiles="http://openprinting.org/download/cups-filters/${pkgname}-${version}.tar.xz"
-checksum=3a400bfa751da2020775cd7d48d1647448551ff051f9345abc1df6357b199ac0
+changelog="https://github.com/OpenPrinting/cups-filters/releases"
+distfiles="https://github.com/OpenPrinting/cups-filters/releases/download/${version}/cups-filters-${version}.tar.xz"
+checksum=270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9
lib32disabled=yes
+# https://github.com/OpenPrinting/cups-filters/issues/512
+export CXXFLAGS="-std=c++17"
+
post_install() {
vsv cups-browsed
vlicense COPYING
From 5fa5a8e7123eeea0784536d71b5f4dec824d2e03 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 18 Apr 2023 06:39:58 -0500
Subject: [PATCH 47/47] aide: update to 0.18.2.
---
srcpkgs/aide/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index 8e02a4f5d700..98d00c055383 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
# Template file for 'aide'
pkgname=aide
-version=0.17.4
+version=0.18.2
revision=1
build_style=gnu-configure
configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -8,14 +8,18 @@ configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
conf_files="/etc/aide.conf"
make_dirs="/var/lib/aide 0750 root root
/var/log/aide 0750 root root"
-hostmakedepends="flex"
-makedepends="pcre-devel mhash-devel acl-devel e2fsprogs-devel elfutils-devel zlib-devel"
+hostmakedepends="flex pkg-config"
+makedepends="pcre2-devel mhash-devel acl-devel e2fsprogs-devel elfutils-devel
+ zlib-devel"
short_desc="File and directory integrity checker"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://aide.github.io/"
distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=c81505246f3ffc2e76036d43a77212ae82895b5881d9b9e25c1361b1a9b7a846
+checksum=758ff586c703930129e0a1e8c292ff5127e116fc10d0ffdbea8bf2c1087ca7e4
+
+export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
+export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"
post_install() {
vconf $FILESDIR/aide.conf
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Aide 0.18.2
2023-04-18 11:48 [PR PATCH] Aide 0.18.2 abenson
@ 2023-04-18 11:48 ` abenson
2023-04-19 2:00 ` [PR PATCH] [Merged]: " abenson
1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2023-04-18 11:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages aide_0.18.2
https://github.com/void-linux/void-packages/pull/43509
Aide 0.18.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
~~~
pkg host target cross result
aide x86_64 x86_64 n OK
aide x86_64-musl x86_64-musl n OK
aide i686 i686 n OK
aide x86_64 aarch64-musl y OK
aide x86_64 aarch64 y OK
aide x86_64 armv7l-musl y OK
aide x86_64 armv7l y OK
aide x86_64 armv6l-musl y OK
aide x86_64 armv6l y OK
~~~
A patch file from https://github.com/void-linux/void-packages/pull/43509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aide_0.18.2-43509.patch --]
[-- Type: text/x-diff, Size: 1663 bytes --]
From 25ea730fc73630d354ec24b94dc30e5f521a5bb3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 18 Apr 2023 06:39:58 -0500
Subject: [PATCH] aide: update to 0.18.2.
---
srcpkgs/aide/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/aide/template b/srcpkgs/aide/template
index 8e02a4f5d700..98d00c055383 100644
--- a/srcpkgs/aide/template
+++ b/srcpkgs/aide/template
@@ -1,6 +1,6 @@
# Template file for 'aide'
pkgname=aide
-version=0.17.4
+version=0.18.2
revision=1
build_style=gnu-configure
configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
@@ -8,14 +8,18 @@ configure_args="--with-mhash --with-posix-acl --with-prelink --with-xattr
conf_files="/etc/aide.conf"
make_dirs="/var/lib/aide 0750 root root
/var/log/aide 0750 root root"
-hostmakedepends="flex"
-makedepends="pcre-devel mhash-devel acl-devel e2fsprogs-devel elfutils-devel zlib-devel"
+hostmakedepends="flex pkg-config"
+makedepends="pcre2-devel mhash-devel acl-devel e2fsprogs-devel elfutils-devel
+ zlib-devel"
short_desc="File and directory integrity checker"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://aide.github.io/"
distfiles="https://github.com/aide/aide/releases/download/v${version}/aide-${version}.tar.gz"
-checksum=c81505246f3ffc2e76036d43a77212ae82895b5881d9b9e25c1361b1a9b7a846
+checksum=758ff586c703930129e0a1e8c292ff5127e116fc10d0ffdbea8bf2c1087ca7e4
+
+export MHASH_CFLAGS="=I${XBPS_CROSS_BASE}/usr/include"
+export MHASH_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lmhash"
post_install() {
vconf $FILESDIR/aide.conf
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Aide 0.18.2
2023-04-18 11:48 [PR PATCH] Aide 0.18.2 abenson
2023-04-18 11:48 ` [PR PATCH] [Updated] " abenson
@ 2023-04-19 2:00 ` abenson
1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2023-04-19 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
There's a merged pull request on the void-packages repository
Aide 0.18.2
https://github.com/void-linux/void-packages/pull/43509
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
~~~
pkg host target cross result
aide x86_64 x86_64 n OK
aide x86_64-musl x86_64-musl n OK
aide i686 i686 n OK
aide x86_64 aarch64-musl y OK
aide x86_64 aarch64 y OK
aide x86_64 armv7l-musl y OK
aide x86_64 armv7l y OK
aide x86_64 armv6l-musl y OK
aide x86_64 armv6l y OK
~~~
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-19 2:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18 11:48 [PR PATCH] Aide 0.18.2 abenson
2023-04-18 11:48 ` [PR PATCH] [Updated] " abenson
2023-04-19 2:00 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).