* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
@ 2022-12-26 2:34 ` oreo639
2022-12-26 7:26 ` oreo639
` (45 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5466 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
Closes: https://github.com/void-linux/void-packages/pull/41229
[ci skip]
Necessary rebuilds
x86_64:
- [x] sox
- [x] stlink
x86_64-musl:
- [x] sox
- [x] stlink
i686:
- [x] sox
- [x] stlink
aarch64:
- [ ] PrismLauncher-6.0_1
- [ ] dovecot-2.3.20_1
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-lucene-2.3.20_1
- [ ] dovecot-plugin-mysql-2.3.20_1
- [ ] dovecot-plugin-pgsql-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-0.5.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] dovecot-plugin-sqlite-2.3.20_1
- [ ] dqlite-1.13.0_1
- [ ] libssp-devel-12.2.0_1
- [ ] libsvt-av1-1.4.1_1
- [ ] perf-5.10.4_10
- [ ] powertop-2.14_2
- [ ] raft-0.16.0_1
- [ ] svt-av1-1.4.1_1
- [ ] thunderbird-102.6.1_1
- [ ] tmon-5.10.4_10
- [ ] tor-0.4.7.12_1
armv{6,7}l:
- [ ] dovecot-2.3.20_1
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-lucene-2.3.20_1
- [ ] dovecot-plugin-mysql-2.3.20_1
- [ ] dovecot-plugin-pgsql-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-0.5.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] dovecot-plugin-sqlite-2.3.20_1
- [ ] dqlite-1.13.0_1
- [ ] perf-5.10.4_10
- [ ] powertop-2.14_2
- [ ] raft-0.16.0_1
- [ ] tmon-5.10.4_10
- [ ] tor-0.4.7.12_1
armv{6,7}-musll & aarch64-musl:
- [ ] AusweisApp2-1.24.1_1
- [ ] OTPClient-2.4.8_1
- [ ] avahi-qt5-libs-0.8_5
- [ ] avahi-ui-libs-0.8_5
- [ ] avahi-ui-libs-gtk3-0.8_5
- [ ] avahi-ui-utils-0.8_5
- [ ] bitcoin-22.0_2
- [ ] bitcoin-qt-22.0_2
- [ ] botan-2.19.2_2
- [ ] cJSON-1.7.15_1
- [ ] csync-0.50.0_5
- [ ] cups-2.4.2_1
- [ ] davfs2-1.6.1_1
- [ ] di-4.51_1
- [ ] dislocker-0.7.3_1
- [ ] dovecot-2.3.20_1
- [ ] dovecot-plugin-ldap-2.3.20_1
- [ ] dovecot-plugin-lucene-2.3.20_1
- [ ] dovecot-plugin-mysql-2.3.20_1
- [ ] dovecot-plugin-pgsql-2.3.20_1
- [ ] dovecot-plugin-pigeonhole-0.5.20_1
- [ ] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [ ] dovecot-plugin-sqlite-2.3.20_1
- [ ] dqlite-1.13.0_1
- [ ] elogind-246.10_2
- [ ] flac-1.3.4_1
- [ ] fwknop-2.6.10_2
- [ ] fwknopd-2.6.10_2
- [ ] inkscape-1.1.1_5
- [ ] keepalived-2.2.7_1
- [ ] keepassxc-2.7.4_1
- [ ] kitty-0.26.3_2
- [ ] kmscon-8_7
- [ ] kstars-3.6.0_2
- [ ] libcotp-1.2.4_1
- [ ] libcups-2.4.2_1
- [ ] libelogind-246.10_2
- [ ] libfko-2.6.10_2
- [ ] libflac-1.3.4_1
- [ ] libhtp-0.5.36_1
- [ ] libknet1-1.24_1
- [ ] libmariadbclient-10.5.10_3
- [ ] libnozzle1-1.24_1
- [ ] libressl-netcat-3.6.1_1
- [ ] libssp-devel-12.2.0_1
- [ ] libswtpm-0.7.3_1
- [ ] libtls-3.6.1_1
- [ ] libtpm2-totp-0.3.0_1
- [ ] libtpms-0.9.4_1
- [ ] libvlc-3.0.18_2
- [ ] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [ ] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [ ] perf-5.10.4_10
- [ ] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [ ] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [ ] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [ ] tmon-5.10.4_10
- [ ] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [ ] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [ ] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [ ] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 32999 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/37] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/37] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/37] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/37] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/37] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/37] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/37] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/37] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/37] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/37] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/37] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/37] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/37] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/37] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/37] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/37] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/37] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/37] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/37] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/37] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/37] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/37] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/37] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/37] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/37] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/37] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/37] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/37] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/37] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/37] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/37] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/37] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/37] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/37] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/37] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/37] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/37] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
2022-12-26 2:34 ` [PR PATCH] [Updated] " oreo639
@ 2022-12-26 7:26 ` oreo639
2022-12-26 7:57 ` oreo639
` (44 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5897 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: There may be more libssp dependencies introduced since this pr was created (particularly on glibc), the following PR should be merged before this one to help prevent this: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [ ] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [ ] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [ ] svt-av1-1.4.1_1
- [ ] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [ ] AusweisApp2-1.24.1_1
- [ ] OTPClient-2.4.8_1
- [ ] avahi-qt5-libs-0.8_5
- [ ] avahi-ui-libs-0.8_5
- [ ] avahi-ui-libs-gtk3-0.8_5
- [ ] avahi-ui-utils-0.8_5
- [ ] bitcoin-22.0_2
- [ ] bitcoin-qt-22.0_2
- [ ] botan-2.19.2_2
- [ ] cJSON-1.7.15_1
- [ ] csync-0.50.0_5
- [ ] cups-2.4.2_1
- [ ] davfs2-1.6.1_1
- [ ] di-4.51_1
- [ ] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [ ] elogind-246.10_2
- [ ] flac-1.3.4_1
- [ ] fwknop-2.6.10_2
- [ ] fwknopd-2.6.10_2
- [ ] inkscape-1.1.1_5
- [ ] keepalived-2.2.7_1
- [ ] keepassxc-2.7.4_1
- [ ] kitty-0.26.3_2
- [ ] kmscon-8_7
- [ ] kstars-3.6.0_2
- [ ] libcotp-1.2.4_1
- [ ] libcups-2.4.2_1
- [ ] libelogind-246.10_2
- [ ] libfko-2.6.10_2
- [ ] libflac-1.3.4_1
- [ ] libhtp-0.5.36_1
- [ ] libknet1-1.24_1
- [ ] libmariadbclient-10.5.10_3
- [ ] libnozzle1-1.24_1
- [ ] libressl-netcat-3.6.1_1
- [ ] libssp-devel-12.2.0_1
- [ ] libswtpm-0.7.3_1
- [ ] libtls-3.6.1_1
- [ ] libtpm2-totp-0.3.0_1
- [ ] libtpms-0.9.4_1
- [ ] libvlc-3.0.18_2
- [ ] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [ ] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [ ] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [ ] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [ ] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [ ] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 35092 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/40] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/40] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/40] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/40] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/40] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/40] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/40] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/40] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/40] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/40] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/40] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/40] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/40] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/40] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/40] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/40] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/40] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/40] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/40] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/40] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/40] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/40] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/40] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/40] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/40] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/40] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/40] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/40] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/40] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/40] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/40] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/40] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/40] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/40] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/40] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/40] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/40] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/40] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/40] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/40] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
2022-12-26 2:34 ` [PR PATCH] [Updated] " oreo639
2022-12-26 7:26 ` oreo639
@ 2022-12-26 7:57 ` oreo639
2022-12-26 8:07 ` oreo639
` (43 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 7:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5897 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: There may be more libssp dependencies introduced since this pr was created (particularly on glibc), the following PR should be merged before this one to help prevent this: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [ ] OTPClient-2.4.8_1
- [ ] avahi-qt5-libs-0.8_5
- [ ] avahi-ui-libs-0.8_5
- [ ] avahi-ui-libs-gtk3-0.8_5
- [ ] avahi-ui-utils-0.8_5
- [ ] bitcoin-22.0_2
- [ ] bitcoin-qt-22.0_2
- [ ] botan-2.19.2_2
- [ ] cJSON-1.7.15_1
- [ ] csync-0.50.0_5
- [ ] cups-2.4.2_1
- [ ] davfs2-1.6.1_1
- [ ] di-4.51_1
- [ ] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [ ] elogind-246.10_2
- [ ] flac-1.3.4_1
- [ ] fwknop-2.6.10_2
- [ ] fwknopd-2.6.10_2
- [ ] inkscape-1.1.1_5
- [ ] keepalived-2.2.7_1
- [ ] keepassxc-2.7.4_1
- [ ] kitty-0.26.3_2
- [ ] kmscon-8_7
- [ ] kstars-3.6.0_2
- [ ] libcotp-1.2.4_1
- [ ] libcups-2.4.2_1
- [ ] libelogind-246.10_2
- [ ] libfko-2.6.10_2
- [ ] libflac-1.3.4_1
- [ ] libhtp-0.5.36_1
- [ ] libknet1-1.24_1
- [ ] libmariadbclient-10.5.10_3
- [ ] libnozzle1-1.24_1
- [ ] libressl-netcat-3.6.1_1
- [ ] libssp-devel-12.2.0_1
- [ ] libswtpm-0.7.3_1
- [ ] libtls-3.6.1_1
- [ ] libtpm2-totp-0.3.0_1
- [ ] libtpms-0.9.4_1
- [ ] libvlc-3.0.18_2
- [ ] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [ ] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [ ] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [ ] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [ ] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [ ] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 37191 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/43] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/43] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/43] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/43] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/43] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/43] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/43] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/43] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/43] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/43] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/43] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/43] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/43] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/43] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/43] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/43] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/43] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/43] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/43] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/43] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/43] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/43] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/43] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/43] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/43] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/43] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/43] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/43] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/43] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/43] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/43] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/43] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/43] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/43] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/43] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/43] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/43] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/43] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/43] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/43] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/43] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/43] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/43] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (2 preceding siblings ...)
2022-12-26 7:57 ` oreo639
@ 2022-12-26 8:07 ` oreo639
2022-12-26 8:22 ` oreo639
` (42 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5870 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: There may be more libssp dependencies introduced since this pr was created (particularly on glibc), the following PR would help to prevent this: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [ ] bitcoin-22.0_2
- [ ] bitcoin-qt-22.0_2
- [ ] botan-2.19.2_2
- [ ] cJSON-1.7.15_1
- [ ] csync-0.50.0_5
- [ ] cups-2.4.2_1
- [ ] davfs2-1.6.1_1
- [ ] di-4.51_1
- [ ] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [ ] elogind-246.10_2
- [ ] flac-1.3.4_1
- [ ] fwknop-2.6.10_2
- [ ] fwknopd-2.6.10_2
- [ ] inkscape-1.1.1_5
- [ ] keepalived-2.2.7_1
- [ ] keepassxc-2.7.4_1
- [ ] kitty-0.26.3_2
- [ ] kmscon-8_7
- [ ] kstars-3.6.0_2
- [ ] libcotp-1.2.4_1
- [ ] libcups-2.4.2_1
- [ ] libelogind-246.10_2
- [ ] libfko-2.6.10_2
- [ ] libflac-1.3.4_1
- [ ] libhtp-0.5.36_1
- [ ] libknet1-1.24_1
- [ ] libmariadbclient-10.5.10_3
- [ ] libnozzle1-1.24_1
- [ ] libressl-netcat-3.6.1_1
- [ ] libssp-devel-12.2.0_1
- [ ] libswtpm-0.7.3_1
- [ ] libtls-3.6.1_1
- [ ] libtpm2-totp-0.3.0_1
- [ ] libtpms-0.9.4_1
- [ ] libvlc-3.0.18_2
- [ ] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [ ] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [ ] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [ ] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [ ] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [ ] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 43365 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/52] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/52] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/52] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/52] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/52] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/52] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/52] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/52] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/52] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/52] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/52] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/52] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/52] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/52] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/52] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/52] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/52] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/52] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/52] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/52] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/52] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/52] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/52] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/52] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/52] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/52] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/52] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/52] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/52] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/52] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/52] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/52] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/52] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/52] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/52] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/52] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/52] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/52] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/52] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/52] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/52] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/52] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/52] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/52] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/52] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/52] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/52] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/52] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/52] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/52] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/52] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/52] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (3 preceding siblings ...)
2022-12-26 8:07 ` oreo639
@ 2022-12-26 8:22 ` oreo639
2022-12-26 8:29 ` oreo639
` (41 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 8:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [ ] flac-1.3.4_1
- [ ] fwknop-2.6.10_2
- [ ] fwknopd-2.6.10_2
- [ ] inkscape-1.1.1_5
- [ ] keepalived-2.2.7_1
- [ ] keepassxc-2.7.4_1
- [ ] kitty-0.26.3_2
- [ ] kmscon-8_7
- [ ] kstars-3.6.0_2
- [ ] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [ ] libfko-2.6.10_2
- [ ] libflac-1.3.4_1
- [ ] libhtp-0.5.36_1
- [ ] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [ ] libnozzle1-1.24_1
- [ ] libressl-netcat-3.6.1_1
- [ ] libssp-devel-12.2.0_1
- [ ] libswtpm-0.7.3_1
- [ ] libtls-3.6.1_1
- [ ] libtpm2-totp-0.3.0_1
- [ ] libtpms-0.9.4_1
- [ ] libvlc-3.0.18_2
- [ ] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [ ] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [ ] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [ ] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [ ] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 51673 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/64] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/64] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/64] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/64] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/64] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/64] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/64] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/64] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/64] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/64] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/64] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/64] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/64] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/64] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/64] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/64] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/64] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/64] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/64] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/64] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/64] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/64] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/64] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/64] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/64] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/64] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/64] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/64] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/64] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/64] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/64] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/64] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/64] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/64] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/64] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/64] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/64] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/64] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/64] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/64] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/64] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/64] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/64] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/64] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/64] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/64] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/64] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/64] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/64] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/64] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/64] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/64] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 53/64] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 54/64] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 55/64] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 56/64] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 57/64] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 58/64] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 59/64] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 60/64] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 61/64] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 62/64] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 63/64] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 64/64] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (4 preceding siblings ...)
2022-12-26 8:22 ` oreo639
@ 2022-12-26 8:29 ` oreo639
2022-12-26 8:43 ` oreo639
` (40 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 8:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [ ] libykcs11-2.1.1_2
- [ ] libykpiv-2.1.1_2
- [ ] litecoin-0.18.1_8
- [ ] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [ ] massdns-1.0.0_1
- [ ] mksh-R59c_1
- [ ] mkvtoolnix-72.0.0_1
- [ ] mkvtoolnix-gui-72.0.0_1
- [ ] monero-0.18.1.2_1
- [ ] monero-gui-0.18.1.2_1
- [ ] monit-5.32.0_1
- [ ] mosh-1.4.0_2
- [ ] mozjs102-102.5.0_1
- [ ] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [ ] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 55796 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/70] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/70] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/70] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/70] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/70] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/70] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/70] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/70] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/70] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/70] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/70] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/70] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/70] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/70] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/70] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/70] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/70] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/70] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/70] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/70] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/70] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/70] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/70] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/70] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/70] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/70] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/70] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/70] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/70] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/70] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/70] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/70] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/70] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/70] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/70] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/70] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/70] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/70] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/70] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/70] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/70] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/70] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/70] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/70] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/70] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/70] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/70] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/70] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/70] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/70] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/70] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/70] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 53/70] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 54/70] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 55/70] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 56/70] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 57/70] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 58/70] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 59/70] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 60/70] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 61/70] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 62/70] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 63/70] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 64/70] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 65/70] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 66/70] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 67/70] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 68/70] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 69/70] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 70/70] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (5 preceding siblings ...)
2022-12-26 8:29 ` oreo639
@ 2022-12-26 8:43 ` oreo639
2022-12-26 8:54 ` oreo639
` (39 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [ ] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 64130 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/82] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/82] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/82] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/82] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/82] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/82] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/82] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/82] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/82] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/82] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/82] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/82] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/82] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/82] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/82] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/82] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/82] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/82] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/82] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/82] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/82] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/82] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/82] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/82] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/82] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/82] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/82] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/82] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/82] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/82] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/82] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/82] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/82] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/82] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/82] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/82] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/82] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/82] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/82] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/82] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/82] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/82] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/82] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/82] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/82] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/82] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/82] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/82] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/82] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/82] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/82] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/82] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 53/82] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 54/82] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 55/82] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 56/82] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 57/82] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 58/82] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 59/82] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 60/82] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 61/82] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 62/82] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 63/82] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 64/82] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 65/82] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 66/82] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 67/82] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 68/82] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 69/82] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 70/82] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 71/82] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 72/82] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 73/82] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 74/82] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 75/82] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 76/82] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 77/82] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 78/82] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 79/82] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 80/82] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 81/82] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 82/82] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (6 preceding siblings ...)
2022-12-26 8:43 ` oreo639
@ 2022-12-26 8:54 ` oreo639
2022-12-26 9:04 ` oreo639
` (38 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 8:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [ ] msg2-1.2.0_2
- [ ] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99026 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/83] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/83] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/83] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/83] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/83] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/83] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/83] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/83] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/83] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/83] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/83] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/83] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/83] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/83] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/83] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/83] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/83] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/83] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/83] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/83] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/83] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/83] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/83] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/83] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/83] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/83] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/83] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/83] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/83] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/83] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/83] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/83] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/83] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/83] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/83] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/83] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/83] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/83] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/83] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/83] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/83] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/83] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/83] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/83] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/83] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/83] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/83] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/83] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/83] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/83] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/83] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/83] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 53/83] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 54/83] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 55/83] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 56/83] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 57/83] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 58/83] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 59/83] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 60/83] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 61/83] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 62/83] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 63/83] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 64/83] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 65/83] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 66/83] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 67/83] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 68/83] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 69/83] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 70/83] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 71/83] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 72/83] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 73/83] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 74/83] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 75/83] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 76/83] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 77/83] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 78/83] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 79/83] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 80/83] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 81/83] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 82/83] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 3ab0de912d4d20c2f33bee938e09517e33d81142 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:54:11 -0800
Subject: [PATCH 83/83] mozjs91: remove package
---
common/shlibs | 1 -
srcpkgs/mozjs91/patches/001-fix-soname.patch | 26 -----
.../mozjs91/patches/002-copy-headers.patch | 38 --------
.../mozjs91/patches/003-tests-timeout.patch | 26 -----
.../004-icu-sources-data-py-decouple.patch | 29 ------
...cu-sources-data-write-command-stderr.patch | 44 ---------
srcpkgs/mozjs91/patches/006-emitter.patch | 67 -------------
...-tests-use-native-temporarydirectory.patch | 66 -------------
srcpkgs/mozjs91/patches/008-init-patch.patch | 28 ------
.../patches/009-sloppy-m4-detection.patch | 29 ------
.../011-failing-tests-ppc64-s390x.patch | 36 -------
srcpkgs/mozjs91/patches/012-fix-musl.patch | 21 ----
.../013-disable-spidermonkey-jslint.patch | 26 -----
srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ------
.../patches/015-drop-rustc-validation.patch | 80 ---------------
.../mozjs91/patches/017-no-lto-readelf.patch | 35 -------
srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ----
srcpkgs/mozjs91/patches/fix-build-ppc32.patch | 19 ----
srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ----
srcpkgs/mozjs91/template | 97 ++-----------------
20 files changed, 6 insertions(+), 726 deletions(-)
delete mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch
delete mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch
delete mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch
delete mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
delete mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
delete mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch
delete mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
delete mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch
delete mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
delete mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
delete mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch
delete mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
delete mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch
delete mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
delete mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
delete mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-build-ppc32.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
diff --git a/common/shlibs b/common/shlibs
index 140c7a79f4f3..5a7632287a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,7 +3497,6 @@ libKF5Syndication.so.5 syndication-5.50.0_1
liblqr-1.so.0 liblqr-0.4.2_1
libmozjs-102.so.0 mozjs102-102.3.0_1
libmozjs-78.so.0 mozjs78-78.1.0_1
-libmozjs-91.so.0 mozjs91-91.5.0_1
libebur128.so.1 libebur128-1.2.4_1
libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch
deleted file mode 100644
index a319d9e975ef..000000000000
--- a/srcpkgs/mozjs91/patches/001-fix-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:21:47 +0200
-Subject: [PATCH] Add soname switch to linker, regardless of Operating System
-
-Fix backported from Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/rules.mk b/config/rules.mk
-index 0f9b2ac..f6b4efe 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU)
- OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
- endif
-
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-+
- #
- # MINGW32
- #
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch
deleted file mode 100644
index aafe1aa84bd3..000000000000
--- a/srcpkgs/mozjs91/patches/002-copy-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:27:39 +0200
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch by Philip Chimento ported forward to mozjs78
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index d964466..0285ad9 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend):
- " of srcdir-relative or absolute paths."
- )
-
-- install_manifest.add_pattern_link(basepath, wild, dest_dir)
-+ install_manifest.add_pattern_copy(basepath, wild, dest_dir)
- else:
-- install_manifest.add_pattern_link(f.srcdir, f, dest_dir)
-+ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir)
- elif isinstance(f, AbsolutePath):
- if not f.full_path.lower().endswith((".dll", ".pdb", ".so")):
- raise Exception(
-@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend):
- install_manifest.add_optional_exists(dest_file)
- absolute_files.append(f.full_path)
- else:
-- install_manifest.add_link(f.full_path, dest_file)
-+ install_manifest.add_copy(f.full_path, dest_file)
- else:
- install_manifest.add_optional_exists(dest_file)
- objdir_files.append(self._pretty_path(f, backend_file))
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch
deleted file mode 100644
index c86cca403deb..000000000000
--- a/srcpkgs/mozjs91/patches/003-tests-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:32:44 +0200
-Subject: [PATCH] Increase the test timeout for slower buildds
-
-Ported forward from Debian: https://bugs.debian.org/878284
----
- js/src/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
-index b86aeed..d68655a 100644
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -53,7 +53,7 @@ check:: check-js-msg
-
- check-jstests:
- $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
-- --no-progress --format=automation --timeout 300 \
-+ --no-progress --format=automation --timeout 600 \
- $(JSTESTS_EXTRA_ARGS) \
- $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
-
---
-2.26.2
-
diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
deleted file mode 100644
index 8572c21fd4ec..000000000000
--- a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:22:12 +0100
-Subject: icu_sources_data.py: Decouple from Mozilla build system
-
-mozpack.path is a wrapper around os.path that normalizes path
-separators on Windows, but on Unix we only have one path separator
-so there's nothing to normalize. Avoid needing to import all of it.
----
- intl/icu_sources_data.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 2936df9..4db52af 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -21,7 +21,9 @@ import subprocess
- import sys
- import tempfile
-
--from mozpack import path as mozpath
-+# Close enough
-+import os.path as mozpath
-+mozpath.normsep = lambda p: p
-
- # The following files have been determined to be dead/unused by a
- # semi-automated analysis. You can just remove any of the files below
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
deleted file mode 100644
index 84684250ce4c..000000000000
--- a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:23:14 +0100
-Subject: icu_sources_data: Write command output to our stderr
-
-Saying "See output in /tmp/foobar" is all very well for a developer
-build, but on a buildd our /tmp is going to get thrown away after
-the build. Just log the usual way instead.
----
- intl/icu_sources_data.py | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 4db52af..d62960d 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -188,21 +188,13 @@ def update_sources(topsrcdir):
-
- def try_run(name, command, cwd=None, **kwargs):
- try:
-- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
-- subprocess.check_call(
-- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs
-- )
-- except subprocess.CalledProcessError:
-- print(
-- """Error running "{}" in directory {}
-- See output in {}""".format(
-- " ".join(command), cwd, f.name
-- ),
-- file=sys.stderr,
-+ subprocess.check_call(
-+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs
- )
-+ except subprocess.CalledProcessError:
-+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr)
- return False
- else:
-- os.unlink(f.name)
- return True
-
-
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch
deleted file mode 100644
index 556bebd257ca..000000000000
--- a/srcpkgs/mozjs91/patches/006-emitter.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:39:47 +0200
-Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
-
----
- python/mozbuild/mozbuild/frontend/emitter.py | 10 ---------
- .../mozbuild/test/frontend/test_emitter.py | 22 -------------------
- 2 files changed, 32 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
-index 44b916e..f2e821d 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin):
- "(resolved to %s)" % (local_include, full_path),
- context,
- )
-- if (
-- full_path == context.config.topsrcdir
-- or full_path == context.config.topobjdir
-- ):
-- raise SandboxValidationError(
-- "Path specified in LOCAL_INCLUDES "
-- "(%s) resolves to the topsrcdir or topobjdir (%s), which is "
-- "not allowed" % (local_include, full_path),
-- context,
-- )
- include_obj = LocalInclude(context, local_include)
- local_includes.append(include_obj.path.full_path)
- yield include_obj
-diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-index e53bc5e..c1b9d32 100644
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1098,28 +1098,6 @@ class TestEmitterBasic(unittest.TestCase):
-
- self.assertEqual(local_includes, expected)
-
-- def test_local_includes_invalid(self):
-- """Test that invalid LOCAL_INCLUDES are properly detected."""
-- reader = self.reader("local_includes-invalid/srcdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
-- reader = self.reader("local_includes-invalid/objdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
- def test_local_includes_file(self):
- """Test that a filename can't be used in LOCAL_INCLUDES."""
- reader = self.reader("local_includes-filename")
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
deleted file mode 100644
index 054685c1eee2..000000000000
--- a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Tue, 10 Aug 2021 00:00:50 +0200
-Subject: [PATCH] Tests: Use native TemporaryDirectory
-
-Without ugly wrapper for Py < 3.2 that doesn't work half of the times...
----
- js/src/jit-test/jit_test.py | 2 +-
- js/src/tests/jstests.py | 2 +-
- js/src/tests/lib/tempfile.py | 17 +----------------
- 3 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py
-index f5d7794..8d443aa 100755
---- a/js/src/jit-test/jit_test.py
-+++ b/js/src/jit-test/jit_test.py
-@@ -38,7 +38,7 @@ from lib.tests import (
- get_environment_overlay,
- change_env,
- )
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
-
- def which(name):
-diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
-index 6fa2f5f..53ceff6 100755
---- a/js/src/tests/jstests.py
-+++ b/js/src/tests/jstests.py
-@@ -37,7 +37,7 @@ from lib.tests import (
- from lib.results import ResultsSink, TestOutput
- from lib.progressbar import ProgressBar
- from lib.adaptor import xdr_annotate
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
- if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
- from lib.tasks_unix import run_all_tests
-diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py
-index ecc21c9..f0a1fa3 100644
---- a/js/src/tests/lib/tempfile.py
-+++ b/js/src/tests/lib/tempfile.py
-@@ -2,19 +2,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- from __future__ import absolute_import
--
--try:
-- # Python 3.2
-- from tempfile import TemporaryDirectory
--except ImportError:
-- import tempfile
-- import shutil
-- from contextlib import contextmanager
--
-- @contextmanager
-- def TemporaryDirectory(*args, **kwds):
-- d = tempfile.mkdtemp(*args, **kwds)
-- try:
-- yield d
-- finally:
-- shutil.rmtree(d)
-+from tempfile import TemporaryDirectory
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch
deleted file mode 100644
index 1954a55bf369..000000000000
--- a/srcpkgs/mozjs91/patches/008-init-patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 14:38:58 +0200
-Subject: [PATCH] Don't throw InvalidOptionError on invalid options
-
----
- python/mozbuild/mozbuild/configure/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index f3167f6..c9e1132 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -553,10 +553,7 @@ class ConfigureSandbox(dict):
- for arg in self._helper:
- without_value = arg.split("=", 1)[0]
- msg = "Unknown option: %s" % without_value
-- if self._help:
-- self._logger.warning(msg)
-- else:
-- raise InvalidOptionError(msg)
-+ self._logger.warning(msg)
-
- # Run the execution queue
- for func, args in self._execution_queue:
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
deleted file mode 100644
index 10b8b16ea7dc..000000000000
--- a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 16:15:37 +0200
-Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf
-
----
- build/autoconf/autoconf.sh | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh
-index ceb8a25..606c74e 100644
---- a/build/autoconf/autoconf.sh
-+++ b/build/autoconf/autoconf.sh
-@@ -114,12 +114,6 @@ fi
-
- # Use the frozen version of Autoconf if available.
- r= f=
--# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
--case `$M4 --help < /dev/null 2>&1` in
--*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
--*traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
--esac
-
- $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
- { rm -f $tmpin $tmpout; exit 2; }
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
deleted file mode 100644
index 5c286647325c..000000000000
--- a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 3 Aug 2020 10:27:00 +0200
-Subject: [PATCH] Skip failing tests on ppc64 and s390x
-
-ppc64 and s390x: non262/extensions/clone-errors.js
-s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js
----
- js/src/tests/jstests.list | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
-index 73ce42f..1797646 100644
---- a/js/src/tests/jstests.list
-+++ b/js/src/tests/jstests.list
-@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list
- skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
- skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
-
-+# Crashes on s390x and ppc64, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
-+
-+# Crashes on s390x, ppc64, aarch64
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js
-+
-+# Crashes on s390x, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-+
- #####################################
- # Test262 tests disabled on browser #
- #####################################
---
-2.31.1
-
-
diff --git a/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch
deleted file mode 100644
index 814912633217..000000000000
--- a/srcpkgs/mozjs91/patches/012-fix-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:06:47 2022 +0100
-
- fix musl miscompilation
-
- https://github.com/void-linux/void-packages/issues/2598
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 77652f67..ab5e917b 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then
- mips*-*)
- :
- ;;
-- *-android*|*-linuxandroid*)
-+ *-android*|*-linuxandroid*|*-musl*)
- :
- ;;
- *)
diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
deleted file mode 100644
index 93e8c83f9337..000000000000
--- a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:09:42 2022 +0100
-
- disable spidermonkey jslint
-
-diff --git a/js/src/build/moz.build b/js/src/build/moz.build
-index 55c66b97..243f7db2 100644
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True
-
- DIST_INSTALL = True
-
--# Run SpiderMonkey style checker after linking the static library. This avoids
--# running the script for no-op builds.
--GeneratedFile(
-- "spidermonkey_checks",
-- script="/config/run_spidermonkey_checks.py",
-- inputs=[
-- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
-- "/config/check_spidermonkey_style.py",
-- "/config/check_macroassembler_style.py",
-- "/config/check_js_opcode.py",
-- ],
--)
diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch
deleted file mode 100644
index 4d8918a2a54c..000000000000
--- a/srcpkgs/mozjs91/patches/014-rust-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:13:38 2022 +0100
-
- bypass rust triplet checks and just force ours
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72b..0c03cab7 100644
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
- data.setdefault(key, []).append(namespace(rust_target=t, target=info))
- return data
-
--
-+@imports("os")
- def detect_rustc_target(
- host_or_target, compiler_info, arm_target, rust_supported_targets
- ):
-@@ -383,7 +383,7 @@ def detect_rustc_target(
-
- return None
-
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
-
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
deleted file mode 100644
index e2b340cd060e..000000000000
--- a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-drop some rust compiler validation
-
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
- return unwrap
-
-
--rustc = unwrap_rustup(rustc, "rustc")
--cargo = unwrap_rustup(cargo, "cargo")
--
-
- set_config("CARGO", cargo)
- set_config("RUSTC", rustc)
-@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
-
- os.write(in_fd, ensure_binary(source))
- os.close(in_fd)
--
-- cmd = [
-- rustc,
-- "--crate-type",
-- "staticlib",
-- target_arg,
-- "-o",
-- out_path,
-- in_path,
-- ]
--
-- def failed():
-- die(
-- dedent(
-- """\
-- Cannot compile for {} with {}
-- The target may be unsupported, or you may not have
-- a rust std library for that target installed. Try:
--
-- rustup target add {}
-- """.format(
-- host_or_target.alias, rustc, rustc_target
-- )
-- )
-- )
--
-- check_cmd_output(*cmd, onerror=failed)
-- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
-- failed()
- finally:
- os.remove(in_path)
- os.remove(out_path)
-@@ -462,29 +430,6 @@ def rust_host_triple(
- rustc_target = detect_rustc_target(
- host, compiler_info, arm_target, rust_supported_targets
- )
-- if rustc_target != rustc_host:
-- if host.alias == rustc_target:
-- configure_host = host.alias
-- else:
-- configure_host = "{}/{}".format(host.alias, rustc_target)
-- die(
-- dedent(
-- """\
-- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
--
-- You can solve this by:
-- * Set your configure host to match the rust compiler host by editing your
-- mozconfig and adding "ac_add_options --host={rustc}".
-- * Or, install the rust toolchain for {configure}, if supported, by running
-- "rustup default stable-{rustc_target}"
-- """.format(
-- rustc=rustc_host,
-- configure=configure_host,
-- rustc_target=rustc_target,
-- )
-- )
-- )
-- assert_rust_compile(host, rustc_target, rustc)
- return rustc_target
-
-
diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
deleted file mode 100644
index 24075c591ff4..000000000000
--- a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:55:43 2022 +0100
-
- drop some library checks
-
- This calls readelf and won't work with LTO'd setups.
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 401c2933..ade4f1da 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -405,22 +405,6 @@ force-cargo-library-build:
- $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
-
- $(RUST_LIBRARY_FILE): force-cargo-library-build
--# When we are building in --enable-release mode; we add an additional check to confirm
--# that we are not importing any networking-related functions in rust code. This reduces
--# the chance of proxy bypasses originating from rust code.
--# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
--# Sanitizers and sancov also fail because compiler-rt hooks network functions.
--ifndef MOZ_PROFILE_GENERATE
--ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST_CROSS
--ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py_action,check_binary,--target --networking $@)
--endif
--endif
--endif
--endif
--endif
-
- force-cargo-library-check:
- $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
deleted file mode 100644
index 4a9b0b42a575..000000000000
--- a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
-+ifneq (1,$(MOZ_NO_RUST_LTO))
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
- endif
- endif
- endif
-+endif
-
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
diff --git a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch b/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
deleted file mode 100644
index 066330731e5e..000000000000
--- a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32e52128ce8fe7704a29a5a4fb921a8394540fbc
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jun 13 14:01:59 2022 +0200
-
- fix ftbfs on powerpc32
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 85f2612d..df5c9629 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,7 +230,7 @@ class DebugFrame {
- // Avoid -Wunused-private-field warnings.
- protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
-- defined(JS_CODEGEN_X86) || defined(__wasi__)
-+ defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__))
- // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only
- // 4-byte aligned, so we add another word to get up to 8-byte
- // alignment.
diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
deleted file mode 100644
index 831e5e03678d..000000000000
--- a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -30,7 +30,12 @@
- * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
- */
-
-+#if defined(__linux__) && defined(__i386__)
-+// rely on glibc's double_t
-+typedef long double __double_t;
-+#else
- typedef double __double_t;
-+#endif
- typedef __double_t double_t;
-
- /*
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..c2370c02a7f7 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,98 +1,13 @@
-# Template file for 'mozjs91'
+# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
-build_wrksrc=js/src
-build_style=gnu-configure
-build_helper=rust
-make_check_target=check-jit-test
-configure_args="--disable-jemalloc --disable-strip --disable-tests \
- --disable-optimize --disable-debug --enable-ctypes --enable-readline \
- --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
- --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- rust cargo llvm12 clang"
-makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
- zlib-devel rust-std"
-checkdepends=python3
-short_desc="SpiderMonkey JavaScript interpreter and library (91.x)"
+revision=3
+build_style=meta
+short_desc="Mozilla JavaScript interpreter and library (91.x series) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
+license="metapackage"
homepage="https://spidermonkey.dev"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92
-
-LDFLAGS="-Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- # Disable LTO on i686, otherwise compilation of `jsrust` fails with -
- # error: ran out of registers during register allocation
- # LLVM ERROR: Cannot emit physreg copy instruction
- # error: could not compile `jsrust` due to previous error
- export MOZ_NO_RUST_LTO=1
-fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
- fi
- export M4=m4
- export AWK=awk
- export AC_MACRODIR=../../build/autoconf
- chmod 0755 ../../build/autoconf/autoconf.sh
- sh ../../build/autoconf/autoconf.sh configure.in > configure
- chmod 0755 configure
-}
-
-post_install() {
- # Remove unneeded static library
- rm -f "${DESTDIR}"/usr/lib/*.ajs
-
- # it has correct soname but not the right file name
- mv "${DESTDIR}"/usr/lib/libmozjs-91.so \
- "${DESTDIR}"/usr/lib/libmozjs-91.so.0
- ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \
- "${DESTDIR}"/usr/lib/libmozjs-91.so
-}
-
-pre_check() {
- if [ "$XBPS_WORDSIZE" = 32 ]; then
- vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g
- vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g
- fi
- if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x basic/fdlibm-for-sin-cos-tan-argument.js \
- -x gc/gcparam.js \
- -x ion/dce-with-rinstructions.js \
- -x sunspider/check-3d-cube.js \
- -x sunspider/check-3d-raytrace.js \
- -x sunspider/check-access-nbody.js \
- -x wasm/nan-semantics.js \
- -x wasm/spec/spec/float_literals.wast.js \
- -x wasm/spec/spec/float_memory.wast.js \
- -x wasm/spec/threads/float_memory.wast.js \
- "
- fi
- if [ "$XBPS_LIBC" = musl ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x sunspider/check-date-format-tofte.js \
- "
- fi
-}
mozjs91-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/js91-config
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
+ build_style=meta
}
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (7 preceding siblings ...)
2022-12-26 8:54 ` oreo639
@ 2022-12-26 9:04 ` oreo639
2022-12-26 9:19 ` oreo639
` (37 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [ ] navit-0.5.6_3
- [ ] ngircd-26_2
- [ ] ntp-4.2.8p15_5
- [ ] openjdk8-jre-8u322b04_3
- [ ] openssh-9.1p1_2
- [ ] openssh-sk-helper-9.1p1_2
- [ ] p0f-3.09b_3
- [ ] pam_ssh_agent_auth-0.10.3_3
- [ ] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [ ] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 105938 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/93] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/93] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 03/93] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 04/93] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 05/93] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 06/93] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 07/93] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 08/93] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 09/93] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 10/93] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 11/93] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 12/93] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 13/93] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 14/93] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 15/93] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 16/93] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 17/93] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 18/93] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 19/93] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 20/93] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 21/93] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 22/93] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 23/93] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 24/93] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 25/93] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 26/93] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 27/93] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 28/93] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 29/93] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 30/93] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 31/93] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 32/93] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 33/93] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 34/93] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 35/93] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 36/93] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 37/93] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 38/93] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 39/93] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 40/93] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 41/93] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 42/93] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 43/93] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 44/93] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 45/93] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 46/93] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 47/93] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 48/93] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 49/93] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 50/93] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 51/93] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 52/93] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 53/93] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 54/93] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 55/93] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 56/93] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 57/93] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 58/93] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 59/93] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 60/93] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 61/93] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 62/93] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 63/93] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 64/93] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 65/93] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 66/93] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 67/93] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 68/93] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 69/93] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 70/93] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 71/93] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 72/93] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 73/93] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 74/93] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 75/93] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 76/93] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 77/93] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 78/93] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 79/93] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 80/93] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 81/93] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 82/93] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 3ab0de912d4d20c2f33bee938e09517e33d81142 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:54:11 -0800
Subject: [PATCH 83/93] mozjs91: remove package
---
common/shlibs | 1 -
srcpkgs/mozjs91/patches/001-fix-soname.patch | 26 -----
.../mozjs91/patches/002-copy-headers.patch | 38 --------
.../mozjs91/patches/003-tests-timeout.patch | 26 -----
.../004-icu-sources-data-py-decouple.patch | 29 ------
...cu-sources-data-write-command-stderr.patch | 44 ---------
srcpkgs/mozjs91/patches/006-emitter.patch | 67 -------------
...-tests-use-native-temporarydirectory.patch | 66 -------------
srcpkgs/mozjs91/patches/008-init-patch.patch | 28 ------
.../patches/009-sloppy-m4-detection.patch | 29 ------
.../011-failing-tests-ppc64-s390x.patch | 36 -------
srcpkgs/mozjs91/patches/012-fix-musl.patch | 21 ----
.../013-disable-spidermonkey-jslint.patch | 26 -----
srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ------
.../patches/015-drop-rustc-validation.patch | 80 ---------------
.../mozjs91/patches/017-no-lto-readelf.patch | 35 -------
srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ----
srcpkgs/mozjs91/patches/fix-build-ppc32.patch | 19 ----
srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ----
srcpkgs/mozjs91/template | 97 ++-----------------
20 files changed, 6 insertions(+), 726 deletions(-)
delete mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch
delete mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch
delete mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch
delete mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
delete mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
delete mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch
delete mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
delete mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch
delete mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
delete mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
delete mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch
delete mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
delete mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch
delete mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
delete mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
delete mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-build-ppc32.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
diff --git a/common/shlibs b/common/shlibs
index 140c7a79f4f3..5a7632287a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,7 +3497,6 @@ libKF5Syndication.so.5 syndication-5.50.0_1
liblqr-1.so.0 liblqr-0.4.2_1
libmozjs-102.so.0 mozjs102-102.3.0_1
libmozjs-78.so.0 mozjs78-78.1.0_1
-libmozjs-91.so.0 mozjs91-91.5.0_1
libebur128.so.1 libebur128-1.2.4_1
libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch
deleted file mode 100644
index a319d9e975ef..000000000000
--- a/srcpkgs/mozjs91/patches/001-fix-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:21:47 +0200
-Subject: [PATCH] Add soname switch to linker, regardless of Operating System
-
-Fix backported from Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/rules.mk b/config/rules.mk
-index 0f9b2ac..f6b4efe 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU)
- OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
- endif
-
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-+
- #
- # MINGW32
- #
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch
deleted file mode 100644
index aafe1aa84bd3..000000000000
--- a/srcpkgs/mozjs91/patches/002-copy-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:27:39 +0200
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch by Philip Chimento ported forward to mozjs78
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index d964466..0285ad9 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend):
- " of srcdir-relative or absolute paths."
- )
-
-- install_manifest.add_pattern_link(basepath, wild, dest_dir)
-+ install_manifest.add_pattern_copy(basepath, wild, dest_dir)
- else:
-- install_manifest.add_pattern_link(f.srcdir, f, dest_dir)
-+ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir)
- elif isinstance(f, AbsolutePath):
- if not f.full_path.lower().endswith((".dll", ".pdb", ".so")):
- raise Exception(
-@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend):
- install_manifest.add_optional_exists(dest_file)
- absolute_files.append(f.full_path)
- else:
-- install_manifest.add_link(f.full_path, dest_file)
-+ install_manifest.add_copy(f.full_path, dest_file)
- else:
- install_manifest.add_optional_exists(dest_file)
- objdir_files.append(self._pretty_path(f, backend_file))
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch
deleted file mode 100644
index c86cca403deb..000000000000
--- a/srcpkgs/mozjs91/patches/003-tests-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:32:44 +0200
-Subject: [PATCH] Increase the test timeout for slower buildds
-
-Ported forward from Debian: https://bugs.debian.org/878284
----
- js/src/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
-index b86aeed..d68655a 100644
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -53,7 +53,7 @@ check:: check-js-msg
-
- check-jstests:
- $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
-- --no-progress --format=automation --timeout 300 \
-+ --no-progress --format=automation --timeout 600 \
- $(JSTESTS_EXTRA_ARGS) \
- $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
-
---
-2.26.2
-
diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
deleted file mode 100644
index 8572c21fd4ec..000000000000
--- a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:22:12 +0100
-Subject: icu_sources_data.py: Decouple from Mozilla build system
-
-mozpack.path is a wrapper around os.path that normalizes path
-separators on Windows, but on Unix we only have one path separator
-so there's nothing to normalize. Avoid needing to import all of it.
----
- intl/icu_sources_data.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 2936df9..4db52af 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -21,7 +21,9 @@ import subprocess
- import sys
- import tempfile
-
--from mozpack import path as mozpath
-+# Close enough
-+import os.path as mozpath
-+mozpath.normsep = lambda p: p
-
- # The following files have been determined to be dead/unused by a
- # semi-automated analysis. You can just remove any of the files below
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
deleted file mode 100644
index 84684250ce4c..000000000000
--- a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:23:14 +0100
-Subject: icu_sources_data: Write command output to our stderr
-
-Saying "See output in /tmp/foobar" is all very well for a developer
-build, but on a buildd our /tmp is going to get thrown away after
-the build. Just log the usual way instead.
----
- intl/icu_sources_data.py | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 4db52af..d62960d 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -188,21 +188,13 @@ def update_sources(topsrcdir):
-
- def try_run(name, command, cwd=None, **kwargs):
- try:
-- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
-- subprocess.check_call(
-- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs
-- )
-- except subprocess.CalledProcessError:
-- print(
-- """Error running "{}" in directory {}
-- See output in {}""".format(
-- " ".join(command), cwd, f.name
-- ),
-- file=sys.stderr,
-+ subprocess.check_call(
-+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs
- )
-+ except subprocess.CalledProcessError:
-+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr)
- return False
- else:
-- os.unlink(f.name)
- return True
-
-
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch
deleted file mode 100644
index 556bebd257ca..000000000000
--- a/srcpkgs/mozjs91/patches/006-emitter.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:39:47 +0200
-Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
-
----
- python/mozbuild/mozbuild/frontend/emitter.py | 10 ---------
- .../mozbuild/test/frontend/test_emitter.py | 22 -------------------
- 2 files changed, 32 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
-index 44b916e..f2e821d 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin):
- "(resolved to %s)" % (local_include, full_path),
- context,
- )
-- if (
-- full_path == context.config.topsrcdir
-- or full_path == context.config.topobjdir
-- ):
-- raise SandboxValidationError(
-- "Path specified in LOCAL_INCLUDES "
-- "(%s) resolves to the topsrcdir or topobjdir (%s), which is "
-- "not allowed" % (local_include, full_path),
-- context,
-- )
- include_obj = LocalInclude(context, local_include)
- local_includes.append(include_obj.path.full_path)
- yield include_obj
-diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-index e53bc5e..c1b9d32 100644
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1098,28 +1098,6 @@ class TestEmitterBasic(unittest.TestCase):
-
- self.assertEqual(local_includes, expected)
-
-- def test_local_includes_invalid(self):
-- """Test that invalid LOCAL_INCLUDES are properly detected."""
-- reader = self.reader("local_includes-invalid/srcdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
-- reader = self.reader("local_includes-invalid/objdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
- def test_local_includes_file(self):
- """Test that a filename can't be used in LOCAL_INCLUDES."""
- reader = self.reader("local_includes-filename")
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
deleted file mode 100644
index 054685c1eee2..000000000000
--- a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Tue, 10 Aug 2021 00:00:50 +0200
-Subject: [PATCH] Tests: Use native TemporaryDirectory
-
-Without ugly wrapper for Py < 3.2 that doesn't work half of the times...
----
- js/src/jit-test/jit_test.py | 2 +-
- js/src/tests/jstests.py | 2 +-
- js/src/tests/lib/tempfile.py | 17 +----------------
- 3 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py
-index f5d7794..8d443aa 100755
---- a/js/src/jit-test/jit_test.py
-+++ b/js/src/jit-test/jit_test.py
-@@ -38,7 +38,7 @@ from lib.tests import (
- get_environment_overlay,
- change_env,
- )
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
-
- def which(name):
-diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
-index 6fa2f5f..53ceff6 100755
---- a/js/src/tests/jstests.py
-+++ b/js/src/tests/jstests.py
-@@ -37,7 +37,7 @@ from lib.tests import (
- from lib.results import ResultsSink, TestOutput
- from lib.progressbar import ProgressBar
- from lib.adaptor import xdr_annotate
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
- if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
- from lib.tasks_unix import run_all_tests
-diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py
-index ecc21c9..f0a1fa3 100644
---- a/js/src/tests/lib/tempfile.py
-+++ b/js/src/tests/lib/tempfile.py
-@@ -2,19 +2,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- from __future__ import absolute_import
--
--try:
-- # Python 3.2
-- from tempfile import TemporaryDirectory
--except ImportError:
-- import tempfile
-- import shutil
-- from contextlib import contextmanager
--
-- @contextmanager
-- def TemporaryDirectory(*args, **kwds):
-- d = tempfile.mkdtemp(*args, **kwds)
-- try:
-- yield d
-- finally:
-- shutil.rmtree(d)
-+from tempfile import TemporaryDirectory
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch
deleted file mode 100644
index 1954a55bf369..000000000000
--- a/srcpkgs/mozjs91/patches/008-init-patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 14:38:58 +0200
-Subject: [PATCH] Don't throw InvalidOptionError on invalid options
-
----
- python/mozbuild/mozbuild/configure/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index f3167f6..c9e1132 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -553,10 +553,7 @@ class ConfigureSandbox(dict):
- for arg in self._helper:
- without_value = arg.split("=", 1)[0]
- msg = "Unknown option: %s" % without_value
-- if self._help:
-- self._logger.warning(msg)
-- else:
-- raise InvalidOptionError(msg)
-+ self._logger.warning(msg)
-
- # Run the execution queue
- for func, args in self._execution_queue:
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
deleted file mode 100644
index 10b8b16ea7dc..000000000000
--- a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 16:15:37 +0200
-Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf
-
----
- build/autoconf/autoconf.sh | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh
-index ceb8a25..606c74e 100644
---- a/build/autoconf/autoconf.sh
-+++ b/build/autoconf/autoconf.sh
-@@ -114,12 +114,6 @@ fi
-
- # Use the frozen version of Autoconf if available.
- r= f=
--# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
--case `$M4 --help < /dev/null 2>&1` in
--*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
--*traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
--esac
-
- $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
- { rm -f $tmpin $tmpout; exit 2; }
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
deleted file mode 100644
index 5c286647325c..000000000000
--- a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 3 Aug 2020 10:27:00 +0200
-Subject: [PATCH] Skip failing tests on ppc64 and s390x
-
-ppc64 and s390x: non262/extensions/clone-errors.js
-s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js
----
- js/src/tests/jstests.list | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
-index 73ce42f..1797646 100644
---- a/js/src/tests/jstests.list
-+++ b/js/src/tests/jstests.list
-@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list
- skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
- skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
-
-+# Crashes on s390x and ppc64, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
-+
-+# Crashes on s390x, ppc64, aarch64
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js
-+
-+# Crashes on s390x, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-+
- #####################################
- # Test262 tests disabled on browser #
- #####################################
---
-2.31.1
-
-
diff --git a/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch
deleted file mode 100644
index 814912633217..000000000000
--- a/srcpkgs/mozjs91/patches/012-fix-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:06:47 2022 +0100
-
- fix musl miscompilation
-
- https://github.com/void-linux/void-packages/issues/2598
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 77652f67..ab5e917b 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then
- mips*-*)
- :
- ;;
-- *-android*|*-linuxandroid*)
-+ *-android*|*-linuxandroid*|*-musl*)
- :
- ;;
- *)
diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
deleted file mode 100644
index 93e8c83f9337..000000000000
--- a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:09:42 2022 +0100
-
- disable spidermonkey jslint
-
-diff --git a/js/src/build/moz.build b/js/src/build/moz.build
-index 55c66b97..243f7db2 100644
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True
-
- DIST_INSTALL = True
-
--# Run SpiderMonkey style checker after linking the static library. This avoids
--# running the script for no-op builds.
--GeneratedFile(
-- "spidermonkey_checks",
-- script="/config/run_spidermonkey_checks.py",
-- inputs=[
-- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
-- "/config/check_spidermonkey_style.py",
-- "/config/check_macroassembler_style.py",
-- "/config/check_js_opcode.py",
-- ],
--)
diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch
deleted file mode 100644
index 4d8918a2a54c..000000000000
--- a/srcpkgs/mozjs91/patches/014-rust-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:13:38 2022 +0100
-
- bypass rust triplet checks and just force ours
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72b..0c03cab7 100644
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
- data.setdefault(key, []).append(namespace(rust_target=t, target=info))
- return data
-
--
-+@imports("os")
- def detect_rustc_target(
- host_or_target, compiler_info, arm_target, rust_supported_targets
- ):
-@@ -383,7 +383,7 @@ def detect_rustc_target(
-
- return None
-
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
-
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
deleted file mode 100644
index e2b340cd060e..000000000000
--- a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-drop some rust compiler validation
-
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
- return unwrap
-
-
--rustc = unwrap_rustup(rustc, "rustc")
--cargo = unwrap_rustup(cargo, "cargo")
--
-
- set_config("CARGO", cargo)
- set_config("RUSTC", rustc)
-@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
-
- os.write(in_fd, ensure_binary(source))
- os.close(in_fd)
--
-- cmd = [
-- rustc,
-- "--crate-type",
-- "staticlib",
-- target_arg,
-- "-o",
-- out_path,
-- in_path,
-- ]
--
-- def failed():
-- die(
-- dedent(
-- """\
-- Cannot compile for {} with {}
-- The target may be unsupported, or you may not have
-- a rust std library for that target installed. Try:
--
-- rustup target add {}
-- """.format(
-- host_or_target.alias, rustc, rustc_target
-- )
-- )
-- )
--
-- check_cmd_output(*cmd, onerror=failed)
-- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
-- failed()
- finally:
- os.remove(in_path)
- os.remove(out_path)
-@@ -462,29 +430,6 @@ def rust_host_triple(
- rustc_target = detect_rustc_target(
- host, compiler_info, arm_target, rust_supported_targets
- )
-- if rustc_target != rustc_host:
-- if host.alias == rustc_target:
-- configure_host = host.alias
-- else:
-- configure_host = "{}/{}".format(host.alias, rustc_target)
-- die(
-- dedent(
-- """\
-- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
--
-- You can solve this by:
-- * Set your configure host to match the rust compiler host by editing your
-- mozconfig and adding "ac_add_options --host={rustc}".
-- * Or, install the rust toolchain for {configure}, if supported, by running
-- "rustup default stable-{rustc_target}"
-- """.format(
-- rustc=rustc_host,
-- configure=configure_host,
-- rustc_target=rustc_target,
-- )
-- )
-- )
-- assert_rust_compile(host, rustc_target, rustc)
- return rustc_target
-
-
diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
deleted file mode 100644
index 24075c591ff4..000000000000
--- a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:55:43 2022 +0100
-
- drop some library checks
-
- This calls readelf and won't work with LTO'd setups.
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 401c2933..ade4f1da 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -405,22 +405,6 @@ force-cargo-library-build:
- $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
-
- $(RUST_LIBRARY_FILE): force-cargo-library-build
--# When we are building in --enable-release mode; we add an additional check to confirm
--# that we are not importing any networking-related functions in rust code. This reduces
--# the chance of proxy bypasses originating from rust code.
--# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
--# Sanitizers and sancov also fail because compiler-rt hooks network functions.
--ifndef MOZ_PROFILE_GENERATE
--ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST_CROSS
--ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py_action,check_binary,--target --networking $@)
--endif
--endif
--endif
--endif
--endif
-
- force-cargo-library-check:
- $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
deleted file mode 100644
index 4a9b0b42a575..000000000000
--- a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
-+ifneq (1,$(MOZ_NO_RUST_LTO))
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
- endif
- endif
- endif
-+endif
-
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
diff --git a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch b/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
deleted file mode 100644
index 066330731e5e..000000000000
--- a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32e52128ce8fe7704a29a5a4fb921a8394540fbc
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jun 13 14:01:59 2022 +0200
-
- fix ftbfs on powerpc32
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 85f2612d..df5c9629 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,7 +230,7 @@ class DebugFrame {
- // Avoid -Wunused-private-field warnings.
- protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
-- defined(JS_CODEGEN_X86) || defined(__wasi__)
-+ defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__))
- // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only
- // 4-byte aligned, so we add another word to get up to 8-byte
- // alignment.
diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
deleted file mode 100644
index 831e5e03678d..000000000000
--- a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -30,7 +30,12 @@
- * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
- */
-
-+#if defined(__linux__) && defined(__i386__)
-+// rely on glibc's double_t
-+typedef long double __double_t;
-+#else
- typedef double __double_t;
-+#endif
- typedef __double_t double_t;
-
- /*
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..c2370c02a7f7 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,98 +1,13 @@
-# Template file for 'mozjs91'
+# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
-build_wrksrc=js/src
-build_style=gnu-configure
-build_helper=rust
-make_check_target=check-jit-test
-configure_args="--disable-jemalloc --disable-strip --disable-tests \
- --disable-optimize --disable-debug --enable-ctypes --enable-readline \
- --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
- --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- rust cargo llvm12 clang"
-makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
- zlib-devel rust-std"
-checkdepends=python3
-short_desc="SpiderMonkey JavaScript interpreter and library (91.x)"
+revision=3
+build_style=meta
+short_desc="Mozilla JavaScript interpreter and library (91.x series) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
+license="metapackage"
homepage="https://spidermonkey.dev"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92
-
-LDFLAGS="-Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- # Disable LTO on i686, otherwise compilation of `jsrust` fails with -
- # error: ran out of registers during register allocation
- # LLVM ERROR: Cannot emit physreg copy instruction
- # error: could not compile `jsrust` due to previous error
- export MOZ_NO_RUST_LTO=1
-fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
- fi
- export M4=m4
- export AWK=awk
- export AC_MACRODIR=../../build/autoconf
- chmod 0755 ../../build/autoconf/autoconf.sh
- sh ../../build/autoconf/autoconf.sh configure.in > configure
- chmod 0755 configure
-}
-
-post_install() {
- # Remove unneeded static library
- rm -f "${DESTDIR}"/usr/lib/*.ajs
-
- # it has correct soname but not the right file name
- mv "${DESTDIR}"/usr/lib/libmozjs-91.so \
- "${DESTDIR}"/usr/lib/libmozjs-91.so.0
- ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \
- "${DESTDIR}"/usr/lib/libmozjs-91.so
-}
-
-pre_check() {
- if [ "$XBPS_WORDSIZE" = 32 ]; then
- vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g
- vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g
- fi
- if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x basic/fdlibm-for-sin-cos-tan-argument.js \
- -x gc/gcparam.js \
- -x ion/dce-with-rinstructions.js \
- -x sunspider/check-3d-cube.js \
- -x sunspider/check-3d-raytrace.js \
- -x sunspider/check-access-nbody.js \
- -x wasm/nan-semantics.js \
- -x wasm/spec/spec/float_literals.wast.js \
- -x wasm/spec/spec/float_memory.wast.js \
- -x wasm/spec/threads/float_memory.wast.js \
- "
- fi
- if [ "$XBPS_LIBC" = musl ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x sunspider/check-date-format-tofte.js \
- "
- fi
-}
mozjs91-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/js91-config
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
+ build_style=meta
}
From accba526a0e3dd57152b2711b9067d331a9ebe0f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 84/93] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3d4c5f1db8a1e6a8718c8001d60d09a395d4705b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 85/93] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 652c942451e77aef41dc966ed1b6270456988c61 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 86/93] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 97815e1e941fd3b0e5d935f988a23f2ad9135779 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 87/93] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 9c2b58522c6939de181c65e65b3d3f69989606f3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 88/93] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 42294f8644205bdcabc78906c6c8309b5604c1c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 89/93] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 7705ba8aaec95d79e97c54ce0dc5715dffdb7a35 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 90/93] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 525f7f773a0404f339f0a5402008fcfed24f3281 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 91/93] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 43382a074c6a2eeab1334816121dd98424f4069b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 92/93] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 2064010820609021d34629010d51877d6df9e4a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 93/93] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (8 preceding siblings ...)
2022-12-26 9:04 ` oreo639
@ 2022-12-26 9:19 ` oreo639
2022-12-26 11:47 ` oreo639
` (36 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 9:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5847 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package: https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [ ] qemu-7.1.0_1
- [ ] qemu-ga-7.1.0_1
- [ ] qemu-user-static-7.1.0_1
- [ ] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [ ] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [ ] stunnel-5.66_1
- [ ] sudo-1.9.11p3_1
- [ ] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [ ] tcltls-1.7.22_1
- [ ] testdisk-7.1_3
- [ ] thc-hydra-9.1_4
- [ ] tini-0.19.0_1
- [ ] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [ ] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [ ] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [ ] vte3-0.70.1_1
- [ ] vte3-gtk4-0.70.1_1
- [ ] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [ ] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [ ] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 119038 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/111] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/111] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/111] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/111] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/111] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/111] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/111] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/111] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/111] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/111] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/111] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/111] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/111] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/111] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/111] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/111] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/111] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/111] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/111] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/111] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/111] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/111] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/111] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/111] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/111] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/111] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/111] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/111] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/111] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/111] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/111] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/111] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/111] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/111] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/111] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/111] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/111] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/111] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/111] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/111] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/111] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/111] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/111] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/111] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/111] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/111] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/111] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/111] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/111] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/111] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/111] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/111] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/111] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/111] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/111] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/111] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/111] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/111] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/111] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/111] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/111] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/111] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/111] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/111] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/111] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/111] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/111] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/111] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/111] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/111] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/111] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/111] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/111] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/111] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/111] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/111] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/111] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/111] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/111] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/111] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/111] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/111] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 3ab0de912d4d20c2f33bee938e09517e33d81142 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:54:11 -0800
Subject: [PATCH 083/111] mozjs91: remove package
---
common/shlibs | 1 -
srcpkgs/mozjs91/patches/001-fix-soname.patch | 26 -----
.../mozjs91/patches/002-copy-headers.patch | 38 --------
.../mozjs91/patches/003-tests-timeout.patch | 26 -----
.../004-icu-sources-data-py-decouple.patch | 29 ------
...cu-sources-data-write-command-stderr.patch | 44 ---------
srcpkgs/mozjs91/patches/006-emitter.patch | 67 -------------
...-tests-use-native-temporarydirectory.patch | 66 -------------
srcpkgs/mozjs91/patches/008-init-patch.patch | 28 ------
.../patches/009-sloppy-m4-detection.patch | 29 ------
.../011-failing-tests-ppc64-s390x.patch | 36 -------
srcpkgs/mozjs91/patches/012-fix-musl.patch | 21 ----
.../013-disable-spidermonkey-jslint.patch | 26 -----
srcpkgs/mozjs91/patches/014-rust-target.patch | 28 ------
.../patches/015-drop-rustc-validation.patch | 80 ---------------
.../mozjs91/patches/017-no-lto-readelf.patch | 35 -------
srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch | 18 ----
srcpkgs/mozjs91/patches/fix-build-ppc32.patch | 19 ----
srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch | 18 ----
srcpkgs/mozjs91/template | 97 ++-----------------
20 files changed, 6 insertions(+), 726 deletions(-)
delete mode 100644 srcpkgs/mozjs91/patches/001-fix-soname.patch
delete mode 100644 srcpkgs/mozjs91/patches/002-copy-headers.patch
delete mode 100644 srcpkgs/mozjs91/patches/003-tests-timeout.patch
delete mode 100644 srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
delete mode 100644 srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
delete mode 100644 srcpkgs/mozjs91/patches/006-emitter.patch
delete mode 100644 srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
delete mode 100644 srcpkgs/mozjs91/patches/008-init-patch.patch
delete mode 100644 srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
delete mode 100644 srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
delete mode 100644 srcpkgs/mozjs91/patches/012-fix-musl.patch
delete mode 100644 srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
delete mode 100644 srcpkgs/mozjs91/patches/014-rust-target.patch
delete mode 100644 srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
delete mode 100644 srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
delete mode 100644 srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-build-ppc32.patch
delete mode 100644 srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
diff --git a/common/shlibs b/common/shlibs
index 140c7a79f4f3..5a7632287a75 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,7 +3497,6 @@ libKF5Syndication.so.5 syndication-5.50.0_1
liblqr-1.so.0 liblqr-0.4.2_1
libmozjs-102.so.0 mozjs102-102.3.0_1
libmozjs-78.so.0 mozjs78-78.1.0_1
-libmozjs-91.so.0 mozjs91-91.5.0_1
libebur128.so.1 libebur128-1.2.4_1
libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
diff --git a/srcpkgs/mozjs91/patches/001-fix-soname.patch b/srcpkgs/mozjs91/patches/001-fix-soname.patch
deleted file mode 100644
index a319d9e975ef..000000000000
--- a/srcpkgs/mozjs91/patches/001-fix-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:21:47 +0200
-Subject: [PATCH] Add soname switch to linker, regardless of Operating System
-
-Fix backported from Debian: http://bugs.debian.org/746705
----
- config/rules.mk | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/rules.mk b/config/rules.mk
-index 0f9b2ac..f6b4efe 100644
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -285,6 +285,8 @@ ifeq ($(OS_ARCH),GNU)
- OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
- endif
-
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-+
- #
- # MINGW32
- #
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/002-copy-headers.patch b/srcpkgs/mozjs91/patches/002-copy-headers.patch
deleted file mode 100644
index aafe1aa84bd3..000000000000
--- a/srcpkgs/mozjs91/patches/002-copy-headers.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:27:39 +0200
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch by Philip Chimento ported forward to mozjs78
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index d964466..0285ad9 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1568,9 +1568,9 @@ class RecursiveMakeBackend(MakeBackend):
- " of srcdir-relative or absolute paths."
- )
-
-- install_manifest.add_pattern_link(basepath, wild, dest_dir)
-+ install_manifest.add_pattern_copy(basepath, wild, dest_dir)
- else:
-- install_manifest.add_pattern_link(f.srcdir, f, dest_dir)
-+ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir)
- elif isinstance(f, AbsolutePath):
- if not f.full_path.lower().endswith((".dll", ".pdb", ".so")):
- raise Exception(
-@@ -1581,7 +1581,7 @@ class RecursiveMakeBackend(MakeBackend):
- install_manifest.add_optional_exists(dest_file)
- absolute_files.append(f.full_path)
- else:
-- install_manifest.add_link(f.full_path, dest_file)
-+ install_manifest.add_copy(f.full_path, dest_file)
- else:
- install_manifest.add_optional_exists(dest_file)
- objdir_files.append(self._pretty_path(f, backend_file))
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/003-tests-timeout.patch b/srcpkgs/mozjs91/patches/003-tests-timeout.patch
deleted file mode 100644
index c86cca403deb..000000000000
--- a/srcpkgs/mozjs91/patches/003-tests-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:32:44 +0200
-Subject: [PATCH] Increase the test timeout for slower buildds
-
-Ported forward from Debian: https://bugs.debian.org/878284
----
- js/src/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
-index b86aeed..d68655a 100644
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -53,7 +53,7 @@ check:: check-js-msg
-
- check-jstests:
- $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
-- --no-progress --format=automation --timeout 300 \
-+ --no-progress --format=automation --timeout 600 \
- $(JSTESTS_EXTRA_ARGS) \
- $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
-
---
-2.26.2
-
diff --git a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch b/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
deleted file mode 100644
index 8572c21fd4ec..000000000000
--- a/srcpkgs/mozjs91/patches/004-icu-sources-data-py-decouple.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:22:12 +0100
-Subject: icu_sources_data.py: Decouple from Mozilla build system
-
-mozpack.path is a wrapper around os.path that normalizes path
-separators on Windows, but on Unix we only have one path separator
-so there's nothing to normalize. Avoid needing to import all of it.
----
- intl/icu_sources_data.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 2936df9..4db52af 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -21,7 +21,9 @@ import subprocess
- import sys
- import tempfile
-
--from mozpack import path as mozpath
-+# Close enough
-+import os.path as mozpath
-+mozpath.normsep = lambda p: p
-
- # The following files have been determined to be dead/unused by a
- # semi-automated analysis. You can just remove any of the files below
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch b/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
deleted file mode 100644
index 84684250ce4c..000000000000
--- a/srcpkgs/mozjs91/patches/005-icu-sources-data-write-command-stderr.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Mon, 9 Oct 2017 09:23:14 +0100
-Subject: icu_sources_data: Write command output to our stderr
-
-Saying "See output in /tmp/foobar" is all very well for a developer
-build, but on a buildd our /tmp is going to get thrown away after
-the build. Just log the usual way instead.
----
- intl/icu_sources_data.py | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
-index 4db52af..d62960d 100644
---- a/intl/icu_sources_data.py
-+++ b/intl/icu_sources_data.py
-@@ -188,21 +188,13 @@ def update_sources(topsrcdir):
-
- def try_run(name, command, cwd=None, **kwargs):
- try:
-- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
-- subprocess.check_call(
-- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs
-- )
-- except subprocess.CalledProcessError:
-- print(
-- """Error running "{}" in directory {}
-- See output in {}""".format(
-- " ".join(command), cwd, f.name
-- ),
-- file=sys.stderr,
-+ subprocess.check_call(
-+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs
- )
-+ except subprocess.CalledProcessError:
-+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr)
- return False
- else:
-- os.unlink(f.name)
- return True
-
-
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/006-emitter.patch b/srcpkgs/mozjs91/patches/006-emitter.patch
deleted file mode 100644
index 556bebd257ca..000000000000
--- a/srcpkgs/mozjs91/patches/006-emitter.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Wed, 15 Jul 2020 08:39:47 +0200
-Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
-
----
- python/mozbuild/mozbuild/frontend/emitter.py | 10 ---------
- .../mozbuild/test/frontend/test_emitter.py | 22 -------------------
- 2 files changed, 32 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
-index 44b916e..f2e821d 100644
---- a/python/mozbuild/mozbuild/frontend/emitter.py
-+++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1367,16 +1367,6 @@ class TreeMetadataEmitter(LoggingMixin):
- "(resolved to %s)" % (local_include, full_path),
- context,
- )
-- if (
-- full_path == context.config.topsrcdir
-- or full_path == context.config.topobjdir
-- ):
-- raise SandboxValidationError(
-- "Path specified in LOCAL_INCLUDES "
-- "(%s) resolves to the topsrcdir or topobjdir (%s), which is "
-- "not allowed" % (local_include, full_path),
-- context,
-- )
- include_obj = LocalInclude(context, local_include)
- local_includes.append(include_obj.path.full_path)
- yield include_obj
-diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-index e53bc5e..c1b9d32 100644
---- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
-@@ -1098,28 +1098,6 @@ class TestEmitterBasic(unittest.TestCase):
-
- self.assertEqual(local_includes, expected)
-
-- def test_local_includes_invalid(self):
-- """Test that invalid LOCAL_INCLUDES are properly detected."""
-- reader = self.reader("local_includes-invalid/srcdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
-- reader = self.reader("local_includes-invalid/objdir")
--
-- with six.assertRaisesRegex(
-- self,
-- SandboxValidationError,
-- "Path specified in LOCAL_INCLUDES.*resolves to the "
-- "topsrcdir or topobjdir",
-- ):
-- self.read_topsrcdir(reader)
--
- def test_local_includes_file(self):
- """Test that a filename can't be used in LOCAL_INCLUDES."""
- reader = self.reader("local_includes-filename")
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch b/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
deleted file mode 100644
index 054685c1eee2..000000000000
--- a/srcpkgs/mozjs91/patches/007-tests-use-native-temporarydirectory.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Tue, 10 Aug 2021 00:00:50 +0200
-Subject: [PATCH] Tests: Use native TemporaryDirectory
-
-Without ugly wrapper for Py < 3.2 that doesn't work half of the times...
----
- js/src/jit-test/jit_test.py | 2 +-
- js/src/tests/jstests.py | 2 +-
- js/src/tests/lib/tempfile.py | 17 +----------------
- 3 files changed, 3 insertions(+), 18 deletions(-)
-
-diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py
-index f5d7794..8d443aa 100755
---- a/js/src/jit-test/jit_test.py
-+++ b/js/src/jit-test/jit_test.py
-@@ -38,7 +38,7 @@ from lib.tests import (
- get_environment_overlay,
- change_env,
- )
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
-
- def which(name):
-diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
-index 6fa2f5f..53ceff6 100755
---- a/js/src/tests/jstests.py
-+++ b/js/src/tests/jstests.py
-@@ -37,7 +37,7 @@ from lib.tests import (
- from lib.results import ResultsSink, TestOutput
- from lib.progressbar import ProgressBar
- from lib.adaptor import xdr_annotate
--from lib.tempfile import TemporaryDirectory
-+from tempfile import TemporaryDirectory
-
- if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
- from lib.tasks_unix import run_all_tests
-diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py
-index ecc21c9..f0a1fa3 100644
---- a/js/src/tests/lib/tempfile.py
-+++ b/js/src/tests/lib/tempfile.py
-@@ -2,19 +2,4 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- from __future__ import absolute_import
--
--try:
-- # Python 3.2
-- from tempfile import TemporaryDirectory
--except ImportError:
-- import tempfile
-- import shutil
-- from contextlib import contextmanager
--
-- @contextmanager
-- def TemporaryDirectory(*args, **kwds):
-- d = tempfile.mkdtemp(*args, **kwds)
-- try:
-- yield d
-- finally:
-- shutil.rmtree(d)
-+from tempfile import TemporaryDirectory
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/008-init-patch.patch b/srcpkgs/mozjs91/patches/008-init-patch.patch
deleted file mode 100644
index 1954a55bf369..000000000000
--- a/srcpkgs/mozjs91/patches/008-init-patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 14:38:58 +0200
-Subject: [PATCH] Don't throw InvalidOptionError on invalid options
-
----
- python/mozbuild/mozbuild/configure/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
-index f3167f6..c9e1132 100644
---- a/python/mozbuild/mozbuild/configure/__init__.py
-+++ b/python/mozbuild/mozbuild/configure/__init__.py
-@@ -553,10 +553,7 @@ class ConfigureSandbox(dict):
- for arg in self._helper:
- without_value = arg.split("=", 1)[0]
- msg = "Unknown option: %s" % without_value
-- if self._help:
-- self._logger.warning(msg)
-- else:
-- raise InvalidOptionError(msg)
-+ self._logger.warning(msg)
-
- # Run the execution queue
- for func, args in self._execution_queue:
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch b/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
deleted file mode 100644
index 10b8b16ea7dc..000000000000
--- a/srcpkgs/mozjs91/patches/009-sloppy-m4-detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 9 Aug 2021 16:15:37 +0200
-Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf
-
----
- build/autoconf/autoconf.sh | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh
-index ceb8a25..606c74e 100644
---- a/build/autoconf/autoconf.sh
-+++ b/build/autoconf/autoconf.sh
-@@ -114,12 +114,6 @@ fi
-
- # Use the frozen version of Autoconf if available.
- r= f=
--# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
--case `$M4 --help < /dev/null 2>&1` in
--*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
--*traditional*) ;;
--*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
--esac
-
- $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
- { rm -f $tmpin $tmpout; exit 2; }
---
-2.31.1
-
diff --git a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch b/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
deleted file mode 100644
index 5c286647325c..000000000000
--- a/srcpkgs/mozjs91/patches/011-failing-tests-ppc64-s390x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
-Date: Mon, 3 Aug 2020 10:27:00 +0200
-Subject: [PATCH] Skip failing tests on ppc64 and s390x
-
-ppc64 and s390x: non262/extensions/clone-errors.js
-s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js
----
- js/src/tests/jstests.list | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
-index 73ce42f..1797646 100644
---- a/js/src/tests/jstests.list
-+++ b/js/src/tests/jstests.list
-@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list
- skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
- skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
-
-+# Crashes on s390x and ppc64, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
-+
-+# Crashes on s390x, ppc64, aarch64
-+skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js
-+
-+# Crashes on s390x, avoid it
-+skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
-+
- #####################################
- # Test262 tests disabled on browser #
- #####################################
---
-2.31.1
-
-
diff --git a/srcpkgs/mozjs91/patches/012-fix-musl.patch b/srcpkgs/mozjs91/patches/012-fix-musl.patch
deleted file mode 100644
index 814912633217..000000000000
--- a/srcpkgs/mozjs91/patches/012-fix-musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 80ae97f2b875493c5714d00ae5c2a13efbd6e017
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:06:47 2022 +0100
-
- fix musl miscompilation
-
- https://github.com/void-linux/void-packages/issues/2598
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 77652f67..ab5e917b 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1069,7 +1069,7 @@ if test "$ac_cv_thread_keyword" = yes; then
- mips*-*)
- :
- ;;
-- *-android*|*-linuxandroid*)
-+ *-android*|*-linuxandroid*|*-musl*)
- :
- ;;
- *)
diff --git a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch b/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
deleted file mode 100644
index 93e8c83f9337..000000000000
--- a/srcpkgs/mozjs91/patches/013-disable-spidermonkey-jslint.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 34d8f3fb025e930450ce44f7aac501da4c2adc9c
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:09:42 2022 +0100
-
- disable spidermonkey jslint
-
-diff --git a/js/src/build/moz.build b/js/src/build/moz.build
-index 55c66b97..243f7db2 100644
---- a/js/src/build/moz.build
-+++ b/js/src/build/moz.build
-@@ -97,15 +97,3 @@ NO_EXPAND_LIBS = True
-
- DIST_INSTALL = True
-
--# Run SpiderMonkey style checker after linking the static library. This avoids
--# running the script for no-op builds.
--GeneratedFile(
-- "spidermonkey_checks",
-- script="/config/run_spidermonkey_checks.py",
-- inputs=[
-- "!%sjs_static.%s" % (CONFIG["LIB_PREFIX"], CONFIG["LIB_SUFFIX"]),
-- "/config/check_spidermonkey_style.py",
-- "/config/check_macroassembler_style.py",
-- "/config/check_js_opcode.py",
-- ],
--)
diff --git a/srcpkgs/mozjs91/patches/014-rust-target.patch b/srcpkgs/mozjs91/patches/014-rust-target.patch
deleted file mode 100644
index 4d8918a2a54c..000000000000
--- a/srcpkgs/mozjs91/patches/014-rust-target.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 34b3ac3195a40757bc5f51a1db5a47a4b18c68b5
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:13:38 2022 +0100
-
- bypass rust triplet checks and just force ours
-
-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index cd77d72b..0c03cab7 100644
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -261,7 +261,7 @@ def rust_supported_targets(rustc):
- data.setdefault(key, []).append(namespace(rust_target=t, target=info))
- return data
-
--
-+@imports("os")
- def detect_rustc_target(
- host_or_target, compiler_info, arm_target, rust_supported_targets
- ):
-@@ -383,7 +383,7 @@ def detect_rustc_target(
-
- return None
-
-- rustc_target = find_candidate(candidates)
-+ rustc_target = os.environ["RUST_TARGET"]
-
- if rustc_target is None:
- die("Don't know how to translate {} for rustc".format(host_or_target.alias))
diff --git a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch b/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
deleted file mode 100644
index e2b340cd060e..000000000000
--- a/srcpkgs/mozjs91/patches/015-drop-rustc-validation.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-drop some rust compiler validation
-
---- a/build/moz.configure/rust.configure
-+++ b/build/moz.configure/rust.configure
-@@ -91,9 +91,6 @@ def unwrap_rustup(prog, name):
- return unwrap
-
-
--rustc = unwrap_rustup(rustc, "rustc")
--cargo = unwrap_rustup(cargo, "cargo")
--
-
- set_config("CARGO", cargo)
- set_config("RUSTC", rustc)
-@@ -411,35 +408,6 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
-
- os.write(in_fd, ensure_binary(source))
- os.close(in_fd)
--
-- cmd = [
-- rustc,
-- "--crate-type",
-- "staticlib",
-- target_arg,
-- "-o",
-- out_path,
-- in_path,
-- ]
--
-- def failed():
-- die(
-- dedent(
-- """\
-- Cannot compile for {} with {}
-- The target may be unsupported, or you may not have
-- a rust std library for that target installed. Try:
--
-- rustup target add {}
-- """.format(
-- host_or_target.alias, rustc, rustc_target
-- )
-- )
-- )
--
-- check_cmd_output(*cmd, onerror=failed)
-- if not os.path.exists(out_path) or os.path.getsize(out_path) == 0:
-- failed()
- finally:
- os.remove(in_path)
- os.remove(out_path)
-@@ -462,29 +430,6 @@ def rust_host_triple(
- rustc_target = detect_rustc_target(
- host, compiler_info, arm_target, rust_supported_targets
- )
-- if rustc_target != rustc_host:
-- if host.alias == rustc_target:
-- configure_host = host.alias
-- else:
-- configure_host = "{}/{}".format(host.alias, rustc_target)
-- die(
-- dedent(
-- """\
-- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
--
-- You can solve this by:
-- * Set your configure host to match the rust compiler host by editing your
-- mozconfig and adding "ac_add_options --host={rustc}".
-- * Or, install the rust toolchain for {configure}, if supported, by running
-- "rustup default stable-{rustc_target}"
-- """.format(
-- rustc=rustc_host,
-- configure=configure_host,
-- rustc_target=rustc_target,
-- )
-- )
-- )
-- assert_rust_compile(host, rustc_target, rustc)
- return rustc_target
-
-
diff --git a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch b/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
deleted file mode 100644
index 24075c591ff4..000000000000
--- a/srcpkgs/mozjs91/patches/017-no-lto-readelf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 1cc729c5221d0ce4c80786ccdcb2de4a6ca382b6
-Author: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun Jan 23 21:55:43 2022 +0100
-
- drop some library checks
-
- This calls readelf and won't work with LTO'd setups.
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 401c2933..ade4f1da 100644
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -405,22 +405,6 @@ force-cargo-library-build:
- $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags)
-
- $(RUST_LIBRARY_FILE): force-cargo-library-build
--# When we are building in --enable-release mode; we add an additional check to confirm
--# that we are not importing any networking-related functions in rust code. This reduces
--# the chance of proxy bypasses originating from rust code.
--# The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
--# Sanitizers and sancov also fail because compiler-rt hooks network functions.
--ifndef MOZ_PROFILE_GENERATE
--ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
--ifndef MOZ_LTO_RUST_CROSS
--ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-- $(call py_action,check_binary,--target --networking $@)
--endif
--endif
--endif
--endif
--endif
-
- force-cargo-library-check:
- $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
diff --git a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch b/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
deleted file mode 100644
index 4a9b0b42a575..000000000000
--- a/srcpkgs/mozjs91/patches/MOZ_NO_RUST_LTO.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -64,6 +64,7 @@ endif
- # These flags are passed via `cargo rustc` and only apply to the final rustc
- # invocation (i.e., only the top-level crate, not its dependencies).
- cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
-+ifneq (1,$(MOZ_NO_RUST_LTO))
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
-@@ -77,6 +78,7 @@ RUSTFLAGS += -Cembed-bitcode=yes
- endif
- endif
- endif
-+endif
-
- ifdef CARGO_INCREMENTAL
- export CARGO_INCREMENTAL
diff --git a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch b/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
deleted file mode 100644
index 066330731e5e..000000000000
--- a/srcpkgs/mozjs91/patches/fix-build-ppc32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 32e52128ce8fe7704a29a5a4fb921a8394540fbc
-Author: q66 <daniel@octaforge.org>
-Date: Mon Jun 13 14:01:59 2022 +0200
-
- fix ftbfs on powerpc32
-
-diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h
-index 85f2612d..df5c9629 100644
---- a/js/src/wasm/WasmFrame.h
-+++ b/js/src/wasm/WasmFrame.h
-@@ -230,7 +230,7 @@ class DebugFrame {
- // Avoid -Wunused-private-field warnings.
- protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
-- defined(JS_CODEGEN_X86) || defined(__wasi__)
-+ defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(__powerpc__) && !defined(__powerpc64__))
- // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only
- // 4-byte aligned, so we add another word to get up to 8-byte
- // alignment.
diff --git a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch b/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
deleted file mode 100644
index 831e5e03678d..000000000000
--- a/srcpkgs/mozjs91/patches/fix-i386-fdlibm.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# error: typedef redefinition with different types ('__double_t' (aka 'double') vs 'long double')
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
-
---- a/modules/fdlibm/src/math_private.h
-+++ b/modules/fdlibm/src/math_private.h
-@@ -30,7 +30,12 @@
- * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
- */
-
-+#if defined(__linux__) && defined(__i386__)
-+// rely on glibc's double_t
-+typedef long double __double_t;
-+#else
- typedef double __double_t;
-+#endif
- typedef __double_t double_t;
-
- /*
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..c2370c02a7f7 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,98 +1,13 @@
-# Template file for 'mozjs91'
+# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
-build_wrksrc=js/src
-build_style=gnu-configure
-build_helper=rust
-make_check_target=check-jit-test
-configure_args="--disable-jemalloc --disable-strip --disable-tests \
- --disable-optimize --disable-debug --enable-ctypes --enable-readline \
- --enable-shared-js --enable-system-ffi --with-intl-api --with-system-icu \
- --with-system-nspr --with-system-zlib --enable-hardening --enable-release"
-hostmakedepends="make pkg-config python3 python3-setuptools python3-six perl m4
- rust cargo llvm12 clang"
-makedepends="icu-devel libffi-devel nspr-devel python3-devel readline-devel
- zlib-devel rust-std"
-checkdepends=python3
-short_desc="SpiderMonkey JavaScript interpreter and library (91.x)"
+revision=3
+build_style=meta
+short_desc="Mozilla JavaScript interpreter and library (91.x series) (removed package)"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="MPL-2.0"
+license="metapackage"
homepage="https://spidermonkey.dev"
-distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=57494a445e72f7eacb0bb870a3a79cde3c2143e234873c0c3e269df1d4742c92
-
-LDFLAGS="-Wl,-z,stack-size=1048576"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- # Disable LTO on i686, otherwise compilation of `jsrust` fails with -
- # error: ran out of registers during register allocation
- # LLVM ERROR: Cannot emit physreg copy instruction
- # error: could not compile `jsrust` due to previous error
- export MOZ_NO_RUST_LTO=1
-fi
-
-pre_configure() {
- if [ "$CROSS_BUILD" ]; then
- configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} --enable-linker=bfd"
- fi
- export M4=m4
- export AWK=awk
- export AC_MACRODIR=../../build/autoconf
- chmod 0755 ../../build/autoconf/autoconf.sh
- sh ../../build/autoconf/autoconf.sh configure.in > configure
- chmod 0755 configure
-}
-
-post_install() {
- # Remove unneeded static library
- rm -f "${DESTDIR}"/usr/lib/*.ajs
-
- # it has correct soname but not the right file name
- mv "${DESTDIR}"/usr/lib/libmozjs-91.so \
- "${DESTDIR}"/usr/lib/libmozjs-91.so.0
- ln -rs "${DESTDIR}"/usr/lib/libmozjs-91.so.0 \
- "${DESTDIR}"/usr/lib/libmozjs-91.so
-}
-
-pre_check() {
- if [ "$XBPS_WORDSIZE" = 32 ]; then
- vsed -i jit-test/tests/basic/bug653153.js -e s/65536/65568/g
- vsed -i jit-test/tests/basic/bug653153.js -e s/65537/65569/g
- fi
- if [ "$XBPS_TARGET_MACHINE" = i686 ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x basic/fdlibm-for-sin-cos-tan-argument.js \
- -x gc/gcparam.js \
- -x ion/dce-with-rinstructions.js \
- -x sunspider/check-3d-cube.js \
- -x sunspider/check-3d-raytrace.js \
- -x sunspider/check-access-nbody.js \
- -x wasm/nan-semantics.js \
- -x wasm/spec/spec/float_literals.wast.js \
- -x wasm/spec/spec/float_memory.wast.js \
- -x wasm/spec/threads/float_memory.wast.js \
- "
- fi
- if [ "$XBPS_LIBC" = musl ]; then
- export JITTEST_EXTRA_ARGS="${JITTEST_EXTRA_ARGS} \
- -x sunspider/check-date-format-tofte.js \
- "
- fi
-}
mozjs91-devel_package() {
- depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin/js91-config
- vmove usr/include
- vmove "usr/lib/*.so"
- vmove usr/lib/pkgconfig
- }
+ build_style=meta
}
From accba526a0e3dd57152b2711b9067d331a9ebe0f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/111] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3d4c5f1db8a1e6a8718c8001d60d09a395d4705b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/111] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 652c942451e77aef41dc966ed1b6270456988c61 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/111] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 97815e1e941fd3b0e5d935f988a23f2ad9135779 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/111] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 9c2b58522c6939de181c65e65b3d3f69989606f3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/111] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 42294f8644205bdcabc78906c6c8309b5604c1c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/111] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 7705ba8aaec95d79e97c54ce0dc5715dffdb7a35 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/111] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 525f7f773a0404f339f0a5402008fcfed24f3281 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/111] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 43382a074c6a2eeab1334816121dd98424f4069b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/111] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 2064010820609021d34629010d51877d6df9e4a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/111] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From cc5ced440fa7832c7e3f2ce157f67c476e1226af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/111] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 170e2db78d19894ec388e9a6592d2b916f7c2d00 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/111] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 360ae50a43db4d31aaeff4edc1d79dd32fb7e008 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/111] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 2437eac644dbe540228c63bdfc15bcdb1cd19d1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/111] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 058b639f764c07620820da125331505ebe6c577e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/111] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..2465feae3834 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
From 4b5e0eb9f328a8c63de6b24ce099f7b7d39a8c6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/111] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 0293957b594cbdbbf43caa359090747dde53299b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/111] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 23f7738567c4c126f99b6688678e3f6c1ec82ad3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/111] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 4dcfbbc1c1f208a3ba8660561759a1ad72370e58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/111] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From b1511ca099bc4cf7a7bff373990ae4c91866e34a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/111] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 53d5da64de187454760b9d6325d86f34e19c65f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/111] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 0f91dc835c53dcea720ef78c947e232af7509ba1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/111] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From b485d5fdf02593c85b2d8d81d0982a7571310444 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/111] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 6175d840ed106d97e2b9be21169671f6fd6bfa67 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/111] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 1b00df0fee42894e32314c885dcc488c61096dd3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/111] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 9e9c6a328c74a230e52e569e40f2829beeae84c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/111] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 62bafef7123f62ae0564e0a3728bd8a7048a9b98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/111] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 55d6b6bd028ef8d7a7ea2b2567eafb615c323dd2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/111] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (9 preceding siblings ...)
2022-12-26 9:19 ` oreo639
@ 2022-12-26 11:47 ` oreo639
2022-12-26 21:42 ` oreo639
` (35 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 11:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5917 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 84776 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/111] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/111] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/111] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/111] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/111] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/111] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/111] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/111] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/111] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/111] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/111] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/111] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/111] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/111] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/111] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/111] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/111] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/111] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/111] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/111] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/111] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/111] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/111] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/111] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/111] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/111] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/111] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/111] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/111] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/111] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/111] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/111] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/111] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/111] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/111] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/111] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/111] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/111] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/111] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/111] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/111] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/111] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/111] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/111] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/111] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/111] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/111] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/111] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/111] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/111] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/111] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/111] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/111] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/111] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/111] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/111] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/111] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/111] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/111] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/111] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/111] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/111] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/111] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/111] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/111] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/111] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/111] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/111] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/111] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/111] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/111] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/111] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/111] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/111] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/111] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/111] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/111] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/111] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/111] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/111] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/111] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/111] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 44ad2b9cad22faf59fde332f6fe067acdbe8941a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/111] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 88fca40cef27e75353568d90f6c1c3a0731f28df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/111] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From d440cb88cd0a1e09cff28e2e971fe72e872aa423 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/111] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 511b7a7509482abfcf849437f7360b746c0a7681 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/111] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 6f8347085e1a584e8632e1931fef838184e66ff1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/111] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 9612acf67316fb3588f8c10d28e45b4411014c92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/111] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 080510dc7de355c199d2cabbd0a9063d7dfde838 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/111] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 65a7acb7512073806a75930b9310eb5d501bd663 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/111] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 68f95893ebdbb3ea66a3ed3763b957ac16f265df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/111] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From a69cfce1f0392f909b025e8d651d2a579573dfb1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/111] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 09f2b726d7cb33b90be645c8619b90e77771eb60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/111] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From c99461e022616f255d040f1f3dfba9caf5d1df53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/111] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 4ecdbde8fa4a1158336f1ab4db9ba6f383db2811 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/111] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From b5590e905d6d455ab81ad70bcb9c3ae2ae9d09bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/111] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From e7b0c076785018951bc29b8c94cccee232a4c022 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/111] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 6152919cef35e9c7325afc479942b3f7c5e1dc2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/111] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..2465feae3834 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
From 672e61778569a546efbb5146dfc1b939d9ca84a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/111] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 56e8bda6ec75df6973ee32ba85a02e158c7fed8c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/111] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 8092f6610d4e96e46ae8810eac0a02742be59ee8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/111] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 8c283478c9775031f2e507c4c814da8612539b60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/111] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 19c89299f575543ef2da5781ff761e56e875bb74 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/111] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 20a227760782d59695e9a17a58f9a9b70e96c994 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/111] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From a829f816e21cfc627e6c38ae8b6545fdcd93ae40 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/111] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 87ccb3c0f90998134421cd28163bc16a0bc15a65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/111] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From fce69c31a3daaa84759d6a5fcb2b4207f3daedfe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/111] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From f5bf90d11dd037552d9615df42bfd95d57ffbd0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/111] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From ace31034427bb132c31c82ce87573883c8517d37 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/111] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From bd53e378bd2efd413990ffe003b28fe0b88594be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/111] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From a36d7e10b08bc3e93378aef6661b55c721f68929 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/111] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (10 preceding siblings ...)
2022-12-26 11:47 ` oreo639
@ 2022-12-26 21:42 ` oreo639
2022-12-26 23:30 ` oreo639
` (34 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 21:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5917 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
libssp conflicts with glibc's built-in implementation of ssp and applications should be using the implementation provided in the libc rather than the fallback implementation provided by gcc.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [ ] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 85606 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9baec961e340ab388d0f0a29b754b0b960d19849 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..9c0e2a1b7b08 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
From 00e8196457d5a009db7677a4616e91ac0e919123 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 2c04a66bbf459419cb993f6020f6ec38de481bdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 4f80de942b3b9f80c55796af969ae86883c9f12a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From faa210fce86c547524619f416d7a00c146ee87f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 9b9d7da01205d8bd96ec284e2108e6f87e1910ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 59b753bb8411f1da9121cb0d294f57364b6dbfc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From d8ba5f8668eb4910313a1919e93c11a88652ab3d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From a5e93a7f14ce181539ebc738b4bf1fb15fea75db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From b3799d0a32e3a5ca2ba0bad1d0bc2d62e3b2c0ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 822ae5ffeeb9dc4345358e12a141228e45a79719 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 9b0977ce241e9ac4deb2752dbf7c59955053ed58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 311f6c6c0660675e59f92e0b25d43257f8a76a6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 3b0eb63e3e028b1e2d0b601c3783b474f3a6cdbb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 3cc414485f908f099ad91f7d651a5e01017f4592 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 5276fbaec2ff90e3242345988f16f7331d393673 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From e304e4c8f572c90241069b352160ce348313a554 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From b2cfbb5fec91506c1a1e08c39b31b41bc91e559c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 0bf4bc4bcf685c20f3f92c8929fdb19dca5b04a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From fc0ac4db9147280560ccdd4684f1050bd7a33b29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cd99cd2c681d2529a9fc4084c8d680e58180dc20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f86aa1da23ea4f948ad4474c0e1f28f98cb19a3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 178b85ec3d1c79494c2e6008a385f5588015f3e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 49558c3e63fdcba3c7a9c03f283a9135a25f0edd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From f6aa3e9bf99c2fb9ab4679db147ad5c5ab74913f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From ac45b180095ee5f99e55195a84aa8cc66a1e3c7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 83ba3d6a6c4f67c00840e7ace9c5359cabce99cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ca14c230e2a75ef17b1effbefe976be1b1d67ded Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 44bd88d758a7f31237ce0b9ae931b94849b72cdd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b63d91b0826860d4dc8860aafffdb55bf2d06ed5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a65acaf0cc367b10499170fef5ac517d2b20dd06 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 6d1bf24917fea4b5fe12834ecb5d430085c9252c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 6a3559c2c5dd09feef0669b7e893043f802b9e5a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a4a34e24305873ac1cba624c05a9bdc2fa43477f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 01f6ebe5e6368c064444b7e1ba55aa2b076989a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5c836f44f049b565136f76e664f201935835d2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 44ad2b9cad22faf59fde332f6fe067acdbe8941a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 88fca40cef27e75353568d90f6c1c3a0731f28df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From d440cb88cd0a1e09cff28e2e971fe72e872aa423 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 511b7a7509482abfcf849437f7360b746c0a7681 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 6f8347085e1a584e8632e1931fef838184e66ff1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 9612acf67316fb3588f8c10d28e45b4411014c92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 080510dc7de355c199d2cabbd0a9063d7dfde838 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 65a7acb7512073806a75930b9310eb5d501bd663 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 68f95893ebdbb3ea66a3ed3763b957ac16f265df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From a69cfce1f0392f909b025e8d651d2a579573dfb1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 09f2b726d7cb33b90be645c8619b90e77771eb60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From c99461e022616f255d040f1f3dfba9caf5d1df53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 4ecdbde8fa4a1158336f1ab4db9ba6f383db2811 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From b5590e905d6d455ab81ad70bcb9c3ae2ae9d09bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From e7b0c076785018951bc29b8c94cccee232a4c022 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 6152919cef35e9c7325afc479942b3f7c5e1dc2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..2465feae3834 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
From 672e61778569a546efbb5146dfc1b939d9ca84a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 56e8bda6ec75df6973ee32ba85a02e158c7fed8c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 8092f6610d4e96e46ae8810eac0a02742be59ee8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 8c283478c9775031f2e507c4c814da8612539b60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 19c89299f575543ef2da5781ff761e56e875bb74 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 20a227760782d59695e9a17a58f9a9b70e96c994 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From a829f816e21cfc627e6c38ae8b6545fdcd93ae40 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 87ccb3c0f90998134421cd28163bc16a0bc15a65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From fce69c31a3daaa84759d6a5fcb2b4207f3daedfe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From f5bf90d11dd037552d9615df42bfd95d57ffbd0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From ace31034427bb132c31c82ce87573883c8517d37 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From bd53e378bd2efd413990ffe003b28fe0b88594be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From a36d7e10b08bc3e93378aef6661b55c721f68929 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From 37811d7384fc0f44bc308c77a9fd69e2c6efc1fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (11 preceding siblings ...)
2022-12-26 21:42 ` oreo639
@ 2022-12-26 23:30 ` oreo639
2022-12-27 1:53 ` oreo639
` (33 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-26 23:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6522 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 86047 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7125bebef7368408f8618cdcbe515f2965787e1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 6e2133af3c718e11cf0a9ae5daa1b3e61e860b04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 407e60a8dea39f1ddb02145be99402d275356f8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From ca247b45543a9031c2a5ea62cb441bbfa3742ed0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From bcfdf509f56321e9ef24224a9ebac21626400378 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 768cbe6c90aaec0845ee9a4e22d338eb989724b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 95a9cddd6518f4185776485b49a1c290b1ed3a9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 881966e47cab9017842b14d275caee07d0e64459 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 132689b1351ef2ae2150a9b3e3ec5a64b2697239 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From e07c6dd22e7b6363e19c9d3104687eeac327bf1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From bac0bbb5f1fa652d78c5982a854289ba8ededc72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From e205888f72423a7668ce07e81c9d9b98a99026e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From d848887f875db35132e0e680e3c3707882cdb2aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From f5f4802485d4604e4396ddade483ddcd1b770794 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 76b0b55dc8985517bb7023b3e93c1fad0420fcb2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 05f129ba560b6dc713953a68bd9a33d0ed1163fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 14aee492718911c41e26dd87f60fd725b71c80ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 9c8130651088046290905202a91e2c4b832eb13b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 457609ffd2a3270b11c1cffff903d30f0c150c2d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..3fb7885a0959 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
From b9d2a76349f51e7bde0cf42dd745e3099fc791e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From ef1f1167a6e44b0dfb06cc54ab669ad3dd2c5f38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 28f55c2a859254db2089a92eb67457e8e293e51b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 79c061befcb9546a72e9d29c578f290740c87761 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 5b0bbf0c9d8910a8a060197bc6301ac465dd0cdb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 82c17d2cc2a53ad01669a8b3e166507274b3f032 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 9d064ba848d0c1326a9a8c3921400ace25879105 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From da7173120982f438d0ed80db3870bd44a7862edf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 579dada6370a702264d67bed99ff64e01f0c9d02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From f2527d9b41bd8c9cf4e522605b5dab1fb27347dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 8aa915ca4446c00945370bd7744577b0ad5233d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From c701d77bb2c0aad8f78673d0e8967f8f602d81f0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 22e66392801eada07b790caec14ab93e6919691d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 9dbb5b76b3509365231a3dc3dae520b74f0b2bbd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From a3be150a43c5c5cdec9e356c469f1d80cf810fc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 4660ad12e6b3864b0131da4a607682b789dd5eca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From bceee2937c282bee577541a930f0ce5245cd82c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 7b4f42b41afd21dfa3c943976a9c337ddfb16a7b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 4ba3c98ab9e5077dd324fe6286e8729ea498354e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 275befc3a76f610c6e2a86d0370b00f7778fdf45 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 6594569790b0dc05cf1d7063842b7b992e14bf75 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 89c4d3a508535ce61ced75e0b3da239e199536ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 01b2628ab437ccb2b9b1afcb7732a1bf7f593949 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 43d14926a6341d1519fb9832d4101e63b43a4295 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d7c1cdbf0dfede99dbacc7a86a872fa91854c311 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From b344ae89703c112c58074a433b04c1d077163478 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6cae133d14e333dfbc1881729ad00bc4f4961637 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From c0e27f2ac467fed4cd0e44e6b4e69861dc4f5427 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 1947175f76203f56a1438733a6a239eaf0a7b7e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From d434b96a1fe2a9eda85e7f07c45ba2786ec0e2a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From a08a2dad45e85a033e8eff22d7d25dc3aa12830c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 88bf0cdcbe5d712a31a9c4a72c24333e7a960110 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From f31d1728379b687a82d0b2d1ee70bc2f382e8d6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..2465feae3834 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
From 0b042bfac773dca1d0dfb1e441fb8a2651616c2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From aae597bdd963b30e96326497c13679230f2ed97d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From bcaec33f5d1170ba4409ec8edb4435e86134d0b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 3e9e4e5e546bd1e9f521189b0fe013d30af83f99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From da767da189680f47516e9132029c9a9fc3324743 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 98739fd30aef7515cef3eccea62ca66fd4fc1e54 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From a32cf656a7e36bcf38dcef5fa95fbab019075b3b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 9fc9123dffbf9f1c4313daa533dfdfde9ce5c312 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From fbf9273d86f76c43dd41670438950424c45d355a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 95d953f6c811b9d9e60bc1857868c01e591c2d5d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 9f5cc4b5979fc2419c557d9f0715a1c2ab7ed4c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 29cf44d5b8dd1dc3d55aa492bf4d61435437a779 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 3213a2222f259da6823ed050a4f64cf063ce4720 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From 26cdfee22c1a63e3a4c0974a2c95dd03fafafa51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (12 preceding siblings ...)
2022-12-26 23:30 ` oreo639
@ 2022-12-27 1:53 ` oreo639
2022-12-27 5:18 ` oreo639
` (32 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6522 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 86270 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7125bebef7368408f8618cdcbe515f2965787e1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 6e2133af3c718e11cf0a9ae5daa1b3e61e860b04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 407e60a8dea39f1ddb02145be99402d275356f8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From ca247b45543a9031c2a5ea62cb441bbfa3742ed0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From bcfdf509f56321e9ef24224a9ebac21626400378 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 768cbe6c90aaec0845ee9a4e22d338eb989724b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 95a9cddd6518f4185776485b49a1c290b1ed3a9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 881966e47cab9017842b14d275caee07d0e64459 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 132689b1351ef2ae2150a9b3e3ec5a64b2697239 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From e07c6dd22e7b6363e19c9d3104687eeac327bf1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From bac0bbb5f1fa652d78c5982a854289ba8ededc72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From e205888f72423a7668ce07e81c9d9b98a99026e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From d848887f875db35132e0e680e3c3707882cdb2aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From f5f4802485d4604e4396ddade483ddcd1b770794 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 76b0b55dc8985517bb7023b3e93c1fad0420fcb2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 05f129ba560b6dc713953a68bd9a33d0ed1163fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 14aee492718911c41e26dd87f60fd725b71c80ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 9c8130651088046290905202a91e2c4b832eb13b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From ac80e4c7a38d8b0699716c2dcd15bd05032449b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From d0da3b7e5e59a4288d656b40d00c02ac677147bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From 9e1dc4cb72d126914e5f9c7ffa20ecc6c496117a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From b322d4bc4b5e833ff1ebc4f2e41ea992ca1c06e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 632d40cb5fed1bddf8280f23571ba93e581ea8e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From faba685b1c1c13f181b2866459867be9f644dc12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 7b5f824799878c944f2f69c050cf973811f6b8cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From d7888bd76e76e1c81d34bdc6fb022c26516ab9b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 33367f989290b9070c163cd85688f5287ae863b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 952a7b98c6db1097f8b5eca76207a2737e9ea661 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 8c462991275cf2e71967619fe0af58b11b2daacb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 07cd49537b8407f303f21b3efb022ef1ffecfd58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a3f5b2d5e1cb2e6a50782ac88a4f1540314531ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From fdc4877ab651757fedaefc93a0dad14ea5d4058f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 3af2bcc2ae31768811417bdae508b30c972f83a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 7f44038df37caa37a4deb98124f695a3f3a7d593 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From ed0930cff2fddff8c14871832c6ddea08ebddc86 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 56751c32e951fa1a16bc8ae4a9536b799ab6b4fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 5afcbfbe26e2555aa16fb1c3dce8b3357f30d70d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 400cabbacb38da3ca6f8fb31746ca633d22530a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 315fe544e5090b2680411c3304660b9f435cdf51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From f2ba244b35aa16a0abf4a87b55c31a3e3ac9a488 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 9d7b571a1fb69c168c274cc93953232022cd2450 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 0f43304b0e84e34932b83953d4229d8335fd17a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 6c5d02a95a22ec6b110de790bbfa08468c3e7741 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d5c2db87494f04621920006da2cb0a9407245d6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 58940a2586be3d109f2346593fb06b1a73f6c463 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 613b119270790345a32ec814e0f13490919ac76e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 7ee10787236296ee5936aba4c6042d46ad373919 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From cd2fb7c26eee38ba80544c7349da9cef17f977b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 74342126d05ecca73da406c0c512ddd1c65a3b0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From f7aa7cd12e41cc60bdbe6fa311bdd3a49076ee9b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From d8f701164b1ad189548d21d2946f50618a607cb0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 114494087e1d2b9c3fd140fcb68b85d6c25cf561 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..2465feae3834 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
From 13286eac0594b4e41515540c8033f41931cf824f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From c852fff065cf6fd876499dc8896be6bc408382d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 56eca38fd25df9917776d8b9ff15977a6020a2c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 7eddc8b07cb858783dc800a12af331ff37315ea6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From d453b0e005f8dd11eeee858a6b8dda6a7ea4a4b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From e08b5c7b09793c792449457df3c144c3de1dfc50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 27ca3855b0da7d44e7ee7ce752f4d9f49fdbcc96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From ecff71be34948c9c136a7103e8f4f9af4791e2e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From b09083577aa3effe3b54d5da5b13224b2b58e6dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 8be1d3e809e2fc6c153fda1cb386d5c520a83dce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From d5a2790014a97111ec13da147090d50b806a19d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 2bab4cc66d195ca418f10e230a36d08c4406633f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From c38e0bdc448c56ec74e916518a601ec8f5609436 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From 7b30479d3ea4da6f67aeafa7d3c24b0356be2387 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (13 preceding siblings ...)
2022-12-27 1:53 ` oreo639
@ 2022-12-27 5:18 ` oreo639
2022-12-27 7:10 ` oreo639
` (31 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6522 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99903 bytes --]
From 10833270f332634937b10e9b256af33cf05ac04a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From cb9eb7dd1053241c1f77b34bf74df0aecb5908a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 84ef51b57ee35c2e91c6839dd99d5c9fcc1863c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 990da99baa87897e4d40ba1c55e92c31a718b435 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 2734a9c7e3a35eb54a793d5186a2da42f700bacd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6fbbcbc87befc8e594ebd50a809efb78b06c9dc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 90bb76b73847513f0be3e102bc3872ee241c8776 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8897663067f5e0c88847a350b46a4a72eedb05f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8412958359a9d9de03670cc680ed2193389596aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 830b5a0479a8a1e0ba3b0f87fa1948afc2e4632d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From fbcee6679e3ef6b1a356aede495f1aa34ee431e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 025fac37d0083622e7f6d8f7a080ae481fec62bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From f8676ec43a299bf46705ca3f2f811f2bab1ee961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e22437d750af40ba48d50f6d6c46dcef9e794e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e621b2a4d044f66b8a4fccf6243a2b42a23644ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 998051db328bfce3d6ac0c947005d887412e3ffd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 8029bc9801d3387f280b3826ad05135645ffa4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 999b75f9c10cdddc5efec0357ea7e95adf8b7a89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From e80ab37c7ba42bf36a23cc6973a7d47c1db0cbb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From cf855faecbba3c3248e734d0cf5cd1c73b12e35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From cd5dbc7572c325625f5a94cf7be29833c5e831d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From c0bd1b60611274ad907c3b92703d45249ef9b267 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 35f4773a07289b79404bf91b19bccc5aeaff2fe6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 73a2d6c89a0853e4596f28821a14001131a21b55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From fb48a91b2b1c00f7d70172bbe29d9f602856c654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 346421866af107374d998803906ae15929d2f035 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b583282af2876480262ca04e0933d9ffe3cd5326 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0dbfc3372a1985c405b504547ae16e4b46c88fa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 7bf030163ab8fa4177fe945fe58cc68dc286a9a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From d084933c6fe18a89fa33fd86681a1752f8c329bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 7a228d9dda6aa81e37303624f17ae0d87061b6ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2b11bacc25b5f77e986631b5e35d4c95bf9eb3b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ac7ce3c0293f2cfe38d38af377206deae7d49ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9fdb648e5aeae95eba2ba1042e02c4230a17b895 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 60fa246b964a1b5d4aeb8433efc2841b728622e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 386f936eb27f72a7e7d16f8d3135235cb86d21c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From ce54960900a7fe78ed8a91f5e0842f07a565c162 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ea2fabfad2658f5e8310d95d65ccf9f114f1a02e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 7c8c167be4b3..6b2b97a5ef65 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From f7ddf9b23ba419eba9441353c1c410aaf234a477 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 08216759465472669b9e9f5f951e40a0e468a769 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 412473eb106be0ddda981f310f6fa1728680bb0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 9c4f0ef46e6ca0454295eab6322fb9626b6cc539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 15b607eeca6ff1a600f857feb46530e749be4aab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 810d33e3a09d9c00760ca4d49b102fc97709550b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f93a480d38062f011d8fdfe7cb480f3c9297981b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From b9add49954c365c011b5b2c2174f526afb9b3745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7125bebef7368408f8618cdcbe515f2965787e1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 6e2133af3c718e11cf0a9ae5daa1b3e61e860b04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 407e60a8dea39f1ddb02145be99402d275356f8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From ca247b45543a9031c2a5ea62cb441bbfa3742ed0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From bcfdf509f56321e9ef24224a9ebac21626400378 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 768cbe6c90aaec0845ee9a4e22d338eb989724b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 95a9cddd6518f4185776485b49a1c290b1ed3a9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 881966e47cab9017842b14d275caee07d0e64459 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 132689b1351ef2ae2150a9b3e3ec5a64b2697239 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From e07c6dd22e7b6363e19c9d3104687eeac327bf1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From bac0bbb5f1fa652d78c5982a854289ba8ededc72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From e205888f72423a7668ce07e81c9d9b98a99026e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From d848887f875db35132e0e680e3c3707882cdb2aa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From f5f4802485d4604e4396ddade483ddcd1b770794 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 76b0b55dc8985517bb7023b3e93c1fad0420fcb2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 05f129ba560b6dc713953a68bd9a33d0ed1163fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 14aee492718911c41e26dd87f60fd725b71c80ff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 9c8130651088046290905202a91e2c4b832eb13b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From ac80e4c7a38d8b0699716c2dcd15bd05032449b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From d0da3b7e5e59a4288d656b40d00c02ac677147bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From 9e1dc4cb72d126914e5f9c7ffa20ecc6c496117a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From b322d4bc4b5e833ff1ebc4f2e41ea992ca1c06e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 632d40cb5fed1bddf8280f23571ba93e581ea8e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From faba685b1c1c13f181b2866459867be9f644dc12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 7b5f824799878c944f2f69c050cf973811f6b8cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From d7888bd76e76e1c81d34bdc6fb022c26516ab9b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 33367f989290b9070c163cd85688f5287ae863b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 952a7b98c6db1097f8b5eca76207a2737e9ea661 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 8c462991275cf2e71967619fe0af58b11b2daacb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 07cd49537b8407f303f21b3efb022ef1ffecfd58 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a3f5b2d5e1cb2e6a50782ac88a4f1540314531ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From fdc4877ab651757fedaefc93a0dad14ea5d4058f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 3af2bcc2ae31768811417bdae508b30c972f83a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 7f44038df37caa37a4deb98124f695a3f3a7d593 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From efef0a05c0dfddbbefb9ae8badae0dfe2b893431 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 39689dd50893beb1961f3015844c1495fd2d77a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 9c80cb8a4a35cd8bf0f83deef6e935c763932dd9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 27c845a691b552a9e26e1e4ba1ee8225ad793b53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8dd5a158d6eb7544a53772783a20178dc1ed40eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 1bdf764270793ea1673c6912b763625e58b20641 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 8597cbb1fbcefee93a01029e4e2d934ff95b2995 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From e78265481f7b15ae9a0f39b78c15efb1aa18ea29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From c146959bde9644821d950d4d85a8a89aec0ad919 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 7c71a2554a3d76c51e2a300b84910bb6bc9376c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 597f38148ad22ae38b93cfaef4efb58a6ea82369 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From ef974fbbda3c09e5ead075f26f1410fd0dac4365 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From bcc255bd6b25e1f90aecdfed48d6a65ecb252996 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 997ccba0d1615b34009723de4ce3a1d21d7076f0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 8d3b94614d4c0c7ca1a601ab11fcad9a08b67c55 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 7a5b60f9e321f6f12197b622c61f0b954a0984a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 89b75301de740e174c418374eb46d5186e656338 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From a0aded47fe4fe5306283df5f9e5bc1c12f7fc25d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 272d60b73ad8aa0394865646b30d6d5b3c78e4c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 43608861f576feaeffd076743397a99ed4603b2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 6b4efbacb3c54417400ad6bea4f812f1cb06ddca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 8e302f00768a87e362dafcf92acf00253986f975 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 3144d79b504f1e575fd8c247de944ae4a275cd71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 69181550b6471ddc60545a9ce418d3575f45d599 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 04097b220e6134127876b9f375c9940cede7f720 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 42dabcef12bd94506dcf09986498a3cf96be616c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 8239a79ff9193aeedb6d936ca8aa02a1950684a5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 9507cbb81e08b7142435849017757225b1fa2cb7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From e67b3eff50358ffa5d302e55bb6d41746f6afd97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 6fa1489a764ed1eee636f47e4e5ca6b4a635680a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 93a87a26b3f631f7f775dfd744bdd5f407a3bc44 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From 5fe98039b659873fc30d921df9f8940f3b75bfc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (14 preceding siblings ...)
2022-12-27 5:18 ` oreo639
@ 2022-12-27 7:10 ` oreo639
2022-12-27 8:40 ` oreo639
` (30 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 7:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6522 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99903 bytes --]
From 38da49122678aeaf175762d72a8af6f7881ff563 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From 0929b2cf05fe2930516350331a43105cebe8ddbe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..aae1190c7016 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 3229ac0faaecdcbb541ac2ff2c49c0a054fd4fe2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 425905311e6dbebeeecfa5d3bdb0d9b98818f7b9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 8cbbd490902ad9b6861b603b9ef3645c299ed02a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cfc0ad16b64a1ab3e855b5943e7ebe44902e3d25 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ad76c485cc5c9b682e4e98278222bb2a46823119 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cc9a48068f2afe28d0b6a9110f8bdb27aaf841bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 46e55fc36d3585941f3415f49db4a01e9af9125f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From be038cceb6c543631be389c39340fb9509f41794 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From c20a3a30111b0436ab08974d2609613f37e22c0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From ee070aac3b759409ffbf980d8fb1de249af4c7b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 04d98a2f9a0fbecfb5a608fb2f53ca50f2e0d163 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 8bc5f63c0f7602236c66c75be98df48e4849da2f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 87296aab4ecaa8fb1364487d652f090be7fcb4c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 7bbcb62ae9d82f07d083755d808c3b8952498143 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c7d9b105b58eb9689afa77567eac7b71f1bc6449 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 0b5779c34e712c5732f9a2921a00e07e6f2d76b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From bf8526ce6e67eb28fd47a71f9c740f81d063ab52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From ea0ea41fdbf3ff8a11a61e0adbfc2e3ebef24128 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a3ceb096bb03caac76bb8d97792f4efb72874ee2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 93404f71b7be1e03aa16789ff8042dd342aab475 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 4a938766f623b03edab31c75839bd37b14e1552a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 39288465451f3ae641f290167d3aa8d694cc8b85 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From a8b31470cbd765fba25b2e8317f74b7c29446bb7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 3410a62c44aea6cbbb20401ec691fd8bfca07f09 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From b42d0719bd3ea32add8b8965966e868ae456dfc5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From dc4de0cf68fb779e8920585a974c78260f3b7b7f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 12b1964d36034f1b0edf3bb5de6b4167ac6eac04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 583d1fdd25a39aaee00e5c4279d9dff49611997b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From a4359501715209f6829fb94cd4f9e39c2210a929 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 7a9f22360a39f3b82f9ef04e7c76c9a6fc80cadb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 992c054394fb29e4659313864d76cf7610001ae4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From a05c717a7d64c17f4c3683811e8f5faae1b6ac0d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 8500741bb57d115d23fb7865ed9f3fb4dc13147e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 2adc8b5c2c186c14b142f999a821131759b778c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 9d9db0efaf1c3c98979ee1cc4f064264ee3280ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 9656fe729c91b341cf93164e00dc002e32f5eeff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 0c1e2b117a84bac7a0608b3b2308245b72c23233 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From e5f9771ad596b1d468182e71564e09c98789c1e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 46671e3bac4a606c936ef88bd67344ad4d53e589 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From dc886fa8c5daebbe65da1ddfdb99f1726fe7ece8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From b918529b7089d244197ee395de28598928b233ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From d860669111680143bf5d7bfe0fbb59bb94c8d2b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From fd01a71641d7c6e250a239c27fd432cd55b16730 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From 3b29312a233e1d8cdfdce76332e32bc217b0db3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 0166e3cfb4ea953ec744f6adf1386888d460a30e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 1f53fc8edfbaa62a1beaed2b12d96b4051875b76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 47f4e65de31a788385e2e7d511a6ce0e0863bcdc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From e02dc734cc78774c691dd039c809e280a584d906 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 0a4a080c699f88a65d25c3817e52706afb2478c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 09361bb146bb695e617aceef9ce824018bac54c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From f0c523b2f99efa2d1528834d07763260729b7183 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From ad8fd757ee9915efbd3c715cc9a56a7dc44628ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From f0790e793f6532096eed2e2ab10139bb081251d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From fff3f6b2f5d979e1bd4259c88b0364b7d91e2be3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 20ad38e70e6c599d3fa4fd4e04a8ccf5be339c77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 862f2e7142cf9e581016b8166c23ae82e73fe5c4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 64625fcbf97c4bda0dc7dfd3f63681bbd638220c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From bade7f12ed269baa917dc0a9fd3f023f4a4b44f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From d46bf60a87b010e7f411320381da75f3c1d5b801 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 2cf696dd702b4065090e240cb6455f026f604871 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From a8b1311a34b520df921ff896b405bf721b7507fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 1527fe284640bd2c00227de7f685e3d19170bfa0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From d732e2cf11a1cbe2d5d123094aaf603cb47e8979 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 768299b1f40ff13b44a60df40fc295e3f237711d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From 265ec91e331516dc3714674b9ed1118c45bcee15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 8b68174160d5196a7d3c1726d0af4b9c7bdd7314 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 3880e61af1ddfa7c0b6aedfd69dad29879a00659 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 4358cdc302ef7d628fb67bf4b35e1eddcc5d6771 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From e00dc9d115f8d2676ed1406ed9a084f819543d3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 9c5fd0806faac05797078ed5debe9c85e3d73951 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From d469523e81fbf07f0ffe70bbd8af0648179ac78f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 3aa18ba2e7ec1e074e7665fb0ac146cef51f7655 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 29dcf9a3f273867297550c9e34f72f2866ff6c49 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From b2f000ec3cc09b80bd756609165b15711ce13766 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 9255be9e5fba6db571797be55a9b4f3b8691cae9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 729e70326a94b57f7b52903fc5db7f141ea46c29 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From da15748abc524be04d30a923d0c4ec25c49e652b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 7ddd18e4cc7b05a0ff3a02fe012058790eef4f71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 54e3112671930f0b97b11b5112a5356c360f191b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c67fea6eb4ba8e3339b01dcd0f09682ce705a251 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 1a7623c8bec5624bde39bb522a702e71eb7b1c52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 8a9b980c7f5f4f7c710ffc71a41a4fd52a805aa5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 320cfeefb99b805a802f67b567877c873b4638f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 7b108e419cb1aff40c893838ab71257dcd67582c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 576d5892a4a15110ff893ab1468a31fce2bfdce8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From a1b81d7a6813c101fb9dea7074dcbc4d7d8ba367 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From f0f41f2c82676b66893ae9a50639c4d8e0890998 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 4bf83ea7a9da7b4c3a8ca0ce784bda10123e4586 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 9903f782a0e2cdb168ce4e71ad0b8dac0db1c3ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 63f3e77370a4f2773f2e67ae02ab6ecda568bc8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 72e83c5a0ae2026a8f6bc1232574f2f556efe961 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From d8b5dc34ee876faabc3e35969bf6d42fdae9d266 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From a577a49a82c5b07d9ea51d6ecffe54c96a31a295 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 3dcec44b60ffdc76f7f33b96861cb42aa72a0c1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 4d4295bd2d2aa37774b01236b8d29074ef924f9f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From d79f4fe2c8ae40f991f1dad1a93127f682fa2a67 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 717d82b8c91c35804b5dc85fb81d6c2cbaa55559 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 8720a535b53b1d137ac785b8291521cb3239c240 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 1795c3f85b61ba529301a54c529b92304a214eec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From fc2730ee2c4f4eee80f09bbf7ae7fd6bff4d0cea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 5cedbb3ce5ed5cf13a44dd84f56fea543203789a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 934d3bf813e5b97c321a54881c72863d2f11c3a8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 2cced21fd23a6e43d133a8cffb78aedde82a6f8b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 4870312e31c9660f67a97172a7501e482855496f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 90a6fccbf47505b82de111705a8934c56d49aba9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 9e10a39afdd069ef92b396fd6eaa253ec8de14ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From ba25cbd4e4de5ab26798d3c392a3694a7f09ffd1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From e02234b98bed9e716d0d4bbb9767ada4d23ca0e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 940f4edbedfcac24af75f9f06d3dcf76041cf26a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From 78de1d5f1960b177b5ba819256f1e1b6cfbe9935 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (15 preceding siblings ...)
2022-12-27 7:10 ` oreo639
@ 2022-12-27 8:40 ` oreo639
2022-12-27 17:17 ` [PR REVIEW] " paper42
` (29 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 8:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6522 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
There is also the following simplified PR that simply reverts the primary offending commit without removing the libssp package (this will prevent new glibc cross packages from depending on libssp): https://github.com/void-linux/void-packages/pull/41229
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99885 bytes --]
From 38da49122678aeaf175762d72a8af6f7881ff563 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/112] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From a341c58c2e26b0fd42fd39a485e366b64f91fda6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/112] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 839ab0e75b32ae5e329095791656d4e657979e79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/112] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 83339311291d76fe48a5f6891155f5020413f9be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/112] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 8edadf402f22e0dc50c31c3f9d115809255a1283 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/112] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 44c514a2b88d91cc9a983a1e617e2d009622a419 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/112] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 7e752e476c18f0a7c66501188c1dd21e5ce0bc96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/112] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e4f8e24a4a64fcd766f871902bee2a73b45034ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/112] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cf8e3492c55faf7ee9c9bd8e124a4fe394ab2c71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/112] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 59db2d23f6bc3d944187552f4c37abe89f9c4a97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/112] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e393cd6de488d4eebbc9dc8c5d7e4d583abb14e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/112] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From d903bb63dfc56f664958d17a959f0120b13664b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/112] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6ed086cc0169d52104ddd8e651b7ea0053d6c3d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/112] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0f160325421386e266e4fcac015b127322803e71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/112] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0b82874a1e2408f16fb3ea3c9539eee0343d11dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/112] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 68989e1769629b8ec7a8a89ed3828fb084b6a35b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/112] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c333ff9166f6288d0d18cf81f79aaa10f4ffc748 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/112] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 3edb04e127d3f8b18b8bd3d73b4282d44766cbef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/112] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c1ea4b120cfd6203e1cc057e140db14f66a8b77e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/112] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From c42cb6a90c546fdd2bafc71c08d8ad9210de3187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/112] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 47fdba02b8dcf47284ad2b7723398ceaf81b74ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/112] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 34e8898eb9849e2fedd8bacd2248eb6af29dd0c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/112] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From f9d5e7ba1d49094374ad74a5813d426886af3764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/112] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 41724d2052513b90dc7df5001aad97019fc98d20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/112] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 604e2222ecb5c321d5a5e5d5c9ca601c6ca2e803 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/112] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From a8790645a97ab79468b3468cf20df112ce47b74b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/112] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a423382a3e747a6a987eaec55980d56dc8b70a7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/112] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 900dcfe50f9e809476afe6ab21226a10e0342f52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/112] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From ec64f0fc0c32490631ac253ba9fa06f2f8000e48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/112] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 29881030e254cb7979fa1482131edfdd93f073c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/112] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 133d4a7e5ad68e1fa68645bb195104100926daac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/112] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 02ed7c988c7a8bba994a6afae36a4bfbfbab0426 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/112] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5c86560f0db8233b72a15fb62f53af4482c186ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/112] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From a98662f3940785f3b471d43d39dee88ab0425d4b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/112] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 37f9290e8fb50f02fcea6c72ee96c23dde3be4cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/112] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 4b0ed80d7a55b58fc5be72aa398aef187f59626d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/112] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 3c329e713dd6e3ae6d16e375d22ab794fde3fe53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/112] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 0d7e88b6c9b6c50cdda588f58db61b2860b08d78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/112] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From d55e690ec40754dd8e1e19cc740ad944f2b748bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/112] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From c17ed529652f00483c6c042aeec114e1def09526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/112] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 1f37770ef2072fc92966d17f81344cf9d4a9f926 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/112] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 80c3a635441545a53951a4ec509481550f6a4e0a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/112] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From b8e7b1ead78e8bca17746e1e173d7705c56ab889 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/112] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From c448e0e8e3293371c02d423585386e5cc770a9ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/112] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 8dde9f343ce0e5c0311a50261a695f9321413bb4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/112] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From fb4e40d83fc3a2b3e5f1a4511cb0ca924ad79b43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/112] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From e15d00fb1418871d9f6faaeede9d280d4f37cd11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/112] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 1947c3515eefb3214e4378497010934829a08fa5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/112] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 1948b34c8220c1dfa9ddf5f242bcd0247993ce19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/112] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 8bdb54b42fd584a42548fec5a081ce1f21d5cdff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/112] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From dab94e727494ea7f58e23b451d5ec61a3c5f7e52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/112] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From a8bf42049d84b53caca67bf9c2c3193522b760ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/112] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From ae336a61d13917a968099321735cf223dc4d0672 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/112] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From ec0fcf7ae8f37c64e5db11e346c606c5a0a33294 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/112] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 9a545e5034d61f9d6c561526d7568f0760c077db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/112] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From d54cc2ae828a0addcdecb1e52d496f032159294b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/112] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From c5cce0c777430db243d3977b03b42fb919735d57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/112] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 560c0b823cc0635e7f034c4bd6dd60b22f33488a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/112] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 0a5f0f5128e4d1984ba10ebc151b503e4931fb27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/112] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 02af95f45d6a9259f385b0990f56b9a2985ec68b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/112] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From f4a8b392c1ed9fa84a0e00b8c2b19ea9da36ec0f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/112] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 1d6fd65b0419056601c284c55046be9a3e91b832 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/112] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 17d7cbe88bb60dcf3f41b34c0443b210ad7e7682 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/112] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 302441ce16ad7e4c1b3b8af887792ac50e9c727d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/112] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 4f0054346353b723887d1deab6d01e0753ef2c49 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/112] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 92b36886181b3e844bce46355adae7c5cd9e0fc4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/112] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From ecc4dc42cd0a803f8561f7ba228f979eb694923b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/112] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 661529a87be7bac5bc3bd9c677893e611727f0f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/112] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 3d92dd7050b7dbc21f705812d58dd7ff5d63a01b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/112] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c6951f59d72eb09d01b98da6fd4eae67d6578911 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/112] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 9b69b50c18529d7738d4e9e01c220ee453b214ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/112] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 207821ea6142a0084552d5de55e16d572ebe5e14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/112] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From f4e26b9803044ad743c22101bf1b91eb95ec9864 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/112] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From fbe98b6f5aee9e26061f336010bcc99e7cf7ee76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/112] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From fc611deb7cc8bc087aa974c5c45d7e49cb74c349 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/112] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From d5134fd8896b2ce20f914acafa4459e9019cb90c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/112] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 2093cfea7480e181fcdc9f6340e32bdbaf8cae1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/112] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From d836ca438dd22edf6298fca71cb64d116129880f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/112] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 45b11dae0abf9b851dde2c3f785bc68c2dce211a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/112] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 262c5fb370327424f60f8e15129b7d0baf1f0704 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/112] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 895ab0ee199d9bac570dfecd076cc7a4d916c807 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/112] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c1d2fe8fd1f0d775aed39501c4f9ba9001691f01 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/112] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 1191796bb2435f7c5e00e73e986bbf409900393d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/112] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From db200f3bdec9e3ba7ae25384df7abe5795a00118 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/112] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From efa4fbd1aba6d9d79003dca678fba8d258d8f20a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/112] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 9233d2e6698513be795c7e5badfdd90a63b13a02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/112] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From f65298baa3c97a2180005f2325a114961b801121 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/112] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 4f83e32ced7a5b0ca902e13e3562866b9ee608df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/112] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 46f58781f935051aeb0f8eaedef39f776107d465 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/112] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d8db7887511fc7e6b490a03ebb6e9a1d403a274b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/112] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 1a932b171c4c270a1aa565f523f102eef2f278fb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/112] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From bbe25c622de1d6a565bf8160f55ffbb8b56f3bfc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/112] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From d64f1d606b445b2802e7b42305640fb909ca9b76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/112] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 132c7330b2b94cd732c1172b895bdf05e06bd24b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/112] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 21a9f33808481e6fc394c978f2eab52c5ede09bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/112] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 5595beffcdda1db8976c2acefcaa08591d779c35 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/112] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From df01b16b4c73ee285e63bcc296fae30bf51d2370 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/112] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 9073c2fd1fa6765024883bbb3a4db994f45616a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/112] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 4504b89657753c01b843af7abaf3602e964cf138 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/112] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From aa5042f1925851b6b15c060c1d5357b528ac7c64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/112] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From c06b967775b86737ad88875157b0af932394c151 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/112] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 4c38dec24ceed912ca969d44ed78d0dd71edcdf9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/112] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From e8881b82cf3c841a47bf54d25756f8c5e210e526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/112] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 59a3f947627382ca2720281294ec8897d7ba8852 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/112] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 46a5be14455225cbe624d7ff8901ebb786f41b99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/112] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 164828f8a457906ad7fe931d789d7c908dfe8797 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/112] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From e436056a9cc30b228284cc6ac5e8cc7aa3502046 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/112] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 5cc070f3c0b0b5f0b923ddb84cbba1f1364f8199 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/112] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From dca434d0b5ad0775de9c86f1be178afedda0609b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/112] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 9f3ca2044f49025f7ca84a74e023f09e40da520a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/112] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 588c635d3a09b5de81581a8f47111d78c5a2980b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/112] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From bc21a79fa895b0f94f98ea93778f234005524cf3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 13:42:10 -0800
Subject: [PATCH 112/112] tlsdate: re-add as meta to allow people to upgrade
their systems
---
srcpkgs/tlsdate/template | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 srcpkgs/tlsdate/template
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
new file mode 100644
index 000000000000..02009f887efd
--- /dev/null
+++ b/srcpkgs/tlsdate/template
@@ -0,0 +1,9 @@
+# Template file for 'tlsdate'
+pkgname=tlsdate
+version=0.0.13
+revision=16
+build_style=meta
+short_desc="Secure parasitic rdate replacement using HTTPS (removed package)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="metapackage"
+homepage="https://github.com/ioerror/tlsdate"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (16 preceding siblings ...)
2022-12-27 8:40 ` oreo639
@ 2022-12-27 17:17 ` paper42
2022-12-27 22:29 ` oreo639
` (28 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: paper42 @ 2022-12-27 17:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1057804660
Comment:
removed-packages should uninstall it and allow people to upgrade their systems, we can also remove it from binary repositories to prevent them from installing it again instead of adding a metapackage
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (17 preceding siblings ...)
2022-12-27 17:17 ` [PR REVIEW] " paper42
@ 2022-12-27 22:29 ` oreo639
2022-12-27 22:30 ` oreo639
` (27 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 22:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1057947098
Comment:
tlsdate<=0.0.13_16 is already in removed-packages so I didn't update it.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (18 preceding siblings ...)
2022-12-27 22:29 ` oreo639
@ 2022-12-27 22:30 ` oreo639
2022-12-27 22:32 ` [PR PATCH] [Updated] " oreo639
` (26 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1057947098
Comment:
tlsdate<=0.0.13_16 is already in removed-packages so I didn't update it.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (19 preceding siblings ...)
2022-12-27 22:30 ` oreo639
@ 2022-12-27 22:32 ` oreo639
2023-01-09 16:24 ` oreo639
` (25 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2022-12-27 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6656 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ stunnel
+ libtls
+ csync
+ qemu-user-static
+ mozjs91
+ mozjs78
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99055 bytes --]
From 38da49122678aeaf175762d72a8af6f7881ff563 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/111] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From a341c58c2e26b0fd42fd39a485e366b64f91fda6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/111] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 839ab0e75b32ae5e329095791656d4e657979e79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/111] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 83339311291d76fe48a5f6891155f5020413f9be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/111] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 8edadf402f22e0dc50c31c3f9d115809255a1283 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/111] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 44c514a2b88d91cc9a983a1e617e2d009622a419 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/111] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 7e752e476c18f0a7c66501188c1dd21e5ce0bc96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/111] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e4f8e24a4a64fcd766f871902bee2a73b45034ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/111] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cf8e3492c55faf7ee9c9bd8e124a4fe394ab2c71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/111] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 59db2d23f6bc3d944187552f4c37abe89f9c4a97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/111] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e393cd6de488d4eebbc9dc8c5d7e4d583abb14e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/111] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From d903bb63dfc56f664958d17a959f0120b13664b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/111] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6ed086cc0169d52104ddd8e651b7ea0053d6c3d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/111] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0f160325421386e266e4fcac015b127322803e71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/111] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0b82874a1e2408f16fb3ea3c9539eee0343d11dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/111] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 68989e1769629b8ec7a8a89ed3828fb084b6a35b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/111] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c333ff9166f6288d0d18cf81f79aaa10f4ffc748 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/111] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 3edb04e127d3f8b18b8bd3d73b4282d44766cbef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/111] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c1ea4b120cfd6203e1cc057e140db14f66a8b77e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/111] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From c42cb6a90c546fdd2bafc71c08d8ad9210de3187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/111] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 47fdba02b8dcf47284ad2b7723398ceaf81b74ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/111] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 34e8898eb9849e2fedd8bacd2248eb6af29dd0c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/111] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From f9d5e7ba1d49094374ad74a5813d426886af3764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/111] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 41724d2052513b90dc7df5001aad97019fc98d20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/111] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 604e2222ecb5c321d5a5e5d5c9ca601c6ca2e803 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/111] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From a8790645a97ab79468b3468cf20df112ce47b74b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/111] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a423382a3e747a6a987eaec55980d56dc8b70a7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/111] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 900dcfe50f9e809476afe6ab21226a10e0342f52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/111] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From ec64f0fc0c32490631ac253ba9fa06f2f8000e48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/111] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 29881030e254cb7979fa1482131edfdd93f073c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/111] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 133d4a7e5ad68e1fa68645bb195104100926daac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/111] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 02ed7c988c7a8bba994a6afae36a4bfbfbab0426 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/111] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5c86560f0db8233b72a15fb62f53af4482c186ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/111] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From a98662f3940785f3b471d43d39dee88ab0425d4b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/111] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 37f9290e8fb50f02fcea6c72ee96c23dde3be4cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/111] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 4b0ed80d7a55b58fc5be72aa398aef187f59626d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/111] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 3c329e713dd6e3ae6d16e375d22ab794fde3fe53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/111] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 0d7e88b6c9b6c50cdda588f58db61b2860b08d78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/111] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From d55e690ec40754dd8e1e19cc740ad944f2b748bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/111] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From c17ed529652f00483c6c042aeec114e1def09526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/111] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 1f37770ef2072fc92966d17f81344cf9d4a9f926 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/111] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 80c3a635441545a53951a4ec509481550f6a4e0a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/111] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From b8e7b1ead78e8bca17746e1e173d7705c56ab889 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/111] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From c448e0e8e3293371c02d423585386e5cc770a9ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/111] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 8dde9f343ce0e5c0311a50261a695f9321413bb4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/111] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From fb4e40d83fc3a2b3e5f1a4511cb0ca924ad79b43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/111] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From e15d00fb1418871d9f6faaeede9d280d4f37cd11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/111] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 1947c3515eefb3214e4378497010934829a08fa5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/111] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 1948b34c8220c1dfa9ddf5f242bcd0247993ce19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/111] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 8bdb54b42fd584a42548fec5a081ce1f21d5cdff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/111] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From dab94e727494ea7f58e23b451d5ec61a3c5f7e52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/111] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From a8bf42049d84b53caca67bf9c2c3193522b760ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/111] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From ae336a61d13917a968099321735cf223dc4d0672 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/111] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From ec0fcf7ae8f37c64e5db11e346c606c5a0a33294 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/111] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 9a545e5034d61f9d6c561526d7568f0760c077db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/111] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From d54cc2ae828a0addcdecb1e52d496f032159294b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/111] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From c5cce0c777430db243d3977b03b42fb919735d57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/111] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 560c0b823cc0635e7f034c4bd6dd60b22f33488a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/111] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 0a5f0f5128e4d1984ba10ebc151b503e4931fb27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/111] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 02af95f45d6a9259f385b0990f56b9a2985ec68b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/111] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From f4a8b392c1ed9fa84a0e00b8c2b19ea9da36ec0f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/111] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 1d6fd65b0419056601c284c55046be9a3e91b832 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/111] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 17d7cbe88bb60dcf3f41b34c0443b210ad7e7682 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/111] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 302441ce16ad7e4c1b3b8af887792ac50e9c727d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/111] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 4f0054346353b723887d1deab6d01e0753ef2c49 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/111] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 92b36886181b3e844bce46355adae7c5cd9e0fc4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/111] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From ecc4dc42cd0a803f8561f7ba228f979eb694923b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/111] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 661529a87be7bac5bc3bd9c677893e611727f0f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/111] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 3d92dd7050b7dbc21f705812d58dd7ff5d63a01b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/111] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c6951f59d72eb09d01b98da6fd4eae67d6578911 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/111] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 9b69b50c18529d7738d4e9e01c220ee453b214ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/111] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 207821ea6142a0084552d5de55e16d572ebe5e14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/111] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From f4e26b9803044ad743c22101bf1b91eb95ec9864 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/111] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From fbe98b6f5aee9e26061f336010bcc99e7cf7ee76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/111] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From fc611deb7cc8bc087aa974c5c45d7e49cb74c349 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/111] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From d5134fd8896b2ce20f914acafa4459e9019cb90c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/111] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 2093cfea7480e181fcdc9f6340e32bdbaf8cae1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/111] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From d836ca438dd22edf6298fca71cb64d116129880f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/111] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 45b11dae0abf9b851dde2c3f785bc68c2dce211a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/111] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 262c5fb370327424f60f8e15129b7d0baf1f0704 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/111] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 895ab0ee199d9bac570dfecd076cc7a4d916c807 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/111] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c1d2fe8fd1f0d775aed39501c4f9ba9001691f01 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/111] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 1191796bb2435f7c5e00e73e986bbf409900393d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/111] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From db200f3bdec9e3ba7ae25384df7abe5795a00118 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/111] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From efa4fbd1aba6d9d79003dca678fba8d258d8f20a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/111] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 9233d2e6698513be795c7e5badfdd90a63b13a02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/111] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From f65298baa3c97a2180005f2325a114961b801121 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/111] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 4f83e32ced7a5b0ca902e13e3562866b9ee608df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/111] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 46f58781f935051aeb0f8eaedef39f776107d465 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/111] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d8db7887511fc7e6b490a03ebb6e9a1d403a274b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/111] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 1a932b171c4c270a1aa565f523f102eef2f278fb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/111] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From bbe25c622de1d6a565bf8160f55ffbb8b56f3bfc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/111] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From d64f1d606b445b2802e7b42305640fb909ca9b76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/111] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 132c7330b2b94cd732c1172b895bdf05e06bd24b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/111] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 21a9f33808481e6fc394c978f2eab52c5ede09bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/111] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 5595beffcdda1db8976c2acefcaa08591d779c35 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/111] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From df01b16b4c73ee285e63bcc296fae30bf51d2370 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/111] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 9073c2fd1fa6765024883bbb3a4db994f45616a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/111] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 4504b89657753c01b843af7abaf3602e964cf138 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/111] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From aa5042f1925851b6b15c060c1d5357b528ac7c64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/111] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From c06b967775b86737ad88875157b0af932394c151 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/111] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 4c38dec24ceed912ca969d44ed78d0dd71edcdf9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/111] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From e8881b82cf3c841a47bf54d25756f8c5e210e526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/111] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 59a3f947627382ca2720281294ec8897d7ba8852 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/111] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 46a5be14455225cbe624d7ff8901ebb786f41b99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/111] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 164828f8a457906ad7fe931d789d7c908dfe8797 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/111] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From e436056a9cc30b228284cc6ac5e8cc7aa3502046 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/111] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 5cc070f3c0b0b5f0b923ddb84cbba1f1364f8199 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/111] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From dca434d0b5ad0775de9c86f1be178afedda0609b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/111] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 9f3ca2044f49025f7ca84a74e023f09e40da520a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/111] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 588c635d3a09b5de81581a8f47111d78c5a2980b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/111] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (20 preceding siblings ...)
2022-12-27 22:32 ` [PR PATCH] [Updated] " oreo639
@ 2023-01-09 16:24 ` oreo639
2023-01-09 16:28 ` oreo639
` (24 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-09 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6656 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ stunnel
+ libtls
+ csync
+ qemu-user-static
+ mozjs91
+ mozjs78
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 93991 bytes --]
From fd00356a420204dcd67c96d0b9f5d62d6c7ab0f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/104] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e42350c63bed..3729710846ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From fd826be7caf0379e0eaaa3293febcefa0019b659 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/104] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 887ea63797895d3f1e909a736fa8a02afced3e65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/104] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 0c346930b43f87c4312e8d3b4752314e19c6715c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/104] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From e1ba542891f467ed16b9852ba7c0219df49f273f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/104] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From d32e1715f8fb2bba97e6e62fcd1bdebfe9edf967 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/104] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8287fbb92ea8ddb58bfe853fe3764c083b8a9ed9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/104] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From a76b15726ebbedad4d63386c089fb02a2d8120b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/104] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From c1f060c39098078d69aa5259e7373aa55980c3dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/104] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From af1e4d7e1234bbbc5072ac9bd7d8876af0a2751a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/104] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From a331d1786c0bdad5072c69e53c96159a394158d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/104] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 55526c98fc2939cbe2bd37b6ad8711f333cd0861 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/104] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 1253e6cf46449081fe41992b3ef9bb3988d79279 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/104] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From b6109270270ebc954ea9d5a4ee4bc3bf219901e9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/104] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From ad77e2de92ce66e66c06c79f9356ee8055078d68 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/104] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 1715b56b709632d1cfde0d843dbf7e7ed87f243f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/104] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 479ee83c94f2b72dd669bd524558c39555c0ac61 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/104] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 609fc1155ea94ef6a9886448c9791e42388c5ea4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/104] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c31ad697f9d27042b5991c37a1a0921bd9245b64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/104] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 46132e375ce392503662357c5f0cb652a935b3a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/104] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 679529c65e5d5d8bf35dc01db9a523b48354d751 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/104] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 9855ef356f1442ce6a87d6a786ffebb17805545d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/104] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 772747deec380ab94fe3bb9e98ff7ee30e77e340 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/104] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 2a3fd75ee616d76b21e150a93aae07db54ed8d98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/104] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 577e374fa8bd0fdf2509d1207457bbaee43451a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/104] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 99cea504f88399e7a74cdd410060f1cdc521a22d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/104] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 7a15da29ef365b8c1316aa5388f23e91061ee8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/104] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From f3fedb3ac2d24c7dfeb9ce02dcd91705d029bbca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/104] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 2957d9eba85b6c0bdcce5ac082d69efd65f4a6cc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/104] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 573d75725c95ebf85218b344d62668074f74deb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/104] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 11b6c2ccc28ec0c263a0cc8543b5e06ef61a7a04 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/104] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 79e66d27ca0060a2f4a138d65d4a9ec7df41bead Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/104] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From c504f55fcc541900abe6e555e44294abd7a094a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/104] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 11ef1d37a75be6e479f12f9c1e5bd6bb3e8c2472 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/104] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 137016c717a5a4946b8cb948a4687671948b6e6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/104] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 57d64619d6d6af8e49c16ea6bc5df7290e3e6eb6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/104] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 136fce59e87390bf380b172192035e83b43758b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/104] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 62671f54b38e7ad5261d87c7169596ba30887eb6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/104] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 3b60b77851ce2228539c1e539d9a552f41c98153 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/104] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From ad2c41a8bb4891ad91f9c05c1f20b38beb3b8d46 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/104] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From eabe07b84115dbdc09c959ea60360f93be5f151e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/104] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From c8fd51fe49d8ac9b7ff67d5446b9535eacaffa3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/104] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From e3e32aa1a53479761b6843fe625f5763c9f78f23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/104] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 921bfa2d863261907a663754795aa155b0016db0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 044/104] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From 31da47a2b37ff85f469d7494a5e5baf7e7cbb449 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 045/104] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9e04ee5ad827e32c13a65a10aaf1888469475c8b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 046/104] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 1c155c0e39bfd6b4783dc9daba4aa5e10a9aa540 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 047/104] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 6916e6aa3b20c2c01a07b696fac15e6e3da15bf1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 048/104] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From f2bfed928f34817baf4418861dcb2d0631dde59b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 049/104] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 5e9fb26fce05a4c666b9f5023c4bff025915be70 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 050/104] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 531901c0c6f1225080f99b91efbd5ec65ec4e58b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 051/104] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From e27f4e17f2a3f101c1195c4012853dd2d5c33705 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 052/104] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 94c2e8f78725895d30fb37df45030630b25fff42 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 053/104] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 1411942a87ad2dacc57fbbbe872f5eebdb16a17e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 054/104] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 16bf3221453962a7fcc16c59975d9952550bfc44 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 055/104] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From c323863e7a09cc775d156d1dd6de9b337dcb29f7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 056/104] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 5d680d2d400c02fb38894edaccbbb2cc2bc5ad74 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 057/104] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 7dfd254a171beb41979dafd55362df456d640aaf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 058/104] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 1a7104f3b9273e0e04cc4491abea214cdf7fa498 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 059/104] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index da18fc2f93fc..a834c15c77a6 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.7
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 6d30bc71bf870a7cc83762f6c939122db6103b36 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 060/104] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From a51b44c48ced491ddda149922b43cf4119c5fd76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 061/104] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From e95ee298c3f1268b94e2c51cea210ff91b58743a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 062/104] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From c96b06945586bc6cc9814dd0215cdf14a629323f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 063/104] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From f0055be4e398f82355825e460b0c8daab311fd3a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 064/104] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From 1c80011ff2a706c144701fbdd257b287c01b84b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 065/104] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From a48d32c0aa4d1804a4e4bbe7bbed030024afa64b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 066/104] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 73a6ba460eb1679d14e6aec5b6aeaa5fbb20fb02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 067/104] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 9bf275f66a6c395b432394eb8db981c83701547a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 068/104] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From d6e3fbaa63b5f79885de1e544cade8e4929343f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 069/104] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 8ab75e4393458936be9cd15292e059599e527bbe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 070/104] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From c4522ff30d8d0d61eace35176d31f7cac395246b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 071/104] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 0635ea3bd830c17348c9aba74a2c17aea4e7b399 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 072/104] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 92d29803d82823363810514c20511060630a9430 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 073/104] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 6b8e8f935f99b5391ca38a1295edf19a02057ad4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 074/104] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 177f3666b50c0b981adaf94a271716d0de359b4a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 075/104] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 4a6383e47bf47350b6cf2c7f9cf69a45c7032c9d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 076/104] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c34b84f5f315c69630e507a3081811118f3fb4e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 077/104] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f5ffb9000b7ea09755d9a64b1158db87580b08a9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 078/104] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 17b44648e0e651f94723508b10662a44676633c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 079/104] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 299859ccc46eba2e1171f8eab05f14950ee995f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 080/104] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From b3502dc41964cffe1af7e180d873714eba1f6157 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 081/104] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 0f2237f0ad5c1983744de9451416635c0ecc8ff2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 082/104] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 4f1ce09ec41e97a7be92890ad71ce28011368cfd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 083/104] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 8d2a96a68b608d7838ae31fcba2f22019c9ec7ad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 084/104] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 9e0037b217b0a0a12f040a1dffea4aed1211c0ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 085/104] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 67f7444d0e9bd4b679be9d44ded2d7bdb83bd2dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 086/104] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 0cb03d2fde584885b0efdadfd5b78774c99c80a8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 087/104] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 4f234140a5d7c8a07d8982bfeaace07003984586 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 088/104] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From be8e36621d6224fab06b6fb01eb0791d340987bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 089/104] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From ad125faac243d1601e81408552d0d550d0c62124 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 090/104] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From c4d0a74071e63f99007acd0982c4932e1bc91f1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 091/104] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From c6c323b4d2e4cfc73c66095588848179f1001504 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 092/104] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From a91535f897112052540d0562b0137c78a75ad9fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 093/104] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 4a4161690aa2fec2d77a258d9e790041acad8e8a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 094/104] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From a2e09fd62edf9c0e523cb4731df4dd1635d4de8f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 095/104] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From db3c6001d783279fd4ee21c39eaeb1adfb19ade0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 096/104] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 0e028d8a980d374946e7d711d54360e92f9fd9a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 097/104] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 60f421b1a8b27ed6088ecffe2fe724485464a6fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 098/104] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From e6b791a883c8f090d0eb2a055dcdedd673a44e1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 099/104] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From a03b46e27f40237a09037877dfcd17637abc58f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 100/104] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 8adff9c0c9b8a2ed298553b88e7256e34c6fb173 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 101/104] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From d8a394fd0327882e739825313fd70ae73822ae98 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 102/104] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 361fdf5834225cdc8de22a8222dccf687c81e881 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 103/104] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From fe0f8eb172aa5a46f8a492c9cbfbe6e19bdcf1e5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 104/104] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (21 preceding siblings ...)
2023-01-09 16:24 ` oreo639
@ 2023-01-09 16:28 ` oreo639
2023-01-09 17:47 ` oreo639
` (23 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-09 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6656 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ stunnel
+ libtls
+ csync
+ qemu-user-static
+ mozjs91
+ mozjs78
[ci skip]
Necessary rebuilds
x86_64{,-musl} & i686:
- [x] sox
- [x] stlink
aarch64:
- [x] PrismLauncher-6.0_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] libssp-devel-12.2.0_1
- [x] libsvt-av1-1.4.1_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] svt-av1-1.4.1_1
- [x] thunderbird-102.6.1_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}l:
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] raft-0.16.0_1
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
armv{6,7}-musll:
- [x] AusweisApp2-1.24.1_1
- [x] OTPClient-2.4.8_1
- [x] avahi-qt5-libs-0.8_5
- [x] avahi-ui-libs-0.8_5
- [x] avahi-ui-libs-gtk3-0.8_5
- [x] avahi-ui-utils-0.8_5
- [x] bitcoin-22.0_2
- [x] bitcoin-qt-22.0_2
- [x] botan-2.19.2_2
- [x] cJSON-1.7.15_1
- [x] csync-0.50.0_5
- [x] cups-2.4.2_1
- [x] davfs2-1.6.1_1
- [x] di-4.51_1
- [x] dislocker-0.7.3_1
- [x] dovecot-2.3.20_1
- [x] dovecot-plugin-ldap-2.3.20_1
- [x] dovecot-plugin-lucene-2.3.20_1
- [x] dovecot-plugin-mysql-2.3.20_1
- [x] dovecot-plugin-pgsql-2.3.20_1
- [x] dovecot-plugin-pigeonhole-0.5.20_1
- [x] dovecot-plugin-pigeonhole-ldap-0.5.20_1
- [x] dovecot-plugin-sqlite-2.3.20_1
- [x] dqlite-1.13.0_1
- [x] elogind-246.10_2
- [x] flac-1.3.4_1
- [x] fwknop-2.6.10_2
- [x] fwknopd-2.6.10_2
- [x] inkscape-1.1.1_5
- [x] keepalived-2.2.7_1
- [x] keepassxc-2.7.4_1
- [x] kitty-0.26.3_2
- [x] kmscon-8_7
- [x] kstars-3.6.0_2
- [x] libcotp-1.2.4_1
- [x] libcups-2.4.2_1
- [x] libelogind-246.10_2
- [x] libfko-2.6.10_2
- [x] libflac-1.3.4_1
- [x] libhtp-0.5.36_1
- [x] libknet1-1.24_1
- [x] libmariadbclient-10.5.10_3
- [x] libnozzle1-1.24_1
- [x] libressl-netcat-3.6.1_1
- [x] libssp-devel-12.2.0_1
- [x] libswtpm-0.7.3_1
- [x] libtls-3.6.1_1
- [x] libtpm2-totp-0.3.0_1
- [x] libtpms-0.9.4_1
- [x] libvlc-3.0.18_2
- [x] libxbps-0.59.1_7
- [x] libykcs11-2.1.1_2
- [x] libykpiv-2.1.1_2
- [x] litecoin-0.18.1_8
- [x] lldpd-1.0.11_2
- [x] mariadb-10.5.10_3
- [x] massdns-1.0.0_1
- [x] mksh-R59c_1
- [x] mkvtoolnix-72.0.0_1
- [x] mkvtoolnix-gui-72.0.0_1
- [x] monero-0.18.1.2_1
- [x] monero-gui-0.18.1.2_1
- [x] monit-5.32.0_1
- [x] mosh-1.4.0_2
- [x] mozjs102-102.5.0_1
- [x] mozjs78-78.9.0_5
- [x] mozjs91-91.7.1_2
- [x] msg2-1.2.0_2
- [x] namecoin-0.18.1_6
- [x] navit-0.5.6_3
- [x] ngircd-26_2
- [x] ntp-4.2.8p15_5
- [x] openjdk8-jre-8u322b04_3
- [x] openssh-9.1p1_2
- [x] openssh-sk-helper-9.1p1_2
- [x] p0f-3.09b_3
- [x] pam_ssh_agent_auth-0.10.3_3
- [x] pax-20201030_1
- [x] perf-5.10.4_10
- [x] powertop-2.14_2
- [x] qemu-7.1.0_1
- [x] qemu-ga-7.1.0_1
- [x] qemu-user-static-7.1.0_1
- [x] qtox-1.17.6_1
- [x] raft-0.16.0_1
- [x] ruby-3.1.3_1
- [x] sox-14.4.2_5
- [x] stunnel-5.66_1
- [x] sudo-1.9.11p3_1
- [x] swirc-3.3.8_1
- [x] swtpm-0.7.3_1
- [x] tcltls-1.7.22_1
- [x] testdisk-7.1_3
- [x] thc-hydra-9.1_4
- [x] tini-0.19.0_1
- [x] tinyssh-20220801_1
- [x] tlsdate-0.0.13_15
- [x] tmon-5.10.4_10
- [x] tor-0.4.7.12_1
- [x] tpm2-tools-5.4_1
- [x] tpm2-totp-0.3.0_1
- [x] tpm2-tss-3.2.0_1
- [x] vlc-3.0.18_2
- [x] vte3-0.70.1_1
- [x] vte3-gtk4-0.70.1_1
- [x] wesnoth-1.16.6_1
- [x] xbps-0.59.1_7
- [x] xbps-tests-0.59.1_7
- [x] xnec2c-4.4.12_1
- [x] yubico-piv-tool-2.1.1_2
- [x] zmap-2.1.1_5
aarch64-musl:
same as aarch64 and armv{6,7}-musl combined.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 99055 bytes --]
From 38da49122678aeaf175762d72a8af6f7881ff563 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/111] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From a341c58c2e26b0fd42fd39a485e366b64f91fda6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/111] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 839ab0e75b32ae5e329095791656d4e657979e79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/111] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 83339311291d76fe48a5f6891155f5020413f9be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/111] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 8edadf402f22e0dc50c31c3f9d115809255a1283 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/111] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 44c514a2b88d91cc9a983a1e617e2d009622a419 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/111] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 7e752e476c18f0a7c66501188c1dd21e5ce0bc96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/111] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e4f8e24a4a64fcd766f871902bee2a73b45034ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/111] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cf8e3492c55faf7ee9c9bd8e124a4fe394ab2c71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/111] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 59db2d23f6bc3d944187552f4c37abe89f9c4a97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/111] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e393cd6de488d4eebbc9dc8c5d7e4d583abb14e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/111] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From d903bb63dfc56f664958d17a959f0120b13664b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/111] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6ed086cc0169d52104ddd8e651b7ea0053d6c3d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/111] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0f160325421386e266e4fcac015b127322803e71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/111] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0b82874a1e2408f16fb3ea3c9539eee0343d11dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/111] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 68989e1769629b8ec7a8a89ed3828fb084b6a35b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/111] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c333ff9166f6288d0d18cf81f79aaa10f4ffc748 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/111] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 3edb04e127d3f8b18b8bd3d73b4282d44766cbef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/111] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c1ea4b120cfd6203e1cc057e140db14f66a8b77e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/111] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From c42cb6a90c546fdd2bafc71c08d8ad9210de3187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/111] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 47fdba02b8dcf47284ad2b7723398ceaf81b74ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/111] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 34e8898eb9849e2fedd8bacd2248eb6af29dd0c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/111] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From f9d5e7ba1d49094374ad74a5813d426886af3764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/111] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 41724d2052513b90dc7df5001aad97019fc98d20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/111] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 604e2222ecb5c321d5a5e5d5c9ca601c6ca2e803 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/111] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From a8790645a97ab79468b3468cf20df112ce47b74b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/111] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a423382a3e747a6a987eaec55980d56dc8b70a7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/111] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 900dcfe50f9e809476afe6ab21226a10e0342f52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/111] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From ec64f0fc0c32490631ac253ba9fa06f2f8000e48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:14 -0800
Subject: [PATCH 029/111] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 29881030e254cb7979fa1482131edfdd93f073c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:44:32 -0800
Subject: [PATCH 030/111] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 133d4a7e5ad68e1fa68645bb195104100926daac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:20 -0800
Subject: [PATCH 031/111] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 02ed7c988c7a8bba994a6afae36a4bfbfbab0426 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:26:57 -0800
Subject: [PATCH 032/111] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5c86560f0db8233b72a15fb62f53af4482c186ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:08 -0800
Subject: [PATCH 033/111] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From a98662f3940785f3b471d43d39dee88ab0425d4b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:28:53 -0800
Subject: [PATCH 034/111] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 37f9290e8fb50f02fcea6c72ee96c23dde3be4cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:29:30 -0800
Subject: [PATCH 035/111] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 4b0ed80d7a55b58fc5be72aa398aef187f59626d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:30:08 -0800
Subject: [PATCH 036/111] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 3c329e713dd6e3ae6d16e375d22ab794fde3fe53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 18:31:29 -0800
Subject: [PATCH 037/111] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 0d7e88b6c9b6c50cdda588f58db61b2860b08d78 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:22:44 -0800
Subject: [PATCH 038/111] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From d55e690ec40754dd8e1e19cc740ad944f2b748bc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:24:23 -0800
Subject: [PATCH 039/111] avt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From c17ed529652f00483c6c042aeec114e1def09526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:26:01 -0800
Subject: [PATCH 040/111] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 1f37770ef2072fc92966d17f81344cf9d4a9f926 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:54:18 -0800
Subject: [PATCH 041/111] AusweisApp2: rebuild to fix ssp dependencies
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 80c3a635441545a53951a4ec509481550f6a4e0a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:55:19 -0800
Subject: [PATCH 042/111] OTPClient: rebuild to fix ssp dependencies
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From b8e7b1ead78e8bca17746e1e173d7705c56ab889 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:56:40 -0800
Subject: [PATCH 043/111] avahi-discover: rebuild to fix ssp dependencies
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From c448e0e8e3293371c02d423585386e5cc770a9ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:18 -0800
Subject: [PATCH 044/111] bitcoin: rebuild to fix ssp dependencies
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 8dde9f343ce0e5c0311a50261a695f9321413bb4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:58:49 -0800
Subject: [PATCH 045/111] botan: rebuild to fix ssp dependencies
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From fb4e40d83fc3a2b3e5f1a4511cb0ca924ad79b43 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:13 -0800
Subject: [PATCH 046/111] cJSON: rebuild to fix ssp dependencies
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From e15d00fb1418871d9f6faaeede9d280d4f37cd11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 23:59:42 -0800
Subject: [PATCH 047/111] csync: rebuild to fix ssp dependencies
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 1947c3515eefb3214e4378497010934829a08fa5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:09 -0800
Subject: [PATCH 048/111] cups: rebuild to fix ssp dependencies
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 1948b34c8220c1dfa9ddf5f242bcd0247993ce19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:00:38 -0800
Subject: [PATCH 049/111] davfs2: rebuild to fix ssp dependencies
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 8bdb54b42fd584a42548fec5a081ce1f21d5cdff Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:00 -0800
Subject: [PATCH 050/111] di: rebuild to fix ssp dependencies
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From dab94e727494ea7f58e23b451d5ec61a3c5f7e52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:02:24 -0800
Subject: [PATCH 051/111] dislocker: rebuild to fix ssp dependencies
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From a8bf42049d84b53caca67bf9c2c3193522b760ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:03:51 -0800
Subject: [PATCH 052/111] elogind: rebuild to fix ssp dependencies
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From ae336a61d13917a968099321735cf223dc4d0672 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:10 -0800
Subject: [PATCH 053/111] flac: rebuild to fix ssp dependencies
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From ec0fcf7ae8f37c64e5db11e346c606c5a0a33294 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:14:49 -0800
Subject: [PATCH 054/111] fwknop: rebuild to fix ssp dependencies
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 9a545e5034d61f9d6c561526d7568f0760c077db Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:15:33 -0800
Subject: [PATCH 055/111] inkscape: rebuild to fix ssp dependencies
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From d54cc2ae828a0addcdecb1e52d496f032159294b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:16:44 -0800
Subject: [PATCH 056/111] keepalived: rebuild to fix ssp dependencies
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From c5cce0c777430db243d3977b03b42fb919735d57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:20 -0800
Subject: [PATCH 057/111] keepassxc: rebuild to fix ssp dependencies
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 560c0b823cc0635e7f034c4bd6dd60b22f33488a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:17:49 -0800
Subject: [PATCH 058/111] kitty: rebuild to fix ssp dependencies
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 0a5f0f5128e4d1984ba10ebc151b503e4931fb27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:18:33 -0800
Subject: [PATCH 059/111] kmscon: rebuild to fix ssp dependencies
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From 02af95f45d6a9259f385b0990f56b9a2985ec68b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:03 -0800
Subject: [PATCH 060/111] kstars: rebuild to fix ssp dependencies
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From f4a8b392c1ed9fa84a0e00b8c2b19ea9da36ec0f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:19:34 -0800
Subject: [PATCH 061/111] libcotp: rebuild to fix ssp dependencies
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 1d6fd65b0419056601c284c55046be9a3e91b832 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:20:24 -0800
Subject: [PATCH 062/111] libhtp: rebuild to fix ssp dependencies
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 17d7cbe88bb60dcf3f41b34c0443b210ad7e7682 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:21:01 -0800
Subject: [PATCH 063/111] libknet1: rebuild to fix ssp dependencies
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 302441ce16ad7e4c1b3b8af887792ac50e9c727d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:22:11 -0800
Subject: [PATCH 064/111] mariadb: rebuild to fix ssp dependencies
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 4f0054346353b723887d1deab6d01e0753ef2c49 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:13 -0800
Subject: [PATCH 065/111] libtls: rebuild to fix ssp dependencies
---
srcpkgs/libtls/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..817b83206cd5 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -34,8 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- [ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 92b36886181b3e844bce46355adae7c5cd9e0fc4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:25:47 -0800
Subject: [PATCH 066/111] swtpm: rebuild to fix ssp dependencies
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From ecc4dc42cd0a803f8561f7ba228f979eb694923b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:26:45 -0800
Subject: [PATCH 067/111] tpm2-totp: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 661529a87be7bac5bc3bd9c677893e611727f0f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:27:42 -0800
Subject: [PATCH 068/111] libtpms: rebuild to fix ssp dependencies
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 3d92dd7050b7dbc21f705812d58dd7ff5d63a01b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:16 -0800
Subject: [PATCH 069/111] vlc: rebuild to fix ssp dependencies
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c6951f59d72eb09d01b98da6fd4eae67d6578911 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:28:49 -0800
Subject: [PATCH 070/111] xbps: rebuild to fix ssp dependencies
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 9b69b50c18529d7738d4e9e01c220ee453b214ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:30:27 -0800
Subject: [PATCH 071/111] yubico-piv-tool: rebuild to fix ssp dependencies
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 207821ea6142a0084552d5de55e16d572ebe5e14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:31:19 -0800
Subject: [PATCH 072/111] litecoin: rebuild to fix ssp dependencies
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From f4e26b9803044ad743c22101bf1b91eb95ec9864 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:32:11 -0800
Subject: [PATCH 073/111] lldpd: rebuild to fix ssp dependencies
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..cfe58f875b26 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=4
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From fbe98b6f5aee9e26061f336010bcc99e7cf7ee76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:34:10 -0800
Subject: [PATCH 074/111] massdns: rebuild to fix ssp dependencies
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From fc611deb7cc8bc087aa974c5c45d7e49cb74c349 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:35:14 -0800
Subject: [PATCH 075/111] mksh: rebuild to fix ssp dependencies
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From d5134fd8896b2ce20f914acafa4459e9019cb90c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:36:52 -0800
Subject: [PATCH 076/111] mkvtoolnix: rebuild to fix ssp dependencies
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 2093cfea7480e181fcdc9f6340e32bdbaf8cae1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:37:50 -0800
Subject: [PATCH 077/111] monero: rebuild to fix ssp dependencies
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From d836ca438dd22edf6298fca71cb64d116129880f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:38:22 -0800
Subject: [PATCH 078/111] monero-gui: rebuild to fix ssp dependencies
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 45b11dae0abf9b851dde2c3f785bc68c2dce211a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:40:29 -0800
Subject: [PATCH 079/111] monit: rebuild to fix ssp dependencies
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 262c5fb370327424f60f8e15129b7d0baf1f0704 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:41:03 -0800
Subject: [PATCH 080/111] mosh: rebuild to fix ssp dependencies
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..9c1d0c0ad52b 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=4
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 895ab0ee199d9bac570dfecd076cc7a4d916c807 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:01 -0800
Subject: [PATCH 081/111] mozjs78: rebuild to fix ssp dependencies
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c1d2fe8fd1f0d775aed39501c4f9ba9001691f01 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:43:11 -0800
Subject: [PATCH 082/111] mozjs102: rebuild to fix ssp dependencies
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 1191796bb2435f7c5e00e73e986bbf409900393d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 03:47:21 -0800
Subject: [PATCH 083/111] mozjs91: rebuild to fix ssp dependencies
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From db200f3bdec9e3ba7ae25384df7abe5795a00118 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:23 -0800
Subject: [PATCH 084/111] msg2: rebuild to fix ssp dependencies
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From efa4fbd1aba6d9d79003dca678fba8d258d8f20a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:57:50 -0800
Subject: [PATCH 085/111] namecoin: rebuild to fix ssp dependencies
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 9233d2e6698513be795c7e5badfdd90a63b13a02 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:58:34 -0800
Subject: [PATCH 086/111] navit: rebuild to fix ssp dependencies
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From f65298baa3c97a2180005f2325a114961b801121 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:09 -0800
Subject: [PATCH 087/111] ngircd: rebuild to fix ssp dependencies
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 4f83e32ced7a5b0ca902e13e3562866b9ee608df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 00:59:33 -0800
Subject: [PATCH 088/111] ntp: rebuild to fix ssp dependencies
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 46f58781f935051aeb0f8eaedef39f776107d465 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:00:31 -0800
Subject: [PATCH 089/111] openjdk8: rebuild to fix ssp dependencies
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d8db7887511fc7e6b490a03ebb6e9a1d403a274b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:00 -0800
Subject: [PATCH 090/111] openssh: rebuild to fix ssp dependencies
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 1a932b171c4c270a1aa565f523f102eef2f278fb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:01:44 -0800
Subject: [PATCH 091/111] p0f: rebuild to fix ssp dependencies
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From bbe25c622de1d6a565bf8160f55ffbb8b56f3bfc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:26 -0800
Subject: [PATCH 092/111] pam_ssh_agent_auth: rebuild to fix ssp dependencies
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From d64f1d606b445b2802e7b42305640fb909ca9b76 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:03:54 -0800
Subject: [PATCH 093/111] pax: rebuild to fix ssp dependencies
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 132c7330b2b94cd732c1172b895bdf05e06bd24b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:11 -0800
Subject: [PATCH 094/111] qemu: rebuild to fix ssp dependencies
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 21a9f33808481e6fc394c978f2eab52c5ede09bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:06:54 -0800
Subject: [PATCH 095/111] qemu-user-static: rebuild to fix ssp dependencies
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 5595beffcdda1db8976c2acefcaa08591d779c35 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:07:26 -0800
Subject: [PATCH 096/111] qtox: rebuild to fix ssp dependencies
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From df01b16b4c73ee285e63bcc296fae30bf51d2370 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:07 -0800
Subject: [PATCH 097/111] ruby: rebuild to fix ssp dependencies
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 9073c2fd1fa6765024883bbb3a4db994f45616a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:08:34 -0800
Subject: [PATCH 098/111] stunnel: rebuild to fix ssp dependencies
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 4504b89657753c01b843af7abaf3602e964cf138 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:09:20 -0800
Subject: [PATCH 099/111] sudo: rebuild to fix ssp dependencies
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From aa5042f1925851b6b15c060c1d5357b528ac7c64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:10:44 -0800
Subject: [PATCH 100/111] swirc: rebuild to fix ssp dependencies
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From c06b967775b86737ad88875157b0af932394c151 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:10 -0800
Subject: [PATCH 101/111] tcltls: rebuild to fix ssp dependencies
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 4c38dec24ceed912ca969d44ed78d0dd71edcdf9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:11:39 -0800
Subject: [PATCH 102/111] testdisk: rebuild to fix ssp dependencies
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From e8881b82cf3c841a47bf54d25756f8c5e210e526 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:05 -0800
Subject: [PATCH 103/111] thc-hydra: rebuild to fix ssp dependencies
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 59a3f947627382ca2720281294ec8897d7ba8852 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:29 -0800
Subject: [PATCH 104/111] tini: rebuild to fix ssp dependencies
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 46a5be14455225cbe624d7ff8901ebb786f41b99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:12:51 -0800
Subject: [PATCH 105/111] tinyssh: rebuild to fix ssp dependencies
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 164828f8a457906ad7fe931d789d7c908dfe8797 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:16:20 -0800
Subject: [PATCH 106/111] tpm2-tools: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From e436056a9cc30b228284cc6ac5e8cc7aa3502046 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:05 -0800
Subject: [PATCH 107/111] tpm2-tss: rebuild to fix ssp dependencies
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 5cc070f3c0b0b5f0b923ddb84cbba1f1364f8199 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:17:32 -0800
Subject: [PATCH 108/111] vte3: rebuild to fix ssp dependencies
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From dca434d0b5ad0775de9c86f1be178afedda0609b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:09 -0800
Subject: [PATCH 109/111] wesnoth: rebuild to fix ssp dependencies
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 9f3ca2044f49025f7ca84a74e023f09e40da520a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:18:53 -0800
Subject: [PATCH 110/111] xnec2c: rebuild to fix ssp dependencies
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 588c635d3a09b5de81581a8f47111d78c5a2980b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 26 Dec 2022 01:19:16 -0800
Subject: [PATCH 111/111] zmap: rebuild to fix ssp dependencies
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (22 preceding siblings ...)
2023-01-09 16:28 ` oreo639
@ 2023-01-09 17:47 ` oreo639
2023-01-09 18:19 ` oreo639
` (22 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-09 17:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2810 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ stunnel
+ libtls
+ csync
+ qemu-user-static
+ mozjs91
+ mozjs78
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 100930 bytes --]
From 38da49122678aeaf175762d72a8af6f7881ff563 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/114] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 11ef64e0cc7f..140c7a79f4f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From a341c58c2e26b0fd42fd39a485e366b64f91fda6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/114] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 839ab0e75b32ae5e329095791656d4e657979e79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/114] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 83339311291d76fe48a5f6891155f5020413f9be Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/114] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 8edadf402f22e0dc50c31c3f9d115809255a1283 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/114] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 44c514a2b88d91cc9a983a1e617e2d009622a419 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/114] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 7e752e476c18f0a7c66501188c1dd21e5ce0bc96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/114] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e4f8e24a4a64fcd766f871902bee2a73b45034ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/114] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cf8e3492c55faf7ee9c9bd8e124a4fe394ab2c71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/114] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 59db2d23f6bc3d944187552f4c37abe89f9c4a97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/114] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From e393cd6de488d4eebbc9dc8c5d7e4d583abb14e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/114] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From d903bb63dfc56f664958d17a959f0120b13664b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/114] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 6ed086cc0169d52104ddd8e651b7ea0053d6c3d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/114] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0f160325421386e266e4fcac015b127322803e71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/114] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 0b82874a1e2408f16fb3ea3c9539eee0343d11dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/114] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 68989e1769629b8ec7a8a89ed3828fb084b6a35b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/114] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c333ff9166f6288d0d18cf81f79aaa10f4ffc748 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/114] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From 3edb04e127d3f8b18b8bd3d73b4282d44766cbef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/114] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From c1ea4b120cfd6203e1cc057e140db14f66a8b77e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/114] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From c42cb6a90c546fdd2bafc71c08d8ad9210de3187 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/114] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 47fdba02b8dcf47284ad2b7723398ceaf81b74ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/114] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 34e8898eb9849e2fedd8bacd2248eb6af29dd0c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/114] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From f9d5e7ba1d49094374ad74a5813d426886af3764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/114] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 41724d2052513b90dc7df5001aad97019fc98d20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/114] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 604e2222ecb5c321d5a5e5d5c9ca601c6ca2e803 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/114] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From a8790645a97ab79468b3468cf20df112ce47b74b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/114] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From a423382a3e747a6a987eaec55980d56dc8b70a7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/114] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 900dcfe50f9e809476afe6ab21226a10e0342f52 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/114] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 47668934bcb49a653e8750cfc0fafbf7035626ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 029/114] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From bb21071b64d2039526887bd79995317c0dea5460 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 030/114] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 66338e1cdc28184676d493fe99eacad49ac45223 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 031/114] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 19017d19976ba07a81c323208f4e6b36a5c955f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 032/114] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 4645c4ef6cff13ab59502ed6e6557bca591920b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 033/114] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 9ae457ecb9c5..478a7a66e874 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From dd6335b4f16892444f13a35d074248d6a6ebeba0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 034/114] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From a75329e3b1714b9c9661a72caca67d1fc83d57a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:45 -0800
Subject: [PATCH 035/114] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 34ecf9f2484ac083e5ef3a0646d0fb7b3f32912f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 036/114] csync: rebuild to fix ssp dependency
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 3437e01ef7119075f22f9c46edf8c0f8b4550eb9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 037/114] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 455aafcb97d9e2093eaa6db7575e4a8236ec39ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 038/114] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 44b0e10820248e3a1e84abcd717b8a7fdcffd10d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 039/114] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 1ee558b604dd6c1bce5ea7976586efc8291c87b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 040/114] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From cebbbc918bcb0756e19fa7cbd47b1671bcab7ae0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 041/114] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From f9bf4d10b7b6742bb9a4cb18722cd0f28a66bafd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 042/114] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 4056adbe606d1e35f3cb31e5165d32d3aaa32806 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 043/114] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 8749478b8acd89a4bf074180abbd9807f5e9508a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:46 -0800
Subject: [PATCH 044/114] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From ff7625589a268a6d277462dc6a066d016063816d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 045/114] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 0e7f0ad1a24b6c7ef7ae1de72f8a707b31886cfc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 046/114] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From db87c6281d4d6b390e822cb87c0cc33942035cc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 047/114] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From c3bf3c327c5737a2f3a943a9a920ff4cda87f0c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 048/114] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 003d2170baf3..3d239f62f896 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=5
+revision=6
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 3db3f355bf43813fb2b8a30208ccb971e4ecf804 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 049/114] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From f7a9ab999332b584effbea67587296e00e5513e1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 050/114] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 5beb4eb19ce8d6ae129cfd141dffd945f456d7af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 051/114] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 9893313ce079..906f40338346 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.3
-revision=2
+revision=3
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 82f4c9d803e1158e8a0b0aad8557b4f7c9a6d97e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 052/114] kmscon: rebuild to fix ssp dependency
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From fae099245edbb461731f56e353f1cc8ce4270b10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:47 -0800
Subject: [PATCH 053/114] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From fb0788dfebacee010b20fa3e2fca6256defa662c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 054/114] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index 3cd17d10bd84..701d3324137d 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 49369763988d49e29a18781edab15cf0e0704e1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 055/114] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From f4beffe7303d5ca5a7d3d7b9a972db139d3e00e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 056/114] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 2b9aaca9d564509ba9b93b4ddd078679aef1a4fe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 057/114] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..623c1303b778 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From ec85da10135b2222db5310ce0780b4a84d629f20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 058/114] libtpms: rebuild to fix ssp dependency
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From c7a7b5a56e82e7300aad6090632a24efd8f9f6e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 059/114] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 2abaa2a1565d6f04056df5c7cb772ce2901f2df4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 060/114] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 7a188c3c9af8..37f3a348d287 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 9c3dbcb5e4bd572dcdb85f0e4b643bced4b26ca0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 061/114] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 0cc4b34f32b931877dfe7ad35a922b237d1e5f4a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 062/114] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From fd842bc1bc2735c1177b6a8994256d97c4fdac4b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:48 -0800
Subject: [PATCH 063/114] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From e76b70ec68526a2c4bd4cb2af2ea74e33cf999c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 064/114] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 9a10448a67881b5504b7a76961eb5ef99668ae6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 065/114] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 815cddbb084a3529ce0ef66069e2db55c2e572e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 066/114] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 89b398d29781..7385c102eda5 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=1
+revision=2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From e13329c5c465033f1424a05984950d93213ba2d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 067/114] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 13f4c41d21a6..03f852bf6f6d 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=1
+revision=2
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 7aa8666b0fc7bb0495b6e2009aeb7b69d72de2bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 068/114] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From e171bf68ad6defb261b6463cb3008f12a40a1f8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 069/114] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From e63da29415173cb123643906013608354bbddbd9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 070/114] mozjs102: rebuild to fix ssp dependency
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 7050711a4a0655fdaf641683329c327d11349ea1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 071/114] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From abc6cdbcf46df0297c14f3e9dd1e983dc2376ac6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:49 -0800
Subject: [PATCH 072/114] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 077aa12ebb28e63731aeaae4e6e7b668fe63a583 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 073/114] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 057a22f7f07579876f70a06524b81f7b2f90b3a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 074/114] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index c775c32aeb0f..8af7f4987083 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 42e3ce0627d8d8a7ac09432e31b64fc2edfbd651 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 075/114] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 556de78c322752cf1bab0aba2991eec7f5e4d88d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 076/114] neovim: rebuild to fix ssp dependency
---
srcpkgs/neovim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 81a8fc800c7c..dd2c7a166aa1 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.1
-revision=1
+revision=2
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF"
From 4fae23cde3cbedf720c6991d879bb8029fe0f35a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 077/114] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 35fee0ee9537202fcc93c0232dee6ebd1b668b51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 078/114] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 0c8848405af6745057f4ecbc0067e0b968c07e77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 079/114] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From a7bd9be58c8d6bcfdaeb6c1541c12a6afb1fa30e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:50 -0800
Subject: [PATCH 080/114] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 8890294f63a8de84b0aed8905024c18d8e615716 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 081/114] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4dfaa213e1b8faaa36423fc57c87d085dcc6d890 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 082/114] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 66760fa0074d10a8a542d2f3ff232fb1e5c19539 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 083/114] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 442c5de01c8f6eeabf5d64650d2eca18eaf7a230 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 084/114] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 2e2df3b03054c0ecd82b2cec928143324c8b207b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 085/114] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From d401f1c9a772bcfade1032ead68de5c3736edcef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 086/114] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From fa8a437f2fcf29ad83bf139a660bc161465aed11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 087/114] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From a43be8d041d09cb7e1c799ddbd2304ee4e0e705d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 088/114] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From bf7fa77847c403a58dcc38d0adb79f3b67f253f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:51 -0800
Subject: [PATCH 089/114] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From cc7b2dfcaeac173af24b446d8dce939f9ec7d992 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 090/114] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From ae54668f01802f3ccca6b5dad7ef999e1dda6af8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 091/114] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 909d65a2772c549fafcb7e77ae3f1b97fc694dd6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 092/114] stunnel: rebuild to fix ssp dependency
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 89829ae7e8554160161f39452a1e8071881e6125 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 093/114] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 548d93c3ca90ea08c8cc5ab2940baa6af439932a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 094/114] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 434841462532e9158ff04a1bc7bc1efc9a0058c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 095/114] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From f8d884f287246d09fad89c8589b8fa12a8a2c94a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 096/114] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 0d4f581f6fbda925bcd9859a63e6b0faf2ffa14e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 097/114] swtpm: rebuild to fix ssp dependency
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cf3d9b1ef3e7b5f0499ee11a2688c6afcc3d24c7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:52 -0800
Subject: [PATCH 098/114] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 48bcd82f30bb3ceb7ab00b9ae3d74e0df515e1cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 099/114] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 72a869acb9abcdf608d6dbde6bf64d4b189f4c0a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 100/114] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 6b0bbf44c2696b0f174387834f39c0c989d0d40b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 101/114] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 2f2657fea14b1a89c2203444b7ee7edac6ccba08 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 102/114] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From af5f4ff4b7db16198ca5c7ebe6c7220b440f921f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 103/114] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From c75bdcdf379da6ebd8b6f44b65be7245f00843cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 104/114] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 7cb7c23a54954e6b5f9036084b04edafe310438a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 105/114] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 998ebb24a919200162c0ae149144cd36810c639f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 106/114] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 54e12ff7274dc4df17694dd98dd8f87054ef69e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:53 -0800
Subject: [PATCH 107/114] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 0c5f8cf3b957091d5d2765a137174d18a481a9b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 108/114] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From b977823d97f8a757da38b865b280a9700c62e1eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 109/114] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 03bfbf225d85d34c951316cc10a9b0897567a3fe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 110/114] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 524769188c4b..dcc524fa6860 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From c2f0f6516003c7da41835bcd5969c82f1c4e0c31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 111/114] xbps: rebuild to fix ssp dependency
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 2733650604cf9a650713c29df9b49cd712bdbf6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 112/114] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 444f88c8171149526ecf20b1287c61ef1991d660 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 113/114] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index c660d62461af..b8f90c2f889e 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
makedepends="openssl-devel check-devel pcsclite-devel"
From 2b2fe749b9adb16fd387b737b48234eba94a2f7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:30:54 -0800
Subject: [PATCH 114/114] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (23 preceding siblings ...)
2023-01-09 17:47 ` oreo639
@ 2023-01-09 18:19 ` oreo639
2023-01-17 2:37 ` [PR REVIEW] " CameronNemo
` (21 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-09 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2810 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ stunnel
+ libtls
+ csync
+ qemu-user-static
+ mozjs91
+ mozjs78
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 100882 bytes --]
From 5872a1f93531a51b79368bbd67aca5cdbcf466d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 001/114] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e42350c63bed..3729710846ad 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..65c9e9f7d556 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From fd60b7e515d186622a52e7cca90b6bbd53edb6f2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 002/114] musl: provide libssp_nonshared.a
---
srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
srcpkgs/musl/template | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c
diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 365a6cada1228cb37acf48c5f370e4c6dd39327a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:13:28 -0800
Subject: [PATCH 003/114] build-style/void-cross: disable libssp
---
common/build-style/void-cross.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
make ${makejobs}
make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
+ CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+ CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+ ${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ ${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+ cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
touch ${wrksrc}/.musl_build_done
}
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
--disable-libvtv \
--disable-libsanitizer \
--disable-libstdcxx-pch \
+ --disable-libssp \
--enable-shared \
--enable-threads=posix \
--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
--enable-lto \
--enable-default-pie \
--enable-default-ssp \
- --enable-libssp \
--with-gnu-ld \
--with-gnu-as \
--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
ln -sf libc.so ${f}
done
+
+ cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
else
# Install glibc
cd ${wrksrc}/glibc_build
From 4c552d43c8429b7becc9675c84f8581356afd52d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:06:52 -0800
Subject: [PATCH 004/114] cross-vpkg-dummy: remove libssp
---
srcpkgs/cross-vpkg-dummy/template | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
version=0.39
-revision=1
+revision=2
build_style=meta
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
provides+=" musl-9999_1 musl-devel-9999_1"
- # bundled in musl crosstoolchains but not glibc
- provides+=" libssp-9999_1 libssp-devel-9999_1"
- shlib_provides+=" libssp.so.0"
conflicts+=" musl>=0"
shlib_provides+=" libc.so"
else
From 5f668dd09a200cdf40222029ce1337943681b546 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 005/114] cross-aarch64-linux-gnu: disable libssp
---
srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-aarch64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From cb6061db626bf0f2c7d7fed4fa5e7deb9b2b6f95 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:08 -0800
Subject: [PATCH 006/114] cross-aarch64-linux-musl: disable libssp
---
srcpkgs/cross-aarch64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 3f5b4228cb7b7e38f52ebce5f104ff00447a583c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 007/114] cross-arm-linux-gnueabi: disable libssp
---
srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-arm-linux-gnueabi
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 1d66a9a0872e4922254652886c487e5577e5ce50 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 008/114] cross-arm-linux-gnueabihf: disable libssp
---
srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_glibc_patchver="72-g0f90d6204d"
pkgname=cross-arm-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From da21218f02bde29de09230123f26b2038e16fbc0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 009/114] cross-arm-linux-musleabi: disable libssp
---
srcpkgs/cross-arm-linux-musleabi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 8e87f780875e5a28691ec82fd6f177e4891ea904 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 010/114] cross-arm-linux-musleabihf: disable libssp
---
srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From 901a630392b4c6028b51f79f5938d15a7f89b504 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 011/114] cross-armv7l-linux-gnueabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-armv7l-linux-gnueabihf
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From aa72d32cafe174a4729117d0e2d3a5646717365c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 012/114] cross-armv7l-linux-musleabihf: disable libssp
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
From b7034b5a016d55786e3f92d4f7488d5b88d435ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 013/114] cross-i686-linux-musl: disable libssp
---
srcpkgs/cross-i686-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From c9dc41a49c755a48923c7b2d8c74873a071bb285 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 014/114] cross-i686-pc-linux-gnu: disable libssp
---
srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-i686-pc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From 66d75efa435f07789dc3077da9fbb8bb68d014ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 015/114] cross-mips-linux-musl: disable libssp
---
srcpkgs/cross-mips-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From cad51948120d85ffe30696a5c4a6a648ddc64e4e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 016/114] cross-mips-linux-muslhf: disable libssp
---
srcpkgs/cross-mips-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mips-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From ea70317160e059b0cb004097dd3c99553634e139 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 017/114] cross-mipsel-linux-musl: disable libssp
---
srcpkgs/cross-mipsel-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv"
From feaa7a46483ee352427001a29d91b7790cfa929e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 018/114] cross-mipsel-linux-muslhf: disable libssp
---
srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-mipsel-linux-muslhf
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv"
From 3ceb3ddc1239f8ad148508c0f12e85a3bbbccb6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 019/114] cross-powerpc-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From ae127c081ea42e07ac6883031b5cc65354c90a2b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:09 -0800
Subject: [PATCH 020/114] cross-powerpc-linux-musl: disable libssp
---
srcpkgs/cross-powerpc-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpc-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 373356e8ca763c0d61406ad1d1988f53b637ee57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 021/114] cross-powerpc64-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux"
From 2eb07ce1a6e924a28cbf513044b8482936834795 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 022/114] cross-powerpc64-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"
From 0f63f7a0133f6e8d55b531f8336a08af39250a5c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 023/114] cross-powerpc64le-linux-gnu: disable libssp
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-powerpc64le-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux"
From 004ff5ba793f880d9598f953c7278d1cb4f74135 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 024/114] cross-powerpc64le-linux-musl: disable libssp
---
srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"
From 002b2283250740000d4f9f61e437c423febbe90e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 025/114] cross-powerpcle-linux-gnu: disable libssp
---
srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-gnu
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify"
hostmakedepends="texinfo tar gcc-objc flex perl python3"
From 279d1b8b7939fb4f5a29b242e073354915f0541c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 026/114] cross-powerpcle-linux-musl: disable libssp
---
srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
_linux_version=5.10.4
pkgname=cross-powerpcle-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float"
From 55f489eb76339d006de19f11c6cd15acaff807e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 027/114] cross-x86_64-linux-gnu: disable libssp
---
srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
_linux_version=5.10.4
pkgname=cross-x86_64-linux-gnu
version=0.35
-revision=2
+revision=3
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From e62b95b0e70bd234a67dfc3566c5d9496fd0643a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 17:09:10 -0800
Subject: [PATCH 028/114] cross-x86_64-linux-musl: disable libssp
---
srcpkgs/cross-x86_64-linux-musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
version=0.35
-revision=1
+revision=2
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel
From a238496f46228ffcac8512ed21f0811460623025 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 029/114] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From e12898fef848739f1d46433f7a6ff5db5ce9d5f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 030/114] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From b86d152acdbd223c94788a8a4fcbc9cd6f88bc31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 031/114] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From fffd50fdd6d8d95d697c0c08e608f34553423c16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 032/114] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 6ca2393bf503f28ae37647a66963b0d3e5c98de2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 033/114] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 4f3d01ab8b7fb0c20a670373512aa618831d97b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 034/114] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 41bccfba4986..61f812c9e6fb 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.2
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From bf8d6a644db8301c17831d95cd43164d619f5ab0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 035/114] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 95921e558b772799c6885c8aabac29920ffff022 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 036/114] csync: rebuild to fix ssp dependency
---
srcpkgs/csync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 047f6a246173..c2e4102eb491 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,7 +11,7 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
+distfiles="https://sources.voidlinux-ppc.org/csync-${version}/csync-${version}.tar.xz"
checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
pre_configure() {
From 4abddb8bf6eba6e09f5c4fcef31f98c2d4a951b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:56 -0800
Subject: [PATCH 037/114] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 0776928f2609..a2f4326d0e2f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 984c726dd2ff54b9db25c7a5ea3921a420797819 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 038/114] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From b05f1c5f76be33487070b21a7600c33473ba72c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 039/114] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 8cf9381cb316c570115f577acb2cecfa87ee6c3e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 040/114] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 892dca8c6de1dfa9e67c90883470fef8ac91cda4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 041/114] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From 7b1b2224cf706aaaba079cac996c68b151f0c2ef Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 042/114] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 6ef99b076e4f8a9b91fd48f5596b8e91ea48add5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 043/114] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 5ff080ef4287523349e466bca212a0f166ebb1df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 044/114] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From a1cd5bb70f1ad34080d94133e0cd34297d8088c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 045/114] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 3d6590a664bb8c1b558895560d8bbec0b3ded3c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:57 -0800
Subject: [PATCH 046/114] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From f224a3449c533971bb32c582431a5b77fc41790b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 047/114] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index dddd275b19ac..25fa8de2e4f2 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 4a503d66136df8d6c7154d42572d3be10700a363 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 048/114] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 0726f126ee86a5ce9ee2c22437b6500c84af6d94 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 049/114] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 71674e124babbb50ba0c747bcf8a0364dd2330d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 050/114] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From ba2b9fb077df3b312268b15ba308c62301362dc9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 051/114] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 8c92621a4ffcc2da6275eb157758575056ec3211 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 052/114] kmscon: rebuild to fix ssp dependency
---
srcpkgs/kmscon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index 0683ed5d0ce7..11bebea3f017 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -1,7 +1,7 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config libxslt"
From b8adbccbc8e428c936aece1d2bdeda90e8a13ed1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 053/114] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From d3da2d8fb353776dbff59befbbf3c37e099459bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 054/114] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index da18fc2f93fc..a834c15c77a6 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.7
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 9ec0c97e1c9d7d77b1b4cdde3932592eb09c17cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:58 -0800
Subject: [PATCH 055/114] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From ccfc81a7746041f9b4864653cb3b922e8dd8ea71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 056/114] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From f82f3b34f62678c98a8b24d7c1924dd2ced790b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 057/114] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..623c1303b778 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 6814a1dbee2e1f5770bdd3be5e2539bdb45ece72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 058/114] libtpms: rebuild to fix ssp dependency
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From c14afe99cf902f9451804d52102cc0215489ea5d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 059/114] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 443c16a77360964584a6d605d0a47b8370032ecf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 060/114] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 255dffdebdb524bb6cbb06a96d8393562474028f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 061/114] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 80444b37e67bcc282d4d6f68eae8e117a61fba5c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 062/114] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From ec00fb5e46942d2990bdd746ed0ca72fa5a3cc0d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 063/114] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From c3ed01ef03faafcec394ee854d5112c0cd42cc82 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 064/114] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 6bf905f01a8d84fc704cfe1bc8fcba84939dde89 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:50:59 -0800
Subject: [PATCH 065/114] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index bd1cb0fd71e4..0810993c7458 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=72.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 9d157d0c6d4c994ee376ff179d6c29dc6ea7c072 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 066/114] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 1dbab0ba00c2e36135be1547793842596e32359f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 067/114] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From ca2e558cb5d6b34336fa9e2a4dec14f198764c9a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 068/114] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 1ee8431b66d108c42ba11d0ac4639e4e1bb2fd0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 069/114] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 64b4d45c7d87994ad0b3276869fd8cde71eebd0b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 070/114] mozjs102: rebuild to fix ssp dependency
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429..9af3a545b0d8 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From c537fc1346ef865e3ef64110583f10eb46bc1e7a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 071/114] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From ad81f151c086115f8a1639fe2e815137162c1384 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 072/114] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 3b67efe58834e196110c8c239bdcf089bc51e207 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:00 -0800
Subject: [PATCH 073/114] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2a0eef9fcc6e7f1b3f6607aa7b17234e19424b6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 074/114] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From f1f58bea8a2622c16f57d9bcaba3eb8e9f53a73e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 075/114] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From b98c1a10f7f80b3b87031b5d4ef1516f749e0658 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 076/114] neovim: rebuild to fix ssp dependency
---
srcpkgs/neovim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index da9efa2a4098..bd5ced627cdb 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DCOMPILE_LUA=OFF"
From 08ff28393272b18829ff59de69fac83cbb8fb468 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 077/114] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 860a7b9edab605a986dfe5d40d46d4a83743013d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 078/114] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 550fa845336f7beaad99386c3fe87f8c131278d1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 079/114] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From cc2ddf0cae9a1913bbbfbb6ebc313b9a444c262d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 080/114] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From fc35a4b5eadc590c2d4913149977de7df62c017f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 081/114] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From b4a7fd3b7d953fd502e83ec0393eb777745ba1fd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:01 -0800
Subject: [PATCH 082/114] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From c05638178dd955031073784973da154dca20b65e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 083/114] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 458db841511b56752c8640db598ad1ecbadac359 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 084/114] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 76688ab6f8c7..24e5dd434fcd 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From bdbf9efcfac6b4137ca6e1948336edde65f43f4f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 085/114] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 10e534426d5e495780a49c3c0161b3f8e19bc82b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 086/114] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From c9b3f1d879e33d8e19d12de558396bb250a6abcf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 087/114] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 19e231de4ae91e6192e3846c05404d1e07636593 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 088/114] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From d2410cbb23340040f7e03b97882b4728e581af65 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 089/114] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 2e874388a9e82911c95e79e89a44d02c6c5c49f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 090/114] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 96829be240881b414e19200ad795c826f5a7439f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:02 -0800
Subject: [PATCH 091/114] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 26e5b7702fd11863ea9889899088cd44b9043a17 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 092/114] stunnel: rebuild to fix ssp dependency
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 5f970da7927c85e270aa92466f42bfb78298d0a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 093/114] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 51c598c69f2d15121ee9638848405bec23758415 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 094/114] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index b28ced997ea8..5ac492ff8c44 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.11p3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 7779aaa5e104621a85fed02b70e0993628b03489 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 095/114] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 1717ee9ad834c145b6bf0e646cb0cd51442c6900 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 096/114] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7e266732d990..dab99fe2f020 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.8
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From ce5d250ed2f0473defc11443d566b0e1e51ba216 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 097/114] swtpm: rebuild to fix ssp dependency
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From cebb66b4c71e797fc7776df1d035d0dd336e6fa4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 098/114] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From e1eeb7ec85e8a1530bd0693d12b07963b516c392 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 099/114] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 4181b82e3cb274dff224745d6888a509adbdb4b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:03 -0800
Subject: [PATCH 100/114] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From b4989559ea4800ef7abe2fac97e9efce93fb64a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 101/114] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 2c93a51f121a9de0294a80c17171700632d8ddfe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 102/114] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 1b62aa42142c4e856b65031dd08987e6042ee311 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 103/114] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From f87149b28654e03b8ef27bb5f19cb17d066259d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 104/114] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index c39bd4d837a3..dd6954c1ab31 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.12
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 040f0ff6a5df58205378b90517590ff645831068 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 105/114] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From a24a4f6b296b8500937489bc203605c9d3f20e1c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 106/114] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From c9802ac3fe9759c868a4c0e768765b2466b86bd4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 107/114] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index c487b682d192..3cba34398ee0 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 8edb04e22944ef0830bda651230acb79e4620255 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 108/114] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 921751e1f58f20c3c50a4bcf6f60694e1b2c5712 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:04 -0800
Subject: [PATCH 109/114] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 268a8a3861a726e8d4f82df0207126feb9adc109 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:05 -0800
Subject: [PATCH 110/114] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 845637ce15eee6a8fd4ab2c96343a3d8b036fec2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:05 -0800
Subject: [PATCH 111/114] xbps: rebuild to fix ssp dependency
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 7a5bece66c978478659f0651722ca4c073115340 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:05 -0800
Subject: [PATCH 112/114] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 1771ba7044edafeb68f9b582558f8404b7ac1725 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:05 -0800
Subject: [PATCH 113/114] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 0dbe446ff278799e78df5d16ee031b47dd006e9c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 9 Jan 2023 09:51:05 -0800
Subject: [PATCH 114/114] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (24 preceding siblings ...)
2023-01-09 18:19 ` oreo639
@ 2023-01-17 2:37 ` CameronNemo
2023-01-17 2:40 ` CameronNemo
` (20 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: CameronNemo @ 2023-01-17 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071687149
Comment:
>I will cease maintenance of the project as a whole beginning January 2023.
>
>That means if the project is to continue, somebody else will have to take over. They will need to provide their own build infrastructure as well as everything else, as the public repository hosting will be shutting down as well.
https://voidlinux-ppc.org/news/2022/09/repo-update.html
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (25 preceding siblings ...)
2023-01-17 2:37 ` [PR REVIEW] " CameronNemo
@ 2023-01-17 2:40 ` CameronNemo
2023-01-17 2:42 ` oreo639
` (19 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: CameronNemo @ 2023-01-17 2:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688099
Comment:
Is there any downside to disabling PIE here?
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (26 preceding siblings ...)
2023-01-17 2:40 ` CameronNemo
@ 2023-01-17 2:42 ` oreo639
2023-01-17 2:43 ` oreo639
` (18 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for static-pie, which for some reason doesn't work with qemu-user-static on i686, most distros use `--disable-pie` on all qemu-uer-static targets.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (27 preceding siblings ...)
2023-01-17 2:42 ` oreo639
@ 2023-01-17 2:43 ` oreo639
2023-01-17 2:44 ` oreo639
` (17 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for static-pie, which for some reason doesn't work with qemu-user-static on i686 I , most distros use `--disable-pie` on all qemu-uer-static targets.
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (28 preceding siblings ...)
2023-01-17 2:43 ` oreo639
@ 2023-01-17 2:44 ` oreo639
2023-01-17 2:45 ` oreo639
` (16 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for static-pie, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets.
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (29 preceding siblings ...)
2023-01-17 2:44 ` oreo639
@ 2023-01-17 2:45 ` oreo639
2023-01-17 2:45 ` oreo639
` (15 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 485 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for static-pie, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets.
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1908331
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (30 preceding siblings ...)
2023-01-17 2:45 ` oreo639
@ 2023-01-17 2:45 ` oreo639
2023-01-17 2:46 ` oreo639
` (14 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for `-static-pie`, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets.
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1908331
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (31 preceding siblings ...)
2023-01-17 2:45 ` oreo639
@ 2023-01-17 2:46 ` oreo639
2023-01-17 2:53 ` oreo639
` (13 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for `-static-pie`, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets.
https://salsa.debian.org/qemu-team/qemu/-/merge_requests/16
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1908331
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (32 preceding siblings ...)
2023-01-17 2:46 ` oreo639
@ 2023-01-17 2:53 ` oreo639
2023-01-17 2:53 ` oreo639
` (12 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 692 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for `-static-pie`, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets. (it was also disabled on debian since `-static-pie` is considered dynamically linked by `file` although idk all the details of how it works)
https://salsa.debian.org/qemu-team/qemu/-/merge_requests/16
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1908331
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (33 preceding siblings ...)
2023-01-17 2:53 ` oreo639
@ 2023-01-17 2:53 ` oreo639
2023-01-17 2:56 ` CameronNemo
` (11 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-17 2:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 700 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071688924
Comment:
The currently built qemu-user-static doesn't use pie, glibc 2.36 adds support for `-static-pie`, which causes a build failure on i686, most distros use `--disable-pie` on all qemu-uer-static targets. (it was also disabled on debian since `-static-pie` is considered dynamically linked by `file` although idk all the details of how static-pie works)
https://salsa.debian.org/qemu-team/qemu/-/merge_requests/16
https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1908331
https://github.com/void-linux/void-packages/pull/41138#issuecomment-1362056086
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (34 preceding siblings ...)
2023-01-17 2:53 ` oreo639
@ 2023-01-17 2:56 ` CameronNemo
2023-01-21 2:03 ` [PR PATCH] [Updated] " oreo639
` (10 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: CameronNemo @ 2023-01-17 2:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1071693879
Comment:
I see, thanks for the info.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (35 preceding siblings ...)
2023-01-17 2:56 ` CameronNemo
@ 2023-01-21 2:03 ` oreo639
2023-01-21 2:04 ` [PR REVIEW] " oreo639
` (9 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-21 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2810 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ csync
+ libtls
+ mozjs91
+ mozjs78
+ qemu-user-static
+ stunnel
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 77234 bytes --]
From c0031cf4d836a6857749c07d89a89d3d8f56eec9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/87] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 85c08f13a05fe..1d75e2033cee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e3..65c9e9f7d556c 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From 4d5b8430441ced52d9e3714375c291d36ea15db1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/87] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b55..1606b50df12b9 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From fb6e5cb0662bac1796f4ce98292c34dc13ae68b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:13 -0800
Subject: [PATCH 03/87] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a4..fcedbd78e6c4c 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 5f1244ee3ea6a817aaa154055410b1d5b3d895f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 04/87] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf60..a5f068ffa9764 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From c5d3bc1cd09188afaf7def9c56ff35e45f222407 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 05/87] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a9..5a830b2a11f0f 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 71c0cf55dd922bec378c5d333425cf1b90bb3bf6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 06/87] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c981..6fd6ffc959c00 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From eb7a79930e39b543deec3a02e023106be87f5001 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 07/87] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e8745..83c404962c30e 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From f2d312d861c0dbb2928d6284037b0bbf168fdc44 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 08/87] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d291..6b381a014d66a 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From d73b20ea445a02d2606e51934c8c184e50436e5e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 09/87] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7dbc..63235062a77cb 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 50deb42826dd8224ee2ca51c861d714ba73b9755 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 10/87] csync: rebuild to fix ssp dependency
---
srcpkgs/csync/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/csync/template b/srcpkgs/csync/template
index 3367ce53875c4..ad412d759176d 100644
--- a/srcpkgs/csync/template
+++ b/srcpkgs/csync/template
@@ -1,7 +1,7 @@
# Template file for 'csync'
pkgname=csync
version=0.50.0
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSCONF_INSTALL_DIR=/etc"
conf_files="/etc/csync/csync.conf /etc/csync/csync_exclude.conf"
@@ -11,8 +11,8 @@ short_desc="Client only bidirectional file synchronizer"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://csync.org/"
-distfiles="https://gentoo.osuosl.org/distfiles/3e/csync-${version}.tar.xz"
-checksum=c07526942a93c1e213d354dc45fd61fbc0430c60e109e7a2f0fcaf6213a45c86
+distfiles="https://fossies.org/linux/misc/old/csync-${version}.tar.gz"
+checksum=3743f7db286fe64dd124429c7e28bdab85cf413e91b103ec895de1e2f8cb1fe0
pre_configure() {
sed -i cmake/Modules/DefineCompilerFlags.cmake \
From 679b3766344f619d812397feb8b8aea6643849e7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 11/87] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b13..0d8bc91854562 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 96d64af37c02edde8370a5d67a689d1547851216 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 12/87] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13de..1a2f8482e210b 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From e69c1c85d1289b238b1e1c9eb73e5c2b42fdd9b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 13/87] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f605..932444899d52c 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From ae0d2eeda72f70a865a1140ccfbe7002984cd4c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 14/87] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fdc..3cfd6162ec928 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From e2940e501a01a1b49b1bf14649ce40bc80baf7b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 15/87] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9d..6e13f7374891e 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From 6ed447da0291ade179a62ba168b819c847f81c23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 16/87] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f4104934366..787b29b6eab8d 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From b7b028242ab3e932e20b9e40e36d1d7adba02e80 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 17/87] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508f..e4d168cc4f785 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 1c88fc218482960471da6eff56a77e5748dfd57a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 18/87] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506de..f4539b9623d98 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 5f30acf1b53f1bf088931b6915a100984e0d6037 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 19/87] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f318..73dc786ad70a7 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 24cbf51677e62a2b501d72e16c13b578c1c97a66 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 20/87] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e8..10aaef2095866 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 0ed2449f01492bd48aeb66b935a4e601a42713bd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 21/87] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc91..c297a53304b41 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From b603e46e6505d81666cf1306c4aed167d0302361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 22/87] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896e..2e434be00841a 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 140c9af54255a5c52223d0d343fbd18832ba47ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 23/87] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca4704..02a463bb7b6bc 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From ac0687b8dfdcb130b169f1f04c97aa0d79b149f3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 24/87] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3d..2128f7c2d8126 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 502e4e95f829eca26d641f4dd553ae693a8d2608 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 25/87] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda71..90eb7261085c6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 48155b71d44ad3596dd8646f1273f623c18d48b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 26/87] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa0..661cbdcde1701 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 1f69a352b9c97c89a5416f63f523afb161a650c3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 27/87] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db32024..8a1d6c0cdfca8 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 8bfb6201a2efab1807f5ac42d4303f512e121c11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 28/87] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704c..515fd4dac2a51 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From d34e4997644bfd7e7bb93740eee08566c6f345c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 29/87] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faab..4405948d816d9 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From 5d50bf40cc62c6b24fc0552df240ae3dc776c3c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 30/87] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852d..623c1303b7781 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 0a7cc1349b90dec903b5c1f2fa7849eccee9fbb6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 31/87] libtpms: rebuild to fix ssp dependency
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623c..5ad562dcdb13b 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From 3b5c1299837e227f68909790710c205a482e5ae3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 32/87] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33d..baf111b170ec2 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 4e9cb87f8efb60da581914fbbb89358d40c07e5b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 33/87] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d2875..b92b4dc9ad541 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From aa3fd8b73f743a96824068431ff6b83481c376f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 34/87] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2e..970c1bc6582e6 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From f34281448ac074de5d86c3626b32e41227d315ce Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 35/87] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda1..71409f89930c0 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 80dfe76cc76729d003fe543600188aa9298ae21e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 36/87] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68e..bc2c9c2c25b6b 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 0b198533b5b584bb5e49a2128cc4c6ee47302a10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 37/87] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d59..1054d41943217 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 2aee0821fe1d1db1337e6a082d415f9acaec1764 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 38/87] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97a..b25fe4a20534c 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 3e7e7baf0d844652a96a9bd42d121bf8bbc86eee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 39/87] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda50..311324873e820 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 02d7b2b1e601eccc73aedda3cd8e683cbf892c1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 40/87] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d0..46668d1a9a853 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From ec0c192febceb08bc011c91f9f7461ba8385828f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 41/87] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6e..be8e8d95df856 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From aafed9ad1764ce8e55fea1ce779b73f41fb7b755 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 42/87] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aeade..173ba14bcd477 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 02806008a77eeed999a83ab00530b56ef4467ef3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 43/87] mozjs102: rebuild to fix ssp dependency
---
srcpkgs/mozjs102/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template
index 46e72e65d429d..9af3a545b0d89 100644
--- a/srcpkgs/mozjs102/template
+++ b/srcpkgs/mozjs102/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs102'
pkgname=mozjs102
version=102.5.0
-revision=1
+revision=2
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 18e51eeb694ea2bcdc1cbad2916be2d8104a6b2d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 44/87] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 0000000000000..a44761f8b620b
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d6..70d953dccd7c2 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From a8f1d9948d1f468e682325d43229e0edaeb3119a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 45/87] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 0000000000000..9098aa1ddae92
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b9..403d5bc4a36eb 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 209364e96cd5bdcb24608b71ee2c193b22abc1a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 46/87] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2f..9984cea504eb5 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 92801d06937fef59c5d001f0de2e2a41100ff209 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 47/87] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f49870839..de76d4464b29d 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 63f138aed7c56928ecaebdd00ea2f8b11da50553 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 48/87] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f2884..caaa760fa936a 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 5b07feb59b04db803c66531e5e636c57f9f40ffb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 49/87] neovim: rebuild to fix ssp dependency
---
srcpkgs/neovim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 95c1f07310680..3fbb55291cddd 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
From 2966993b72b55ad5fd210f14e1d15d921124f8b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 50/87] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20e..1623ac116eca5 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From aab2b2868072580f9453cfb3a12fe1e0160153f5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 51/87] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b70..9a1906334682d 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From f9b43b3ff4b6b8ec700a56bc4fa78236535e80ba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 52/87] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a927..c0b363758db09 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From fe017a007463f448e89a683f91831fd66b01d4df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 53/87] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e63..e0169a65dc8cc 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 8e76ab26b85f8bd4c8abb3ea599c8f9da4613aca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 54/87] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb27..1ac9b2f8ea8fa 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From cc3b9a19b0bd42a2f886ffc7164cf24e1f705956 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 55/87] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 5074482451088..b35511fec684f 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 70fde129ce157b96b1d86616f505dafcfd9b5817 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 56/87] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e9..60a00694ef959 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From a9a89116f91e8094f905c7a262d1e4da6bbef16d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 57/87] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb37..d73055e938a9f 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 65f3c877dc5ba486725f033740cc09ebb451112e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 58/87] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab9..48ab199e5686b 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 63ed6f4325fe374170d7638b80bb20934c0289c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 59/87] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead76..589f43d1f0076 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 19c82f4aeabe382c26a3e3d801edc55b5cc4ad9d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 60/87] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec835..16019d7eaec9e 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 5a1aa13457711f42f256d02449646331348e871f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 61/87] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e85..234a5a6da37f9 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From f0054e1501af9010e6c99f8174c009de4ca63fd2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 62/87] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca4..c071d2c25bffb 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 3ccc3bdc6be77a365057cd1ebe793355a5b4d074 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 63/87] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da090..89cf177771ca2 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From 2f7604e606157be7f8fa60f0c8a693fd1d04295c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 64/87] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f254..db3e75ed2b1cb 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From e5d72203c8681ca613626bcd3c905d0418759ee5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 65/87] stunnel: rebuild to fix ssp dependency
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190e..6c766d4c81813 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From 0f138d1c34e3aee7544adf085875aebe15090f93 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 66/87] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c9..1f41155a11ad4 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 4b7b4c025568db75fc4b04d9968b8929dc8286fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 67/87] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b4082..f1278024f4ff8 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From f479251cf5c0127a362ecaf9ae50b64ffb3907b4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 68/87] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f185..3ca728ac94c80 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 0b5014ae1a83e4755fb93cca866cc65b2ddd7f57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 69/87] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9afe569e7a027..0e02322523a76 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.9
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 731f8ec1f3ffeea64a5d383aa5387038da6ca6b9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 70/87] swtpm: rebuild to fix ssp dependency
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5fa..00efbac273740 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From 94ad1dc61c778125f4f85627d698c917fc6b587c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 71/87] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f7065..7f02d2e810f30 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 50288833e6af35c0629a3a5c571e907c208faaf5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 72/87] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210ddd..3da8fe017d465 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 330124006f3cda88c61e0ba262b87a01b0d80808 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 73/87] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc5..db7d539298153 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From d5dbabb4d3721538f08d4ca5fbf63648c69e64c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 74/87] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f9098..84b53fb8fe1fe 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 084992bcef6193596ae021c0ae92fe475de22838 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 75/87] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f24..78ed8c565e144 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From b9c9d74ebdfcbe8501ce7d1f1a405917a37faa48 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 76/87] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b3..c65bd2b6afe35 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 3b7fcab5bfde6932e06c75837fd29225abe03840 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 77/87] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56c..06b3879fd2f95 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 169f01c861e4c688706766ad4f424f9d73079f70 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 78/87] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f04..0bd3d595a3970 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 0d1b53d65fd4bce9a3c262d131304b3a3a560e6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 79/87] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c302..4bf31a0c6469b 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 369d519535d85c41c1557c716ac3f5431f2bf23a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 80/87] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a5..9eb22b07ecaac 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From b26f8cf56f8c5d38dd0daf3378d6583991147545 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 81/87] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af434409..210762b0a7e29 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 5c0ef077212fb81ac4c342faf6da636683abebf2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 82/87] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd15..29f4bd6a95948 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 336476e9d9567c0984176d269325228a7dbc3167 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 83/87] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa68607..9b03976475699 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 62b3bc568a20c246b03e67b7fcf9c7cb518312ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 84/87] xbps: rebuild to fix ssp dependency
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c3..1c9373c498dc8 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 438abad1a8ffade2b4a776b9f4638097faf46cd3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 85/87] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfca..67c9842aceee6 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 1e0dc531ea1681c7224a216d418f4e1e78e6a818 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 86/87] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba7500338..01dea35110262 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From b5b083ae773ea7891932336f821aeecd15a9e111 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 87/87] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e96..23d693a0feb13 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (36 preceding siblings ...)
2023-01-21 2:03 ` [PR PATCH] [Updated] " oreo639
@ 2023-01-21 2:04 ` oreo639
2023-01-21 17:37 ` [PR PATCH] [Updated] " oreo639
` (8 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-21 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1083225314
Comment:
I switched it to fossies https://fossies.org/linux/misc/old/csync-0.50.0.tar.gz/
Let me know if that is a problem.
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (37 preceding siblings ...)
2023-01-21 2:04 ` [PR REVIEW] " oreo639
@ 2023-01-21 17:37 ` oreo639
2023-01-22 5:59 ` [PR REVIEW] " sgn
` (7 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-21 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2820 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ csync
+ libtls
+ mozjs91
+ mozjs78
+ qemu-user-static
+ stunnel
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 75360 bytes --]
From cc6d6c12e455f7f19e190442823c0361f6e28a1f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/85] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 85c08f13a05fe..1d75e2033cee2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e3..65c9e9f7d556c 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -54,7 +54,7 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -684,20 +685,13 @@ libsanitizer_package() {
}
libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
+ short_desc+=" - (Transitional dummy package)"
+ build_style="meta"
}
libstdc++-devel_package() {
From 10d3496873db9ff1a987a7c92fc6f23a20c1be6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/85] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b55..1606b50df12b9 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From eef72e0b0e97053aaa6f8fd3ed9472985532249d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:13 -0800
Subject: [PATCH 03/85] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a4..fcedbd78e6c4c 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 82b5106bbf389fe2d3d15db5c9204985f0533777 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 04/85] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf60..a5f068ffa9764 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 6ebb27b9cd3eec21b9aff0243f608507033d30ec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 05/85] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a9..5a830b2a11f0f 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 20a3fe2513ddd146b183e50c676a1d7c3720075c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 06/85] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c981..6fd6ffc959c00 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 3378cfb94e81bfb2f801433946e7fa9de3272b71 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 07/85] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e8745..83c404962c30e 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From c690c6f98bb23427401461bf85291658a4407f72 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 08/85] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d291..6b381a014d66a 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From de5433f5742e5b1eb3116745dc5c026dc702d224 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 09/85] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7dbc..63235062a77cb 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From d0540f36094e8c20033308f5cd85762498cf8154 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 10/85] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b13..0d8bc91854562 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 76a4420785917f557dadd1b49d8d409cf6f71f77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 11/85] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13de..1a2f8482e210b 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 9872f99b510133be1c63ed3c88748d8840f45213 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 12/85] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f605..932444899d52c 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 1463df43515032199eec32478067cadd7f08ac4d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 13/85] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fdc..3cfd6162ec928 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 0c1e0b216dca00094b01bd21b084fdef66d57ee1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 14/85] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9d..6e13f7374891e 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From cf2fc3f1db0ad17fa6d962085641545c6363e621 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 15/85] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f4104934366..787b29b6eab8d 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 75fef25b790a251a7b50d6bb21dce0457af38c39 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 16/85] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508f..e4d168cc4f785 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 9ecd54a447e3938c40a93bffa2e8bd44bf75efe4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 17/85] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506de..f4539b9623d98 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 95d5c40fba49cf39a4295c463bde3f2a7e83816c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 18/85] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f318..73dc786ad70a7 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 462676dc6eb3363110537ddc4fc213a36dd5f9fe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 19/85] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e8..10aaef2095866 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From eb6c9024e3adb427f3a265623566bfe98e9781b1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 20/85] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc91..c297a53304b41 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From c8b4d4c3cab9c8a2820ae539d42a672d1e895885 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 21/85] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896e..2e434be00841a 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 7a5dade2255833b2f2869ff99e6fb3fa42d2ae91 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 22/85] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca4704..02a463bb7b6bc 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 459880b3693838992271ec42c5ffacd56159a201 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 23/85] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3d..2128f7c2d8126 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 398e7bee7513628d4d8f9859c6291c8b9d2e07c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 24/85] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda71..90eb7261085c6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 6f49b292042c7e0f71817eaa51c3c014cd4d6548 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 25/85] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa0..661cbdcde1701 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From 33e35d88f90e92654c3b5039574b41f781067bd2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 26/85] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db32024..8a1d6c0cdfca8 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 45eb9efc35dc93cbcd8edb9e2ae534934effae81 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 27/85] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704c..515fd4dac2a51 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 6fe81c9294ab6473161e8bc84186b7333979dc11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 28/85] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faab..4405948d816d9 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From e8c5d83e3ba73b5b658aadddf41be2fa00486547 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 29/85] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852d..623c1303b7781 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 70a8c652a601115857dc71e42505e276f8b75b3c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 30/85] libtpms: rebuild to fix ssp dependency
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623c..5ad562dcdb13b 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From ba8c426042da265eaab78755acf693d09a09db1a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 31/85] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33d..baf111b170ec2 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 1de5ea3838e486cb084c8d20f491d6223db11d79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 32/85] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d2875..b92b4dc9ad541 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 2f439611ee1e77b07c7bb288aa908f5d90ccc2b4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 33/85] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2e..970c1bc6582e6 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 111b937f585c95d883ff290359e5bf82f8397c03 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 34/85] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda1..71409f89930c0 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From a6021328b909f2edc61c484461012066fd10b12c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 35/85] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68e..bc2c9c2c25b6b 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From f6fb0bbc54cf12247cca5e2e4050ea6a401b38b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 36/85] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d59..1054d41943217 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 062855fbe11ff056649a10e463aa943aff285908 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 37/85] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97a..b25fe4a20534c 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 9721de20731aafc22ec9ff4070a770b0894565ca Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 38/85] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda50..311324873e820 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 516e25a10255fa04f7d46a8136ed4c6b02f50ccd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 39/85] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d0..46668d1a9a853 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 96223d4086a3fee86d8eef55cc2c3d56f9ab2ae2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 40/85] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6e..be8e8d95df856 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 949c2f73d973017dec5f7f033b8e4516427d610d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 41/85] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aeade..173ba14bcd477 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From bd8be34f54c4a53b2c894f40e84dca68de575911 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 42/85] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 0000000000000..a44761f8b620b
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d6..70d953dccd7c2 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 9b32c163f63d1cb5613bcc0f05e8a69d8f0dc9cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 43/85] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 0000000000000..9098aa1ddae92
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b9..403d5bc4a36eb 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 269ffa8b6323b64ffda810497cc70ff89e944779 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 44/85] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2f..9984cea504eb5 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From bfe4e5c38c91e26a8b2b38988c266c729655c3e2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 45/85] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f49870839..de76d4464b29d 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 40384e3a9c1f9cb50e7d81d1e09f4c8322370f62 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 46/85] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f2884..caaa760fa936a 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 6512b09b5a1f9eb6a2e493717285bfe6af04751f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 47/85] neovim: rebuild to fix ssp dependency
---
srcpkgs/neovim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 95c1f07310680..3fbb55291cddd 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
From c8a608e8f0edba5a2ef035cab4dfc244478ce29b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 48/85] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20e..1623ac116eca5 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 0a1e4e43502c76669db1b30ede756125fb39d240 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 49/85] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b70..9a1906334682d 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 2eee9d6c147da357ec32decf40bea8bb24533e40 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 50/85] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a927..c0b363758db09 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From 1efd144ff35bce2bb4b5d6f3f14ee44259ba2200 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 51/85] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e63..e0169a65dc8cc 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From b73a8ba6d82051c043061847291e5a677d254d97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 52/85] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb27..1ac9b2f8ea8fa 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 058785cdecb25822b8262a66b87d6d528f8ef762 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 53/85] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 5074482451088..b35511fec684f 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From af441314aa6dae7eb5c5f20e98c8c2466454c28c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 54/85] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e9..60a00694ef959 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 71818d34e697fed79005257b793b18a15dc53180 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 55/85] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb37..d73055e938a9f 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From f49968c08832491b72f1a03f0defcf22ac989269 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 56/85] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab9..48ab199e5686b 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From be2aec97ea58509559d9a6b98283848c37df7264 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 57/85] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead76..589f43d1f0076 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 3d37daed87354a9755fe6c30e0bc7b0a2de4cb5b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 58/85] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec835..16019d7eaec9e 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 05d27ddd4ecfea66edc83138bb4b89c3b1a1135a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 59/85] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e85..234a5a6da37f9 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 70ae5dfb0d91159c37553d9a32ba3f3523902c07 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 60/85] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca4..c071d2c25bffb 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From fbf785aade443b43d77555fb2d19557872d5367f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 61/85] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da090..89cf177771ca2 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From e23097138968bc94b1435801647352ceb25301f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 62/85] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f254..db3e75ed2b1cb 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From a33ee738022e0e5994199ddf33a438afe1b52925 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 63/85] stunnel: rebuild to fix ssp dependency
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190e..6c766d4c81813 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From d228d20e7bc95cf107def259495518b182030f47 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 64/85] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c9..1f41155a11ad4 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 80b0c0d60922d2a528b013acf665403e3e72b32c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 65/85] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b4082..f1278024f4ff8 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 32c4a4e24922ded091be7794ed1944be936743c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 66/85] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f185..3ca728ac94c80 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 470220d69cf7417d3771f14e7eaa0b04803c2a53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 67/85] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9afe569e7a027..0e02322523a76 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.9
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 19dea6def1b9001b748e7384e68cdcdf8814d74f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 68/85] swtpm: rebuild to fix ssp dependency
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5fa..00efbac273740 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From ea10adb805717a9667180a14cb14b90c4a5a7793 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 69/85] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f7065..7f02d2e810f30 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From d59af50224821cae318803546dd917343b2e5081 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 70/85] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210ddd..3da8fe017d465 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From a48fb2bf8a9ab37164374ebb47ddaefa1b4dc095 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 71/85] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc5..db7d539298153 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 122be847d2dea989a9c70f7449dbb03451434fb4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 72/85] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f9098..84b53fb8fe1fe 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 992be42b5cbd47a6532500abedc1038c2a947a51 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 73/85] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f24..78ed8c565e144 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 01ff3895337d6f2416e20a7c13da21e6c6044258 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 74/85] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b3..c65bd2b6afe35 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 6dbc682663b0eff95b5d44459651457dbd05fe87 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 75/85] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56c..06b3879fd2f95 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From e824d84fdc5d41870e7d4dafd7dd7364495606eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 76/85] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f04..0bd3d595a3970 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 03e7423c5d605e8169c82028549283e8365e0217 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 77/85] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c302..4bf31a0c6469b 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f685459317774aae4fe89e261d5b1d73c915ff79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 78/85] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a5..9eb22b07ecaac 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From ea1927c5f5ecf5cb38cb1ce28810c053fa9e0c61 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 79/85] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af434409..210762b0a7e29 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From ea8a78a39d6b9d713dc3fb7ba119fb1c055559ae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 80/85] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd15..29f4bd6a95948 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From b53effd0648a04f222b7ead30946317ed3b3c797 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 81/85] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa68607..9b03976475699 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 42ec5730a080f6adbd30955258869b4c7cd5752f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 82/85] xbps: rebuild to fix ssp dependency
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c3..1c9373c498dc8 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 761f9791caacbd10233d3a6c07efc584567f630a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 83/85] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfca..67c9842aceee6 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From d7ab98d263f8fb6439943a400a8a523863027e12 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 84/85] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba7500338..01dea35110262 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 53df56d4756752500d3668a76900d26769e7d7bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 85/85] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e96..23d693a0feb13 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR REVIEW] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (38 preceding siblings ...)
2023-01-21 17:37 ` [PR PATCH] [Updated] " oreo639
@ 2023-01-22 5:59 ` sgn
2023-01-22 7:27 ` [PR PATCH] [Updated] " oreo639
` (6 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2023-01-22 5:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/41294#discussion_r1083395633
Comment:
Let's remove them all together, and let's `gcc` `replaces="libssp>=0 libssp-devel>=0"`
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (39 preceding siblings ...)
2023-01-22 5:59 ` [PR REVIEW] " sgn
@ 2023-01-22 7:27 ` oreo639
2023-02-05 23:34 ` oreo639
` (5 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-01-22 7:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2842 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ libtls
+ mozjs91
+ mozjs78
+ qemu-user-static
+ stunnel
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 76114 bytes --]
From b446723d53e15b1cda7826216ff5f56ddcdad065 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/85] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index ca4bda546fe7..a7c43002a8b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..7b8bf456ebba 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 6079384da76838b9eeb6359dee2e1d876aff3599 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/85] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 01e13f5298d87087adb3b10950e717a6131469bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:13 -0800
Subject: [PATCH 03/85] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 5ea6b814b641edc84a39f7f22a811e3064c829a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 04/85] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From 6ee6a76e89508e05fff46950a0c6d92a0b514585 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 05/85] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 5a92883b0ec095710d91f49453434d01a6f58687 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 06/85] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 7349e7972db630188b3e13d2442fb3426e1b16cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 07/85] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 0f986e82ed934a8a1f13043e991a95aaea3322e0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 08/85] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d29..6b381a014d66 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From f48b9ea9ddc36fba2e734b0022b33df9c5d9b96c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 09/85] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7bedefad32a9d2c2a0850fee25a5d1e717aae3ad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 10/85] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b1..0d8bc9185456 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 1f06d4f8a9a68590105104efb95ecca5a018cd27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 11/85] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 2555efb4da943ecd68c135d14ed094daf89a15a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 12/85] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 5b33a55b59ad06e4cc459e7f6a7c07f80f9a2d23 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 13/85] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From bb4e447832a080a57d066f1bbcc74e314ef6f566 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 14/85] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From 26ea45adf1c67a75b3cd813a21f7749756f3d165 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 15/85] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 58496e3013f2d124258824f0428a2a8b8545e4df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 16/85] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 00f597bdc16b1dcf11c1f8e806b1e991acf69076 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 17/85] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 3e3146fd179fb769127f768a2702ae9bbd512c8f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 18/85] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 72376f110717df2231da3f19576ed031fbbc98c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 19/85] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 19a867c76315b5b26cfc11b56ab3a9976f7098a8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 20/85] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc9..c297a53304b4 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 6e252e3dfddea999748b8bd77e58e5e612467bc4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 21/85] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 3f2ec25ec6156f6c3457d5b0f68244cb5d3a9b59 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 22/85] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From d526bf991e71c79389a90e82b16c56e3da324d6b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 23/85] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 63f70d2c00a5a87b1f23c70f6d9488602ab5d32a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 24/85] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From fc7aeb1da4d02106b040f7a7ae918bf43887fa2a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 25/85] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From e49d5692cb1080f83b21c61744db015d03ca1b21 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 26/85] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db3202..8a1d6c0cdfca 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 006f35b8717237167ebc8cda5729ce629e74bbb0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 27/85] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From acd58d033ad2fd746335d24023ac6ba1b68c48c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 28/85] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From e427d33bafa69aac2086be156e3051d1cdf8a4ab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 29/85] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..623c1303b778 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 4dac45b7372f015b8b75f00e82f4a753ca0d3a60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 30/85] libtpms: rebuild to fix ssp dependency
---
srcpkgs/libtpms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index ad897ea2a623..5ad562dcdb13 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,7 +1,7 @@
# Template file for 'libtpms'
pkgname=libtpms
version=0.9.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libtool automake pkg-config"
makedepends="openssl-devel"
From c45d63039312b805ed2886ee1488bf500eb154f2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 31/85] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 2cc2511c2456f034f2a461ba8fdf6da5e0186eb2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 32/85] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 72bd445acfec58278782454618a0d8abdc81350f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 33/85] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From b9965af3c96ccb6c88b37401e8512624209eb95f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 34/85] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 4133bb033194c573d13a066ef5e8b1eb643b4d3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 35/85] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From e5a8f629edacbe4775e507e324c065abd2b2c7a8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 36/85] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 66a27c8b7bc5df0ae19033c2cf6c378bd37cb6c9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 37/85] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97..b25fe4a20534 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 4aaddd81963da975ab0f8a1ec930aa0ab33530f6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 38/85] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From be7690193796538eef9b8cf0546dbc485f9e650b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 39/85] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 96991385aa18130564004d29b915fe86ba46bcf3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 40/85] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From b8969fdfc98c543899e45e589f55d951092d5ab6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 41/85] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From 08053516041e2ed7f2c240bc85ee9cc9488b4a92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 42/85] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 9f8a0bd34b6699e58c493a4e361eb831dbdb129b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 43/85] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 79106254bc1fa9df6e0fba54f257895dcd81a761 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 44/85] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 0ca3c930ee47ebb5f2e64826cb957b5f7ccbd83e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 45/85] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 2b6e25ebb5e3560e5cdc877eb3ea51c293707461 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 46/85] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From df1f0b3f13c691cce503de5f734e8297086eae56 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 47/85] neovim: rebuild to fix ssp dependency
---
srcpkgs/neovim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 95c1f0731068..3fbb55291cdd 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,7 +1,7 @@
# Template file for 'neovim'
pkgname=neovim
version=0.8.2
-revision=2
+revision=3
build_style=cmake
build_helper="qemu"
configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)"
From 98ed862ce3c45041578c0502c864f9ccc93c41b3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 48/85] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From f7d0af1961b901eb3c84ebd96d280ad5ed6410e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 49/85] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 483a3e6592e5ae181abf4179c95235790bc4fd84 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 50/85] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From b98eee45d37c92faa4174ec53a07aa02253c5040 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 51/85] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From adc259b37398f0bd13486408d3ddf5c48dac3235 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 52/85] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2ace67aeb94b9eb915a1563a96b4c8c27a3e7441 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 53/85] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 241b82197a84f5f854308224248e588aad92e282 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 54/85] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From fd829284879c3cb8a500bb254985fded34205b97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 55/85] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb3..d73055e938a9 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From fa7495d0f0001149b2213b7cbb3d34cb9d91743e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 56/85] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From 992bb7ab3993fc4007322e588a387351972a8eb3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 57/85] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From b87e0b35b66f742f58bb0ffe4cb98d21b99982c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 58/85] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 8aaa0c9e3f6c5e86c97c28d8207cb831c13d8493 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 59/85] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From dc9c1ebfff713b08ee4bdad35dd55face1a0581c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 60/85] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From cbda77f19a2ca89b8490afb73ce74ecd79fcc714 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 61/85] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From ed9077645c289701e3451e6c2043f9b86419f156 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 62/85] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 18c8b833908c85fce098cad2ee87d47ec046a664 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 63/85] stunnel: rebuild to fix ssp dependency
---
srcpkgs/stunnel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 9ad351e9e190..6c766d4c8181 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,7 +1,7 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.66
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
@@ -12,7 +12,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.stunnel.org/"
changelog="https://www.stunnel.org/NEWS.html"
-distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+distfiles="https://www.stunnel.org/archive/${version%%.*}.x/stunnel-${version}.tar.gz"
checksum=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c
pre_check() {
From dd3f67d4a7fc7836306392dbec33b1e828dfb8b8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 64/85] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From e1468b910747f13c6cd22e08b94b348a67ddc305 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 65/85] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b408..f1278024f4ff 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From a9c8b3c2d66ebfafa48f7663e14602dcb8955153 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 66/85] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From f039bb38fd6e5380aa692a392821aa6b8ecac75a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 67/85] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9afe569e7a02..0e02322523a7 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.9
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 40d1e3b676433c69d40fc47b090c384c8668e9d7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 68/85] swtpm: rebuild to fix ssp dependency
---
srcpkgs/swtpm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index d1eeb0a56a5f..00efbac27374 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,7 +1,7 @@
# Template file for 'swtpm'
pkgname=swtpm
version=0.7.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-gnutls ac_cv_path_TCSD="
hostmakedepends="libtool automake pkg-config iproute2 expect
From bcb5a0faf6272e4641b455db45426ecde4e4fb60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 69/85] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 2c4851ee8da57da39fdc12a89b5915922a459b09 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 70/85] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 7cc647ec8fd5e35a8f1cff44c5075563966576d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 71/85] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 50ac4d92ea12e406c7ec0cb4027ad06b82d6f9a5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 72/85] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 6641a3ce9ef35e4427d97668eda4354bb71fb6e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 73/85] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 4798800e8bef396fd94585f2a2ff40fdf3f3876c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 74/85] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 359dc72904e0761bf9c11debfbd5f5a6d244eb15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 75/85] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56..06b3879fd2f9 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From e9f30c4af7a79bbc887ade88d9d312c28dbfdd8b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 76/85] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 76063c4c9b64ac1e0715e843f4ab09adf7fea5b5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 77/85] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From 2332ed10156df89c5b88c4827999fd4744a05379 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 78/85] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a..9eb22b07ecaa 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From ca647e20740703da606aed88c24217db4b4a8eab Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 79/85] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c0651344a05e34924afc138da46be18251a27059 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 80/85] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From 20cd8a8919522ce61a04f4f8273e75f2d05c3384 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 81/85] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 8c65cfb7ec636e1397bf10791f041294bac767e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 82/85] xbps: rebuild to fix ssp dependency
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index b77e15c64d6c..1c9373c498dc 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.59.1
-revision=7
+revision=8
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"
From 3f2dec2405f53e34ccc908ef04d4082eb70860ad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 83/85] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 3c58725f5d2c2f5d1573725866399bb4022d7c59 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 84/85] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 0d56208f3355564006c02eed3342bc9db7fe9aae Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 85/85] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (40 preceding siblings ...)
2023-01-22 7:27 ` [PR PATCH] [Updated] " oreo639
@ 2023-02-05 23:34 ` oreo639
2023-02-12 3:36 ` oreo639
` (4 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-02-05 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2842 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ libtls
+ mozjs91
+ mozjs78
+ qemu-user-static
+ stunnel
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 72357 bytes --]
From 5a25b7d9087e2c6aee92a2db108dcb40e6f2fe33 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/80] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index 3042ced11d4b..669d6d041e51 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..7b8bf456ebba 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 2a08caf3f9b7120d9e907569c6c8515e4342f07c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/80] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 78d31bba4a548ff80c9d1d6f3eea432e5940ffed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:13 -0800
Subject: [PATCH 03/80] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From c5740fd56691fae8248d63cf953b895a9e14ecbe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 04/80] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From a3a7043ea6bda6f8b46c5c513470ef46589705d5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 05/80] PrismLauncher: rebuild to fix ssp dependency
---
srcpkgs/PrismLauncher/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 65dd77a0807a..5a830b2a11f0 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,7 +1,7 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
version=6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
hostmakedepends="extra-cmake-modules openjdk8 pkg-config qt5-host-tools
From 945b4baa0d330c5f40a6e90d2c45a3885245279f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 06/80] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 9fbb645ad3f9bb5f913e575352bc5a008048f8a7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 07/80] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 20ef8b0cc587227e92e925425cbb249c26d68dfd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 08/80] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d29..6b381a014d66 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From eec931427cc4401546514a00d011b2e26c243d14 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 09/80] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From 72850dc1c61745ed8923e97ae7be0a125594d5af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 10/80] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b1..0d8bc9185456 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 8f24d1badb9fba2ef3af7c18b8d24e776141fe92 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 11/80] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From 33724ee0d5908b1375aa7b4b431dc996863a4d85 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 12/80] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 7039e24818d0cb82cb49899e8f09b51b711cc7b6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 13/80] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From c5231b996b6f6f5751c81ec568c8801d0095b851 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 14/80] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From 8100741c5138d1b61d35fad5d5c555c63936b361 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 15/80] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 2e6714dac7845e4f3a0a3ef5852f9464b64f0b20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 16/80] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From d4bdea5284e032349129270b3056b3762e90bcbc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 17/80] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From dc30545c918015516d71d5fc87c1e13728059d16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 18/80] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From 204afefec4842b291becc393f4d211cccd7c97f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 19/80] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From 89a5b211fbed6c85f7abe02fda9869d4d1d051f1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 20/80] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc9..c297a53304b4 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 5cce0d350f7358975aa5bcb9b58c67b5fe0e48c1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 21/80] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 9eba41e0fde544c4da14d176b0d1bd8155d74d83 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 22/80] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 7f580969d2eb9de790e65aa5b4ddb1f1a0480f8d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 23/80] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 78176ba39fe471cac8f99013f2602c77d1c9e142 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 24/80] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From d1b80f1f2d2b152572ebc44b7ceea9cd3ce60a77 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 25/80] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From a83c5c38ebcc26aaf72e15183533b0944396b815 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 26/80] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db3202..8a1d6c0cdfca 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From 0593a829403bd86b13f7dc98bf5d26a8690baa64 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 27/80] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 5776d03a4c5128c8d6968e1df9fa514f55cc59af Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 28/80] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From bce58675ba904c0732800882fa3513d0dbe007a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 29/80] libtls: rebuild to fix ssp dependency
---
srcpkgs/libtls/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 40412b1e7852..623c1303b778 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
# Template file for 'libtls'
pkgname=libtls
version=3.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libtls-only --enable-nc $(vopt_enable asm)"
hostmakedepends="automake libtool"
@@ -35,7 +35,7 @@ esac
post_extract() {
[ -z "$build_option_asm" ] && return 0
- mv ../libressl-portable-asm-${_lssl_asm_ver} .
+ mv libressl-${version}/* .
}
pre_configure() {
From 6414eb7120345370b1f66550d039612d587c84b2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 30/80] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From a35b0ae470dc67bc69c3345ba023977ec0934a19 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 31/80] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 571fb63e5affb560210038ad52e714668b7db369 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 32/80] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From 09e4fee1817f335b4412d43f76c4fdbd061851ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 33/80] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From ed9ab485d7da48130ee8e71a975b0bdfe93a62cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 34/80] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From d0b5a108b40155fece7aee65f1b309bf0beeb11e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 35/80] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 7f8b45079a06ec6f21d0fa711b9b3571645d1c53 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 36/80] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97..b25fe4a20534 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From b4ef4b4867be6d2cc45dc195a767078bfeb46b39 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 37/80] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 21f7b3403a476977df69af2df5548c16846e42c8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 38/80] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 521b059210dae2a7ad522c826a84014f1b339c6a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 39/80] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 8c5591a0c83d013e964b818f7f491c5d6bb69e41 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 40/80] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From b618956c872fa5922c5675cc744d23726657d8f9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 41/80] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 5ee6f43f07c1ff607044c7f18b7983d83bc4b35c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 42/80] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From f3b0602ca56a69b408fb809ac624ba7ffd88c0e6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 43/80] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4e38a67bcc96fe119916f02248b604e229e351bb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 44/80] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 8d235ff5bd73dbf8f9b6c863de04e932cfe80c7b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 45/80] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 5fabccb99b37154a32903b28ac45f2b3c73f1411 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 46/80] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 55195c937b5f0657bd3037c49f70a365458d91d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 47/80] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From fd6ba51a171314c8e96ee7028ab1d86d6b772cfa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 48/80] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From d8ad455f80281165ae3b65ebb3b6ba366afb4eb0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 49/80] openssh: rebuild to fix ssp dependency
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 2eb9f32405e6..e0169a65dc8c 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=9.1p1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
From 623517956029c70690ed643c10f94fb9debafab4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 50/80] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From b62c36e2e8ec96d5ed18dbc7f071b3095cbf6edf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 51/80] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 5925c1805f26fd552cea7760706ba1d3f207748b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 52/80] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 74284e38b5cc4bfff399e01ebe1726dca72f29cf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 53/80] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb3..d73055e938a9 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From fe85d35a21689c7bd3ba5bd45b3d3470f7c63e56 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 54/80] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From c323482c161db55d00a1e53a20ef6933240cd442 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 55/80] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From 13121b86201d419e55b773a3b54808b51d0ca2b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 56/80] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 7e7d1b830491762ad3b0b414a5dfa9ed1337a752 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 57/80] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From 775368168a2fec82fb4624795d602a75eb754127 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 58/80] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 22973b1d6271d5cbd596dfd093bc4a1b9e90abbf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 59/80] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From cc3afe7d40d1f16583b8511e17d91c5b92769654 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 60/80] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 2750c8a66f9c7583d31bc4864eaca12ed66853c6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 61/80] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 879346beff057d5d47c40fa2b6269970f7a9163b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 62/80] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b408..f1278024f4ff 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From dd80e7fb5d7fc7d4c42dec10cb8f1170ac9bba20 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 63/80] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From 3e2eb4d21817a1a0fd5e485953303cc338552e9c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 64/80] swirc: rebuild to fix ssp dependency
---
srcpkgs/swirc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9afe569e7a02..0e02322523a7 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,7 +1,7 @@
# Template file for 'swirc'
pkgname=swirc
version=3.3.9
-revision=1
+revision=2
build_style=configure
configure_args="$(vopt_with notify libnotify)"
make_build_args="PREFIX=/usr"
From 47cbf500cd20930496263a6cb14ad56bad4b7331 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 65/80] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 06d062bb454ff2cbd333d51160f9a329032791f8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 66/80] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From 3a8520ab702da45621c31925a427953bd2c34ef6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 67/80] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From b65d7c5e2c8eed34d6a93487cb6a47c4495fd13c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 68/80] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From d521622769b76e3b340bb429db715e0613d8478d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 69/80] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 3594e77fe44fcf35566654bda5401615da9096c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 70/80] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 624fa7f0a04e2ba544038a3bdaad8ecb21fdcf6f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 71/80] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56..06b3879fd2f9 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 8158b62ecccb1c557d537bbdefd5f0b631202b75 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 72/80] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From 19d60431667ebebe81f0830b0f025d25c9c0ee9b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 73/80] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From f9bbfc467106979b9eea620457529a59c1914cf1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 74/80] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a..9eb22b07ecaa 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From 8e33c481f84f32a61dc9bd35aadab290d9dfe693 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 75/80] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 9d94cd345b53306b0e92e0acee26c5154d4ac8fa Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 76/80] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From d898671e1fde348a2c5911f0f6cbb61989d09d9d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 77/80] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From 4a73d89d9204605370ff1710295d513b16ada5e7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 78/80] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From f4a308420c5932a842c4bbaa6ccbf34346109b5e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 79/80] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 48e0a498ec3361e618e6f6dbe005e44c44847263 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 80/80] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (41 preceding siblings ...)
2023-02-05 23:34 ` oreo639
@ 2023-02-12 3:36 ` oreo639
2023-02-12 5:35 ` sgn
` (3 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: oreo639 @ 2023-02-12 3:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2831 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ libtls
+ mozjs91
+ mozjs78
+ qemu-user-static
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 69375 bytes --]
From fcb14580158ebce37c13caaca4340ebdd8c3c089 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 01/76] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index 504d29f4cb98..e01ca41515bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..7b8bf456ebba 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 62807566e5c38445b4dd41e3993046a825d67286 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 02/76] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From ca1672505d540693d7452ea2ea55318a52b84874 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:13 -0800
Subject: [PATCH 03/76] AusweisApp2: rebuild to fix ssp dependency
---
srcpkgs/AusweisApp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From cc6fb2d14a1ffe76a203baf308433b8bd6cb18d7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 04/76] OTPClient: rebuild to fix ssp dependency
---
srcpkgs/OTPClient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
From a6cc80a471c64b50a1db203e7b125a65a06a4ae0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 05/76] avahi-discover: rebuild to fix ssp dependency
---
srcpkgs/avahi-discover/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
From 3b86706b625c3975b813f34586b941a81f038cc1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 06/76] bitcoin: rebuild to fix ssp dependency
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From ee3461aa5ddbef8f649ab942f451a78dcea308e4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 07/76] botan: rebuild to fix ssp dependency
---
srcpkgs/botan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d29..6b381a014d66 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
From df6a130dc93c735ce9232df2b743a046ca14b680 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 08/76] cJSON: rebuild to fix ssp dependency
---
srcpkgs/cJSON/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
From e1c40fdaf732c13cae86926362aef9e140994b11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 09/76] cups: rebuild to fix ssp dependency
---
srcpkgs/cups/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b1..0d8bc9185456 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
From 9c71f28ff433a246c04c1a02ec7d7b0775f4f4d4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:14 -0800
Subject: [PATCH 10/76] davfs2: rebuild to fix ssp dependency
---
srcpkgs/davfs2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
From bcc3fed040fe58ed3cc479cb061a27614c78b0c5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 11/76] di: rebuild to fix ssp dependency
---
srcpkgs/di/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 80b7302bb541c3d45631d069ad35996d91cd6174 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 12/76] dislocker: rebuild to fix ssp dependency
---
srcpkgs/dislocker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
From 81d792e68e167f36fd18686a71df44fd337cb7f4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 13/76] dnsdist: rebuild to fix ssp dependency
---
srcpkgs/dnsdist/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
From 81b2caea50c989ac9e6b6606a20badde932d987a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 14/76] dovecot: rebuild to fix ssp dependency
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
From 16ece88ca1846edeb658dcff01a5034644fe7955 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 15/76] dovecot-plugin-pigeonhole: rebuild to fix ssp
dependency
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
From 11a31625cf03f430b8525b19bc85017556d5d5d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 16/76] dqlite: rebuild to fix ssp dependency
---
srcpkgs/dqlite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
From 9583a65bddc8099f9e9da896d0522ed39a00d0a2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 17/76] elogind: rebuild to fix ssp dependency
---
srcpkgs/elogind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
From b926a22e33017a669507fdfecb55935e1318fe31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 18/76] flac: rebuild to fix ssp dependency
---
srcpkgs/flac/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
From ede862f1049d964ab45129a1af5eefd2f2dd12ac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:15 -0800
Subject: [PATCH 19/76] fwknop: rebuild to fix ssp dependency
---
srcpkgs/fwknop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc9..c297a53304b4 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
From 32c95e6da2bf3c675602b96957f62683feb5c3a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 20/76] inkscape: rebuild to fix ssp dependency
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
From 1bca2c3053f7b72a38ef8cefb23252cb56253cc7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 21/76] keepalived: rebuild to fix ssp dependency
---
srcpkgs/keepalived/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
From 81ec2e4d7377e617880e53abf273e3f3069baeea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 22/76] keepassxc: rebuild to fix ssp dependency
---
srcpkgs/keepassxc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
From 493c5214abf04970ca5d65df81eb113442a3ea3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 23/76] kitty: rebuild to fix ssp dependency
---
srcpkgs/kitty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
From 96cd1bdad5f478d95026df53a3fef0ac1d0314c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 24/76] kstars: rebuild to fix ssp dependency
---
srcpkgs/kstars/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
From de1c8ac416337283fcfbea51ef0fc9a3d2cd3615 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 25/76] libcotp: rebuild to fix ssp dependency
---
srcpkgs/libcotp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db3202..8a1d6c0cdfca 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
From a2e10703946d48ccaa0ab3672c1540e2dd9e15a4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 26/76] libhtp: rebuild to fix ssp dependency
---
srcpkgs/libhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
From 38f5e8464d199378cf0df274228cc9726d459d17 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:16 -0800
Subject: [PATCH 27/76] libknet1: rebuild to fix ssp dependency
---
srcpkgs/libknet1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
From ccd07e0905deac48430d001278aae6470796aeec Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 28/76] linux-tools: rebuild to fix ssp dependency
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
From 6de6f3c2818a2da1160b02ff99cbde18a1b9467f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 29/76] litecoin: rebuild to fix ssp dependency
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 62b5a30c9c1bcb59faf563af0fab70424a4ae7dd Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 30/76] lldpd: rebuild to fix ssp dependency
---
srcpkgs/lldpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
From ad281e0d147c1f6645c80815702e698137424f37 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 31/76] mariadb: rebuild to fix ssp dependency
---
srcpkgs/mariadb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
From 20315aaa37205a4bad1c474df1f24609ca3320cb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 32/76] massdns: rebuild to fix ssp dependency
---
srcpkgs/massdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
From 502278341618f8a3abf208fb80e8d4cbca31073c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 33/76] mksh: rebuild to fix ssp dependency
---
srcpkgs/mksh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 91784c4c01be93ea4aa56ee453a74aae2af5db6c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 34/76] mkvtoolnix: rebuild to fix ssp dependency
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97..b25fe4a20534 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 317d6ad200778b2f191596909c074b648f5fc125 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 35/76] monero: rebuild to fix ssp dependency
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From eb12916ed3f58de8f438fbb5d8521e04b3513c31 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:17 -0800
Subject: [PATCH 36/76] monero-gui: rebuild to fix ssp dependency
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
From 73b24dd99b33f44e1739207a75681e687eb5e917 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 37/76] monit: rebuild to fix ssp dependency
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
From 244a4d977f0001361a3dd6db5923f2dca0668969 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 38/76] mosh: rebuild to fix ssp dependency
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
From d1ee1bc870e459fbcc54c81c66c617750fec8b11 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 39/76] mozjs78: rebuild to fix ssp dependency
---
srcpkgs/mozjs78/patches/python-3.11.patch | 131 ++++++++++++++++++++++
srcpkgs/mozjs78/template | 2 +-
2 files changed, 132 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs78/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs78/patches/python-3.11.patch b/srcpkgs/mozjs78/patches/python-3.11.patch
new file mode 100644
index 000000000000..a44761f8b620
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/python-3.11.patch
@@ -0,0 +1,131 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, 'rU')
++ stream = open(conf_filename, 'r')
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ not config.substs.get('JS_STANDALONE'):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, 'js', 'src'))
+
+- with open(path, 'rU') as input:
++ with open(path, 'r') as input:
+ r = re.compile('^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?', re.U)
+ for l in input:
+ m = r.match(l)
+
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode='rU'):
++ def _write_file(self, path=None, fh=None, readmode='r'):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, 'rU', encoding='utf-8')
++ args = io.open(args, 'r', encoding='utf-8')
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker='#'):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, 'rU', encoding='utf-8') as input:
++ with io.open(f, 'r', encoding='utf-8') as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ with _open(os.devnull, 'w') as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, 'rU') as input:
++ with _open(self.path, 'r') as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From 1e81500088225406f0cb603ec2ee61bd33439230 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 40/76] mozjs91: rebuild to fix ssp dependency
---
srcpkgs/mozjs91/patches/python-3.11.patch | 130 ++++++++++++++++++++++
srcpkgs/mozjs91/template | 2 +-
2 files changed, 131 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mozjs91/patches/python-3.11.patch
diff --git a/srcpkgs/mozjs91/patches/python-3.11.patch b/srcpkgs/mozjs91/patches/python-3.11.patch
new file mode 100644
index 000000000000..9098aa1ddae9
--- /dev/null
+++ b/srcpkgs/mozjs91/patches/python-3.11.patch
@@ -0,0 +1,130 @@
+From 964834abba3b093385409f1d594835ad94362def Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Thu, 2 Jun 2022 06:27:44 +0000
+Subject: [PATCH] Bug 1769631 - Remove 'U' from 'mode' parameters for various
+ 'open' calls to ensure Python3.11 compatibility
+ r=firefox-build-system-reviewers,glandium
+
+The 'U' flag represents "universal newline". It has been deprecated
+since Python3.3. Since then "universal newline" is the default when a
+file is opened in text mode (not bytes). In Python3.11 using the 'U'
+flag throws errors. There should be no harm in removing 'U' from 'open'
+everywhere it is used, and doing allows the use of Python3.11.
+
+For more reading see: https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
+
+Differential Revision: https://phabricator.services.mozilla.com/D147721
+---
+ dom/base/usecounters.py | 2 +-
+ python/mozbuild/mozbuild/action/process_define_files.py | 2 +-
+ python/mozbuild/mozbuild/backend/base.py | 2 +-
+ python/mozbuild/mozbuild/preprocessor.py | 6 +++---
+ python/mozbuild/mozbuild/util.py | 2 +-
+ python/mozbuild/mozpack/files.py | 4 ++--
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/dom/base/usecounters.py b/dom/base/usecounters.py
+index 780e3b32b2131..7e2c7148ece55 100644
+--- a/dom/base/usecounters.py
++++ b/dom/base/usecounters.py
+@@ -8,7 +8,7 @@
+
+ def read_conf(conf_filename):
+ # Can't read/write from a single StringIO, so make a new one for reading.
+- stream = open(conf_filename, "rU")
++ stream = open(conf_filename, "r")
+
+ def parse_counters(stream):
+ for line_num, line in enumerate(stream):
+diff --git a/python/mozbuild/mozbuild/action/process_define_files.py b/python/mozbuild/mozbuild/action/process_define_files.py
+index f1d401ac26006..aca59d0f05177 100644
+--- a/python/mozbuild/mozbuild/action/process_define_files.py
++++ b/python/mozbuild/mozbuild/action/process_define_files.py
+@@ -36,7 +36,7 @@ def process_define_file(output, input):
+ ) and not config.substs.get("JS_STANDALONE"):
+ config = PartialConfigEnvironment(mozpath.join(topobjdir, "js", "src"))
+
+- with open(path, "rU") as input:
++ with open(path, "r") as input:
+ r = re.compile(
+ "^\s*#\s*(?P<cmd>[a-z]+)(?:\s+(?P<name>\S+)(?:\s+(?P<value>\S+))?)?", re.U
+ )
+diff --git a/python/mozbuild/mozbuild/backend/base.py b/python/mozbuild/mozbuild/backend/base.py
+index 7bc1986d863b5..b64a70946863d 100644
+--- a/python/mozbuild/mozbuild/backend/base.py
++++ b/python/mozbuild/mozbuild/backend/base.py
+@@ -272,7 +272,7 @@ def post_build(self, config, output, jobs, verbose, status):
+ return status
+
+ @contextmanager
+- def _write_file(self, path=None, fh=None, readmode="rU"):
++ def _write_file(self, path=None, fh=None, readmode="r"):
+ """Context manager to write a file.
+
+ This is a glorified wrapper around FileAvoidWrite with integration to
+diff --git a/python/mozbuild/mozbuild/preprocessor.py b/python/mozbuild/mozbuild/preprocessor.py
+index f7820b9c91473..857f1a6c9bfd1 100644
+--- a/python/mozbuild/mozbuild/preprocessor.py
++++ b/python/mozbuild/mozbuild/preprocessor.py
+@@ -531,7 +531,7 @@ def get_output_file(path, encoding=None):
+
+ if args:
+ for f in args:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ self.processFile(input=input, output=out)
+ if depfile:
+ mk = Makefile()
+@@ -860,7 +860,7 @@ def do_include(self, args, filters=True):
+ args = self.applyFilters(args)
+ if not os.path.isabs(args):
+ args = os.path.join(self.curdir, args)
+- args = io.open(args, "rU", encoding="utf-8")
++ args = io.open(args, "r", encoding="utf-8")
+ except Preprocessor.Error:
+ raise
+ except Exception:
+@@ -914,7 +914,7 @@ def do_error(self, args):
+ def preprocess(includes=[sys.stdin], defines={}, output=sys.stdout, marker="#"):
+ pp = Preprocessor(defines=defines, marker=marker)
+ for f in includes:
+- with io.open(f, "rU", encoding="utf-8") as input:
++ with io.open(f, "r", encoding="utf-8") as input:
+ pp.processFile(input=input, output=output)
+ return pp.includes
+
+diff --git a/python/mozbuild/mozbuild/util.py b/python/mozbuild/mozbuild/util.py
+index b09f1646988f0..4f1e0cdc5f568 100644
+--- a/python/mozbuild/mozbuild/util.py
++++ b/python/mozbuild/mozbuild/util.py
+@@ -236,7 +236,7 @@ class FileAvoidWrite(BytesIO):
+ still occur, as well as diff capture if requested.
+ """
+
+- def __init__(self, filename, capture_diff=False, dry_run=False, readmode="rU"):
++ def __init__(self, filename, capture_diff=False, dry_run=False, readmode="r"):
+ BytesIO.__init__(self)
+ self.name = filename
+ assert type(capture_diff) == bool
+diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
+index 1d8a1ed2d8a7e..a295a67b5a34f 100644
+--- a/python/mozbuild/mozpack/files.py
++++ b/python/mozbuild/mozpack/files.py
+@@ -554,7 +554,7 @@ def inputs(self):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ with _open(os.devnull, "w") as output:
+ pp.processFile(input=input, output=output)
+
+@@ -611,7 +611,7 @@ def copy(self, dest, skip_if_older=True):
+ pp = Preprocessor(defines=self.defines, marker=self.marker)
+ pp.setSilenceDirectiveWarnings(self.silence_missing_directive_warnings)
+
+- with _open(self.path, "rU") as input:
++ with _open(self.path, "r") as input:
+ pp.processFile(input=input, output=dest, depfile=deps_out)
+
+ dest.close()
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
From b52bf1dd98391a3fe75866f44d467d7a6cdd859b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 41/76] msg2: rebuild to fix ssp dependency
---
srcpkgs/msg2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
From 26ce5e761c397c8512b3018e070d1604fa93f742 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 42/76] namecoin: rebuild to fix ssp dependency
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From 23eb1d9b349a2e8333c5affd9c551a1e693a746e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:18 -0800
Subject: [PATCH 43/76] navit: rebuild to fix ssp dependency
---
srcpkgs/navit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
From 80382ff292e125d9fb5ed63522d5bb50f7b5cbcc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 44/76] ngircd: rebuild to fix ssp dependency
---
srcpkgs/ngircd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
From 9b4f17d7188ed4e6fa05c723fb5f72db7ab8f2ed Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 45/76] ntp: rebuild to fix ssp dependency
---
srcpkgs/ntp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
From 5b3fd8fe0855b3378f03fa218e4b59fa93dadd5e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 46/76] openjdk8: rebuild to fix ssp dependency
---
srcpkgs/openjdk8/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
From cbcf08c2fd24c77097c7082b12e9d6893fcaa081 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 47/76] p0f: rebuild to fix ssp dependency
---
srcpkgs/p0f/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
From b7d45ab8a312c7772a84fc883495d94ea9da43b0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 48/76] pam_ssh_agent_auth: rebuild to fix ssp dependency
---
srcpkgs/pam_ssh_agent_auth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
From 29360bf505805b269d8472cf6a010f4ba48c2e87 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 49/76] pax: rebuild to fix ssp dependency
---
srcpkgs/pax/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
From 8582ffac46f489c426d0d35e0f5e1fa42f3483e3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 50/76] powertop: rebuild to fix ssp dependency
---
srcpkgs/powertop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb3..d73055e938a9 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
From 0642176fe65d9d945c2fbdc61cf6a879064a3753 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:19 -0800
Subject: [PATCH 51/76] qemu: rebuild to fix ssp dependency
---
srcpkgs/qemu/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
From e0eb3d47f67ea7e4040156201ff9c13c00569c10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 52/76] qemu-user-static: rebuild to fix ssp dependency
---
srcpkgs/qemu-user-static/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..589f43d1f007 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,11 +2,11 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
- --enable-linux-user --disable-system --static"
+ --enable-linux-user --disable-system --disable-pie --static"
hostmakedepends="pkg-config perl python3 ninja"
makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel"
short_desc="QEMU User-mode emulators (statically compiled)"
From a194eeeafc8a647a1638c187d4ad9cfb3d06f890 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 53/76] qtox: rebuild to fix ssp dependency
---
srcpkgs/qtox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
From 498faedae55eb5cd02bb13ef3f9fb9adce69e3ee Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 54/76] raft: rebuild to fix ssp dependency
---
srcpkgs/raft/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
From f470b3bfd2cdec3961549bc7c4361b8a31091974 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 55/76] ruby: rebuild to fix ssp dependency
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
From 4bc6cbf6b3a3ff4d05f111ba3b70d9c986e9e4a1 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 56/76] sox: rebuild to fix ssp dependency
---
srcpkgs/sox/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
From c90d6dff44b37db4a205c2862c85187d1c1f0736 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 57/76] stlink: rebuild to fix ssp dependency
---
srcpkgs/stlink/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
From 5dbedd083240b9bede8a7bcef7d9ccf9c6c3b840 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 58/76] subtle: rebuild to fix ssp dependency
---
srcpkgs/subtle/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
From 6472c9cb07f4bc7778deb65bda60a872d0739fac Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:20 -0800
Subject: [PATCH 59/76] sudo: rebuild to fix ssp dependency
---
srcpkgs/sudo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b408..f1278024f4ff 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
From 18e52e860abb91d13f827a1f6477a750dea50ad3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 60/76] svt-av1: rebuild to fix ssp dependency
---
srcpkgs/svt-av1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
From f93f94c21d36a242cb33edcb41382b2d0f0abe60 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 61/76] tcltls: rebuild to fix ssp dependency
---
srcpkgs/tcltls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
From 19dafed2697646d60ac9b35bb4a784d935f8de1b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 62/76] testdisk: rebuild to fix ssp dependency
---
srcpkgs/testdisk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
From a78e4130e3878387ec743128488021f890431ed3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 63/76] thc-hydra: rebuild to fix ssp dependency
---
srcpkgs/thc-hydra/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
From 42eebb5a3d93c637642961226482694dfad49436 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 64/76] thunderbird: rebuild to fix ssp dependency
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From e502d98bfd863135f5d9860c1d8d553bee927a73 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 65/76] tini: rebuild to fix ssp dependency
---
srcpkgs/tini/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
From 1f1f5cf30ee2e78f1ca8b47bda04cdad6a1f8d1d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:21 -0800
Subject: [PATCH 66/76] tinyssh: rebuild to fix ssp dependency
---
srcpkgs/tinyssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
From 6b3b83bad0f76dabb36059f4ed977eab356bc8d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 67/76] tor: rebuild to fix ssp dependency
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56..06b3879fd2f9 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From b6bb5f72951705349d71842c814262203ad6ce10 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 68/76] tpm2-tools: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
From dc7c0f3812ccbda989b2b8b22bd2b79f13f6b58f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 69/76] tpm2-totp: rebuild to fix ssp dependency
---
srcpkgs/tpm2-totp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
From e3801d41cc5cd3fa9782cd687056510e2fa1358b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 70/76] tpm2-tss: rebuild to fix ssp dependency
---
srcpkgs/tpm2-tss/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a..9eb22b07ecaa 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
From faa294d38bed07efd3f5a5fa8ffe711960a7483f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 71/76] vlc: rebuild to fix ssp dependency
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 6d41e4d1e25b0306ff1fe297d5f131898bac5ce0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 72/76] vte3: rebuild to fix ssp dependency
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
From fd38c1dbcc4a48c9991460a154c9558a6a71d196 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 73/76] wesnoth: rebuild to fix ssp dependency
---
srcpkgs/wesnoth/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
From d1935bee564cea6ac099befbdfe9e1e530b2c5a0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:22 -0800
Subject: [PATCH 74/76] xnec2c: rebuild to fix ssp dependency
---
srcpkgs/xnec2c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
From 3def2def0c9560a9ca2b978bf1abf6a2f99f2d0e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 75/76] yubico-piv-tool: rebuild to fix ssp dependency
---
srcpkgs/yubico-piv-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
From 49bb821acc71900ba6ffaa8338e4b656ca4b2a16 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 20 Jan 2023 17:42:23 -0800
Subject: [PATCH 76/76] zmap: rebuild to fix ssp dependency
---
srcpkgs/zmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (42 preceding siblings ...)
2023-02-12 3:36 ` oreo639
@ 2023-02-12 5:35 ` sgn
2023-02-12 6:04 ` sgn
` (2 subsequent siblings)
46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2023-02-12 5:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2849 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ ~~libtls~~ (already updated)
+ mozjs91
+ mozjs78
+ qemu-user-static
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 38274 bytes --]
From 5b4823c7cabe1e3f053355cbc4ab248a3bd7c6bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 1/3] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index 504d29f4cb98..e01ca41515bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..7b8bf456ebba 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 9abd93701466542cb5df39ad69e4faab3c881414 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 2/3] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From b9ba8e2e7f820bb9162c366c39ad3402e16847d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 12 Feb 2023 10:29:44 +0700
Subject: [PATCH 3/3] *: rebuild for libssp removal
---
srcpkgs/AusweisApp2/template | 2 +-
srcpkgs/OTPClient/template | 2 +-
srcpkgs/avahi-discover/template | 2 +-
srcpkgs/bitcoin/template | 2 +-
srcpkgs/botan/template | 2 +-
srcpkgs/cJSON/template | 2 +-
srcpkgs/cups/template | 2 +-
srcpkgs/davfs2/template | 2 +-
srcpkgs/di/template | 2 +-
srcpkgs/dislocker/template | 2 +-
srcpkgs/dnsdist/template | 2 +-
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
srcpkgs/dovecot/template | 2 +-
srcpkgs/dqlite/template | 2 +-
srcpkgs/elogind/template | 2 +-
srcpkgs/flac/template | 2 +-
srcpkgs/fwknop/template | 2 +-
srcpkgs/inkscape/template | 2 +-
srcpkgs/keepalived/template | 2 +-
srcpkgs/keepassxc/template | 2 +-
srcpkgs/kitty/template | 2 +-
srcpkgs/kstars/template | 2 +-
srcpkgs/libcotp/template | 2 +-
srcpkgs/libhtp/template | 2 +-
srcpkgs/libknet1/template | 2 +-
srcpkgs/linux-tools/template | 2 +-
srcpkgs/litecoin/template | 2 +-
srcpkgs/lldpd/template | 2 +-
srcpkgs/mariadb/template | 2 +-
srcpkgs/massdns/template | 2 +-
srcpkgs/mksh/template | 2 +-
srcpkgs/mkvtoolnix/template | 2 +-
srcpkgs/monero-gui/template | 2 +-
srcpkgs/monero/template | 2 +-
srcpkgs/monit/template | 2 +-
srcpkgs/mosh/template | 2 +-
srcpkgs/mozjs78/template | 2 +-
srcpkgs/mozjs91/template | 2 +-
srcpkgs/msg2/template | 2 +-
srcpkgs/namecoin/template | 2 +-
srcpkgs/navit/template | 2 +-
srcpkgs/ngircd/template | 2 +-
srcpkgs/ntp/template | 2 +-
srcpkgs/openjdk8/template | 2 +-
srcpkgs/p0f/template | 2 +-
srcpkgs/pam_ssh_agent_auth/template | 2 +-
srcpkgs/pax/template | 2 +-
srcpkgs/powertop/template | 2 +-
srcpkgs/qemu-user-static/template | 2 +-
srcpkgs/qemu/template | 2 +-
srcpkgs/qtox/template | 2 +-
srcpkgs/raft/template | 2 +-
srcpkgs/ruby/template | 2 +-
srcpkgs/sox/template | 2 +-
srcpkgs/stlink/template | 2 +-
srcpkgs/subtle/template | 2 +-
srcpkgs/sudo/template | 2 +-
srcpkgs/svt-av1/template | 2 +-
srcpkgs/tcltls/template | 2 +-
srcpkgs/testdisk/template | 2 +-
srcpkgs/thc-hydra/template | 2 +-
srcpkgs/thunderbird/template | 2 +-
srcpkgs/tini/template | 2 +-
srcpkgs/tinyssh/template | 2 +-
srcpkgs/tor/template | 2 +-
srcpkgs/tpm2-tools/template | 2 +-
srcpkgs/tpm2-totp/template | 2 +-
srcpkgs/tpm2-tss/template | 2 +-
srcpkgs/vlc/template | 2 +-
srcpkgs/vte3/template | 2 +-
srcpkgs/wesnoth/template | 2 +-
srcpkgs/xnec2c/template | 2 +-
srcpkgs/yubico-piv-tool/template | 2 +-
srcpkgs/zmap/template | 2 +-
74 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d29..6b381a014d66 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b1..0d8bc9185456 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc9..c297a53304b4 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db3202..8a1d6c0cdfca 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97..b25fe4a20534 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 3260ea0dae1d..70d953dccd7c 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=5
+revision=6
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
diff --git a/srcpkgs/mozjs91/template b/srcpkgs/mozjs91/template
index 73fcd54ee76b..403d5bc4a36e 100644
--- a/srcpkgs/mozjs91/template
+++ b/srcpkgs/mozjs91/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs91'
pkgname=mozjs91
version=91.7.1
-revision=2
+revision=3
build_wrksrc=js/src
build_style=gnu-configure
build_helper=rust
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb3..d73055e938a9 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..08c4147dfe42 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b408..f1278024f4ff 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56..06b3879fd2f9 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a..9eb22b07ecaa 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (43 preceding siblings ...)
2023-02-12 5:35 ` sgn
@ 2023-02-12 6:04 ` sgn
2023-02-12 6:05 ` sgn
2023-02-12 6:05 ` [PR PATCH] [Merged]: " sgn
46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2023-02-12 6:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2849 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ ~~libtls~~ (already updated)
+ mozjs91
+ mozjs78
+ qemu-user-static
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 37082 bytes --]
From 5b4823c7cabe1e3f053355cbc4ab248a3bd7c6bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 1/3] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index 504d29f4cb989..e01ca41515bd6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e3..7b8bf456ebbae 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c6..0000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c6..0000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 9abd93701466542cb5df39ad69e4faab3c881414 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 2/3] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b55..1606b50df12b9 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 32a6fab34961dbd32011338a0229fd794fcd1e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 12 Feb 2023 10:29:44 +0700
Subject: [PATCH 3/3] *: rebuild for libssp removal
---
srcpkgs/AusweisApp2/template | 2 +-
srcpkgs/OTPClient/template | 2 +-
srcpkgs/avahi-discover/template | 2 +-
srcpkgs/bitcoin/template | 2 +-
srcpkgs/botan/template | 2 +-
srcpkgs/cJSON/template | 2 +-
srcpkgs/cups/template | 2 +-
srcpkgs/davfs2/template | 2 +-
srcpkgs/di/template | 2 +-
srcpkgs/dislocker/template | 2 +-
srcpkgs/dnsdist/template | 2 +-
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
srcpkgs/dovecot/template | 2 +-
srcpkgs/dqlite/template | 2 +-
srcpkgs/elogind/template | 2 +-
srcpkgs/flac/template | 2 +-
srcpkgs/fwknop/template | 2 +-
srcpkgs/inkscape/template | 2 +-
srcpkgs/keepalived/template | 2 +-
srcpkgs/keepassxc/template | 2 +-
srcpkgs/kitty/template | 2 +-
srcpkgs/kstars/template | 2 +-
srcpkgs/libcotp/template | 2 +-
srcpkgs/libhtp/template | 2 +-
srcpkgs/libknet1/template | 2 +-
srcpkgs/linux-tools/template | 2 +-
srcpkgs/litecoin/template | 2 +-
srcpkgs/lldpd/template | 2 +-
srcpkgs/mariadb/template | 2 +-
srcpkgs/massdns/template | 2 +-
srcpkgs/mksh/template | 2 +-
srcpkgs/mkvtoolnix/template | 2 +-
srcpkgs/monero-gui/template | 2 +-
srcpkgs/monero/template | 2 +-
srcpkgs/monit/template | 2 +-
srcpkgs/mosh/template | 2 +-
srcpkgs/msg2/template | 2 +-
srcpkgs/namecoin/template | 2 +-
srcpkgs/navit/template | 2 +-
srcpkgs/ngircd/template | 2 +-
srcpkgs/ntp/template | 2 +-
srcpkgs/openjdk8/template | 2 +-
srcpkgs/p0f/template | 2 +-
srcpkgs/pam_ssh_agent_auth/template | 2 +-
srcpkgs/pax/template | 2 +-
srcpkgs/powertop/template | 2 +-
srcpkgs/qemu/template | 2 +-
srcpkgs/qtox/template | 2 +-
srcpkgs/raft/template | 2 +-
srcpkgs/ruby/template | 2 +-
srcpkgs/sox/template | 2 +-
srcpkgs/stlink/template | 2 +-
srcpkgs/subtle/template | 2 +-
srcpkgs/sudo/template | 2 +-
srcpkgs/svt-av1/template | 2 +-
srcpkgs/tcltls/template | 2 +-
srcpkgs/testdisk/template | 2 +-
srcpkgs/thc-hydra/template | 2 +-
srcpkgs/thunderbird/template | 2 +-
srcpkgs/tini/template | 2 +-
srcpkgs/tinyssh/template | 2 +-
srcpkgs/tor/template | 2 +-
srcpkgs/tpm2-tools/template | 2 +-
srcpkgs/tpm2-totp/template | 2 +-
srcpkgs/tpm2-tss/template | 2 +-
srcpkgs/vlc/template | 2 +-
srcpkgs/vte3/template | 2 +-
srcpkgs/wesnoth/template | 2 +-
srcpkgs/xnec2c/template | 2 +-
srcpkgs/yubico-piv-tool/template | 2 +-
srcpkgs/zmap/template | 2 +-
71 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a4..fcedbd78e6c4c 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf60..a5f068ffa9764 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c981..6fd6ffc959c00 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e8745..83c404962c30e 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d291..6b381a014d66a 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7dbc..63235062a77cb 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b13..0d8bc91854562 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13de..1a2f8482e210b 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f605..932444899d52c 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fdc..3cfd6162ec928 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9d..6e13f7374891e 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508f..e4d168cc4f785 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f4104934366..787b29b6eab8d 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506de..f4539b9623d98 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f318..73dc786ad70a7 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e8..10aaef2095866 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc91..c297a53304b41 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896e..2e434be00841a 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca4704..02a463bb7b6bc 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3d..2128f7c2d8126 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda71..90eb7261085c6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa0..661cbdcde1701 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db32024..8a1d6c0cdfca8 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704c..515fd4dac2a51 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faab..4405948d816d9 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33d..baf111b170ec2 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d2875..b92b4dc9ad541 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2e..970c1bc6582e6 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda1..71409f89930c0 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68e..bc2c9c2c25b6b 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d59..1054d41943217 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97a..b25fe4a20534c 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d0..46668d1a9a853 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda50..311324873e820 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6e..be8e8d95df856 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aeade..173ba14bcd477 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2f..9984cea504eb5 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f49870839..de76d4464b29d 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f2884..caaa760fa936a 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20e..1623ac116eca5 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b70..9a1906334682d 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a927..c0b363758db09 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb27..1ac9b2f8ea8fa 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 5074482451088..b35511fec684f 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e9..60a00694ef959 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb37..d73055e938a9f 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab9..48ab199e5686b 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec835..16019d7eaec9e 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e85..234a5a6da37f9 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca4..c071d2c25bffb 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da090..89cf177771ca2 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f254..db3e75ed2b1cb 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c9..1f41155a11ad4 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b4082..f1278024f4ff8 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f185..3ca728ac94c80 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f7065..7f02d2e810f30 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210ddd..3da8fe017d465 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc5..db7d539298153 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f9098..84b53fb8fe1fe 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f24..78ed8c565e144 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b3..c65bd2b6afe35 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56c..06b3879fd2f95 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f04..0bd3d595a3970 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c302..4bf31a0c6469b 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a5..9eb22b07ecaac 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af434409..210762b0a7e29 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd15..29f4bd6a95948 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa68607..9b03976475699 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfca..67c9842aceee6 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba7500338..01dea35110262 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e96..23d693a0feb13 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Updated] gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (44 preceding siblings ...)
2023-02-12 6:04 ` sgn
@ 2023-02-12 6:05 ` sgn
2023-02-12 6:05 ` [PR PATCH] [Merged]: " sgn
46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2023-02-12 6:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2849 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/oreo639/void-packages libssp
https://github.com/void-linux/void-packages/pull/41294
gcc: disable libssp
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ ~~libtls~~ (already updated)
+ mozjs91
+ mozjs78
+ qemu-user-static
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41294.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libssp-41294.patch --]
[-- Type: text/x-diff, Size: 37818 bytes --]
From 5b4823c7cabe1e3f053355cbc4ab248a3bd7c6bf Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:11:13 -0800
Subject: [PATCH 1/4] gcc: disable libssp
---
common/shlibs | 1 -
srcpkgs/gcc/template | 26 +++++---------------------
srcpkgs/libssp | 1 -
srcpkgs/libssp-devel | 1 -
4 files changed, 5 insertions(+), 24 deletions(-)
delete mode 120000 srcpkgs/libssp
delete mode 120000 srcpkgs/libssp-devel
diff --git a/common/shlibs b/common/shlibs
index 504d29f4cb98..e01ca41515bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -70,7 +70,6 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
-libssp.so.0 libssp-4.4.0_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a20af7c0ef2e..7b8bf456ebba 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -4,7 +4,7 @@
pkgname=gcc
version=12.2.0
-revision=1
+revision=2
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
_gmp_version=6.2.1
@@ -32,7 +32,8 @@ checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
nopie=yes
lib32disabled=yes
bootstrap=yes
-replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0"
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
+ libssp>=0 libssp-devel>=0"
_have_gccgo=yes
@@ -54,11 +55,10 @@ else
fi
makedepends="zlib-devel libzstd-devel"
depends="binutils libgcc-devel-${version}_${revision}
- libstdc++-devel-${version}_${revision} libssp-devel-${version}_${revision}"
+ libstdc++-devel-${version}_${revision}"
checkdepends="dejagnu"
subpackages="libgcc libgomp libgomp-devel libatomic libatomic-devel"
-subpackages+=" libssp libssp-devel"
build_options="ada gnatboot"
build_options_default="ada"
@@ -290,6 +290,7 @@ do_configure() {
_args+=" --with-linker-hash-style=$_hash"
_args+=" --disable-sjlj-exceptions"
_args+=" --disable-target-libiberty"
+ _args+=" --disable-libssp"
mkdir -p build
cd build
@@ -683,23 +684,6 @@ libsanitizer_package() {
}
}
-libssp-devel_package() {
- depends="libssp>=${_minorver}"
- short_desc+=" - SSP (StackSmashingProtection) library - development files"
- pkg_install() {
- vmove "usr/lib/libssp*.a"
- vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
- }
-}
-
-libssp_package() {
- short_desc+=" - SSP (StackSmashingProtection) library"
- pkg_install() {
- vmove "usr/lib/libssp.so*"
- vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
- }
-}
-
libstdc++-devel_package() {
depends="libstdc++>=${_minorver}"
short_desc+=" - Standard C++ Library - development files"
diff --git a/srcpkgs/libssp b/srcpkgs/libssp
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libssp-devel b/srcpkgs/libssp-devel
deleted file mode 120000
index b08d5af5795c..000000000000
--- a/srcpkgs/libssp-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
From 9abd93701466542cb5df39ad69e4faab3c881414 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sun, 25 Dec 2022 16:12:11 -0800
Subject: [PATCH 2/4] musl: provide libssp_nonshared.a
---
srcpkgs/musl/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index afb33cd868b5..1606b50df12b 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=12
+revision=13
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
@@ -21,6 +21,8 @@ post_build() {
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
+ $CC $CFLAGS $LDFLAGS -fpie -c ${FILESDIR}/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+ $AR r libssp_nonshared.a __stack_chk_fail_local.o
}
do_install() {
# Move everything to /usr.
@@ -37,6 +39,8 @@ do_install() {
vman ${FILESDIR}/getent.1
vbin getconf
vman ${FILESDIR}/getconf.1
+ # additional symbols from libssp_nonshared (necessary on i386 and PPC)
+ vinstall libssp_nonshared.a 755 usr/lib
# Fake ldconfig
ln -s true ${DESTDIR}/usr/bin/ldconfig
From 32a6fab34961dbd32011338a0229fd794fcd1e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 12 Feb 2023 10:29:44 +0700
Subject: [PATCH 3/4] *: rebuild for libssp removal
---
srcpkgs/AusweisApp2/template | 2 +-
srcpkgs/OTPClient/template | 2 +-
srcpkgs/avahi-discover/template | 2 +-
srcpkgs/bitcoin/template | 2 +-
srcpkgs/botan/template | 2 +-
srcpkgs/cJSON/template | 2 +-
srcpkgs/cups/template | 2 +-
srcpkgs/davfs2/template | 2 +-
srcpkgs/di/template | 2 +-
srcpkgs/dislocker/template | 2 +-
srcpkgs/dnsdist/template | 2 +-
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
srcpkgs/dovecot/template | 2 +-
srcpkgs/dqlite/template | 2 +-
srcpkgs/elogind/template | 2 +-
srcpkgs/flac/template | 2 +-
srcpkgs/fwknop/template | 2 +-
srcpkgs/inkscape/template | 2 +-
srcpkgs/keepalived/template | 2 +-
srcpkgs/keepassxc/template | 2 +-
srcpkgs/kitty/template | 2 +-
srcpkgs/kstars/template | 2 +-
srcpkgs/libcotp/template | 2 +-
srcpkgs/libhtp/template | 2 +-
srcpkgs/libknet1/template | 2 +-
srcpkgs/linux-tools/template | 2 +-
srcpkgs/litecoin/template | 2 +-
srcpkgs/lldpd/template | 2 +-
srcpkgs/mariadb/template | 2 +-
srcpkgs/massdns/template | 2 +-
srcpkgs/mksh/template | 2 +-
srcpkgs/mkvtoolnix/template | 2 +-
srcpkgs/monero-gui/template | 2 +-
srcpkgs/monero/template | 2 +-
srcpkgs/monit/template | 2 +-
srcpkgs/mosh/template | 2 +-
srcpkgs/msg2/template | 2 +-
srcpkgs/namecoin/template | 2 +-
srcpkgs/navit/template | 2 +-
srcpkgs/ngircd/template | 2 +-
srcpkgs/ntp/template | 2 +-
srcpkgs/openjdk8/template | 2 +-
srcpkgs/p0f/template | 2 +-
srcpkgs/pam_ssh_agent_auth/template | 2 +-
srcpkgs/pax/template | 2 +-
srcpkgs/powertop/template | 2 +-
srcpkgs/qemu/template | 2 +-
srcpkgs/qtox/template | 2 +-
srcpkgs/raft/template | 2 +-
srcpkgs/ruby/template | 2 +-
srcpkgs/sox/template | 2 +-
srcpkgs/stlink/template | 2 +-
srcpkgs/subtle/template | 2 +-
srcpkgs/sudo/template | 2 +-
srcpkgs/svt-av1/template | 2 +-
srcpkgs/tcltls/template | 2 +-
srcpkgs/testdisk/template | 2 +-
srcpkgs/thc-hydra/template | 2 +-
srcpkgs/thunderbird/template | 2 +-
srcpkgs/tini/template | 2 +-
srcpkgs/tinyssh/template | 2 +-
srcpkgs/tor/template | 2 +-
srcpkgs/tpm2-tools/template | 2 +-
srcpkgs/tpm2-totp/template | 2 +-
srcpkgs/tpm2-tss/template | 2 +-
srcpkgs/vlc/template | 2 +-
srcpkgs/vte3/template | 2 +-
srcpkgs/wesnoth/template | 2 +-
srcpkgs/xnec2c/template | 2 +-
srcpkgs/yubico-piv-tool/template | 2 +-
srcpkgs/zmap/template | 2 +-
71 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/srcpkgs/AusweisApp2/template b/srcpkgs/AusweisApp2/template
index 066428431b1a..fcedbd78e6c4 100644
--- a/srcpkgs/AusweisApp2/template
+++ b/srcpkgs/AusweisApp2/template
@@ -1,7 +1,7 @@
# Template file for 'AusweisApp2'
pkgname=AusweisApp2
version=1.24.1
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
diff --git a/srcpkgs/OTPClient/template b/srcpkgs/OTPClient/template
index 409c3942acf6..a5f068ffa976 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,7 +1,7 @@
# Template file for 'OTPClient'
pkgname=OTPClient
version=2.4.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="gtk+3-devel libglib-devel libgcrypt-devel libpng-devel
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index 5f6841269c98..6fd6ffc959c0 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -5,7 +5,7 @@
#
pkgname=avahi-discover
version=0.8
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 478a7a66e874..83c404962c30 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index e84584086d29..6b381a014d66 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,7 +1,7 @@
# Template file for 'botan'
pkgname=botan
version=2.19.3
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="doxygen python3"
makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel"
diff --git a/srcpkgs/cJSON/template b/srcpkgs/cJSON/template
index a3f6914ca7db..63235062a77c 100644
--- a/srcpkgs/cJSON/template
+++ b/srcpkgs/cJSON/template
@@ -1,7 +1,7 @@
# Template file for 'cJSON'
pkgname=cJSON
version=1.7.15
-revision=1
+revision=2
build_style=cmake
short_desc="Ultralightweight JSON parser in ANSI C"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 90e9fdf3f0b1..0d8bc9185456 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
# Template file for 'cups'
pkgname=cups
version=2.4.2
-revision=2
+revision=3
build_style=gnu-configure
make_install_args="BUILDROOT=${DESTDIR}"
hostmakedepends="gnutls-devel pkg-config
diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template
index 1e62bc8df13d..1a2f8482e210 100644
--- a/srcpkgs/davfs2/template
+++ b/srcpkgs/davfs2/template
@@ -1,7 +1,7 @@
# Template file for 'davfs2'
pkgname=davfs2
version=1.6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="dav_user=nobody dav_group=network --enable-largefile"
hostmakedepends="automake gettext gettext-devel neon-devel tar"
diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 2fdd80a61f60..932444899d52 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,7 +1,7 @@
# Template file for 'di'
pkgname=di
version=4.51
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="A disk information utility"
maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index a5580034c6fd..3cfd6162ec92 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
# Template file for 'dislocker'
pkgname=dislocker
version=0.7.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DLIB_INSTALL_DIR=lib"
makedepends="mbedtls-devel fuse-devel"
diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template
index ae8f79ceb2f9..6e13f7374891 100644
--- a/srcpkgs/dnsdist/template
+++ b/srcpkgs/dnsdist/template
@@ -1,7 +1,7 @@
# Template file for 'dnsdist'
pkgname=dnsdist
version=1.7.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2
--with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index ac13321e4508..e4d168cc4f78 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,7 +1,7 @@
# Template file for 'dovecot-plugin-pigeonhole'
pkgname=dovecot-plugin-pigeonhole
version=0.5.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--with-dovecot=${XBPS_CROSS_BASE}/usr/lib/dovecot
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 45f410493436..787b29b6eab8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
# revbump dovecot-plugin-pigeonhole when updating dovecot!
pkgname=dovecot
version=2.3.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--disable-static --with-pam --with-mysql --with-pgsql --with-lucene
diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template
index d6f1ed50506d..f4539b9623d9 100644
--- a/srcpkgs/dqlite/template
+++ b/srcpkgs/dqlite/template
@@ -1,7 +1,7 @@
# Template file for 'dqlite'
pkgname=dqlite
version=1.13.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config automake libtool"
makedepends="sqlite-devel raft-devel"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 79186a193f31..73dc786ad70a 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=246.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index 2611f41ffb7e..10aaef209586 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -1,7 +1,7 @@
# Template file for 'flac'
pkgname=flac
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin
--with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests"
diff --git a/srcpkgs/fwknop/template b/srcpkgs/fwknop/template
index 0a795ba08fc9..c297a53304b4 100644
--- a/srcpkgs/fwknop/template
+++ b/srcpkgs/fwknop/template
@@ -1,7 +1,7 @@
# Template file for 'fwknop'
pkgname=fwknop
version=2.6.10
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-gpg=${XBPS_CROSS_BASE}/usr/bin/gpg"
hostmakedepends="iptables"
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 3d239f62f896..2e434be00841 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=6
+revision=7
build_style=cmake
# builds executables then runs checks
# some tests still fail on musl: https://gitlab.com/inkscape/inkscape/-/issues/2241
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 1d2ef18ca470..02a463bb7b6b 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,7 +1,7 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.2.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index 863d615b6aa3..2128f7c2d812 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,7 +1,7 @@
# Template file for 'keepassxc'
pkgname=keepassxc
version=2.7.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
-DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 717f6ca2fda7..90eb7261085c 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,7 +1,7 @@
# Template file for 'kitty'
pkgname=kitty
version=0.26.5
-revision=1
+revision=2
pycompile_dirs="usr/lib/kitty"
hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index ebbb3140fcaa..661cbdcde170 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,7 +1,7 @@
# Template file for 'kstars'
pkgname=kstars
version=3.6.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
kconfig"
diff --git a/srcpkgs/libcotp/template b/srcpkgs/libcotp/template
index b396b0db3202..8a1d6c0cdfca 100644
--- a/srcpkgs/libcotp/template
+++ b/srcpkgs/libcotp/template
@@ -1,7 +1,7 @@
# Template file for 'libcotp'
pkgname=libcotp
version=1.2.8
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libbaseencode-devel libgcrypt-devel"
diff --git a/srcpkgs/libhtp/template b/srcpkgs/libhtp/template
index 38ceef8b9704..515fd4dac2a5 100644
--- a/srcpkgs/libhtp/template
+++ b/srcpkgs/libhtp/template
@@ -1,7 +1,7 @@
# Template file for 'libhtp'
pkgname=libhtp
version=0.5.36
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
makedepends="zlib-devel"
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 6a62a9626faa..4405948d816d 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,7 +2,7 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.24
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-static $(vopt_enable man)"
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 77e4cccaaa33..baf111b170ec 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=5.10.4
-revision=10
+revision=11
build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 37f3a348d287..b92b4dc9ad54 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=9
+revision=10
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
diff --git a/srcpkgs/lldpd/template b/srcpkgs/lldpd/template
index bb103044a0c2..970c1bc6582e 100644
--- a/srcpkgs/lldpd/template
+++ b/srcpkgs/lldpd/template
@@ -1,7 +1,7 @@
# Template file for 'lldpd'
pkgname=lldpd
version=1.0.11
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-privsep-chroot=/var/empty"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8d9b0c42edda..71409f89930c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.5.10
-revision=3
+revision=4
build_style=cmake
build_helper=qemu
configure_args="-DBUILD_CONFIG=mysql_release
diff --git a/srcpkgs/massdns/template b/srcpkgs/massdns/template
index d26c67a19e68..bc2c9c2c25b6 100644
--- a/srcpkgs/massdns/template
+++ b/srcpkgs/massdns/template
@@ -1,7 +1,7 @@
# Template file for 'massdns'
pkgname=massdns
version=1.0.0
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="High-performance DNS stub resolver for bulk lookups and reconnaissance"
maintainer="Antoine Guilbaud <antoine.guilbaud@yahoo.fr>"
diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template
index c64174cf33d5..1054d4194321 100644
--- a/srcpkgs/mksh/template
+++ b/srcpkgs/mksh/template
@@ -1,7 +1,7 @@
# Template file for 'mksh'
pkgname=mksh
version=R59c
-revision=1
+revision=2
checkdepends="perl ed"
short_desc="MirBSD Korn Shell"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 4ae71a274a97..b25fe4a20534 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=73.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 03f852bf6f6d..46668d1a9a85 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.18.1.2
-revision=2
+revision=3
_monero_version=0.18.1.2
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 7385c102eda5..311324873e82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.18.1.2
-revision=2
+revision=3
# the revision monero uses as a submodule for the specific version
_randomx_gitrev="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index b10596c639d6..be8e8d95df85 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.32.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 105cbae7aead..173ba14bcd47 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.4.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template
index 473b3c4ec4d2..9984cea504eb 100644
--- a/srcpkgs/msg2/template
+++ b/srcpkgs/msg2/template
@@ -1,7 +1,7 @@
# Template file for 'msg2'
pkgname=msg2
version=1.2.0
-revision=2
+revision=3
build_style=cmake
short_desc="Output a blue arrow and a white message on the commandline"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 8af7f4987083..de76d4464b29 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template
index 58bc4610f288..caaa760fa936 100644
--- a/srcpkgs/navit/template
+++ b/srcpkgs/navit/template
@@ -1,7 +1,7 @@
# Template file for 'navit'
pkgname=navit
version=0.5.6
-revision=3
+revision=4
build_style=cmake
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 7634efdfdc20..1623ac116eca 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,7 +1,7 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index fa88f33f92b7..9a1906334682 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 25a93b300a92..c0b363758db0 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
# TODO: config files?
pkgname=openjdk8
version=8u322b04
-revision=3
+revision=4
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
diff --git a/srcpkgs/p0f/template b/srcpkgs/p0f/template
index 26643a09fdb2..1ac9b2f8ea8f 100644
--- a/srcpkgs/p0f/template
+++ b/srcpkgs/p0f/template
@@ -1,7 +1,7 @@
# Template file for 'p0f'
pkgname=p0f
version=3.09b
-revision=3
+revision=4
makedepends="libpcap-devel"
short_desc="Passive OS fingerprinting tool"
maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 507448245108..b35511fec684 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,7 +1,7 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-openssl-header-check"
hostmakedepends="perl"
diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template
index bb2913645b6e..60a00694ef95 100644
--- a/srcpkgs/pax/template
+++ b/srcpkgs/pax/template
@@ -1,7 +1,7 @@
# Template file for 'pax'
pkgname=pax
version=20201030
-revision=1
+revision=2
build_wrksrc="${pkgname}"
hostmakedepends="cpio"
short_desc="POSIX archiving utility pax from MirOS (plus tar and cpio)"
diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template
index 0a7ef1b15fb3..d73055e938a9 100644
--- a/srcpkgs/powertop/template
+++ b/srcpkgs/powertop/template
@@ -1,7 +1,7 @@
# Template file for 'powertop'
pkgname=powertop
version=2.15
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake autoconf-archive gettext-devel libtool pkg-config"
makedepends="ncurses-devel pciutils-devel libnl3-devel"
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index b19ccffa0bab..48ab199e5686 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu-user-static
pkgname=qemu
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var
--disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie
diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index b559aea1ec83..16019d7eaec9 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,7 +1,7 @@
# Template file for 'qtox'
pkgname=qtox
version=1.17.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DUPDATE_CHECK=OFF
-DGIT_DESCRIBE=${version}
diff --git a/srcpkgs/raft/template b/srcpkgs/raft/template
index 39cd14ecf3e8..234a5a6da37f 100644
--- a/srcpkgs/raft/template
+++ b/srcpkgs/raft/template
@@ -1,7 +1,7 @@
# Template file for 'raft'
pkgname=raft
version=0.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-example=no"
hostmakedepends="pkg-config autoconf automake libtool"
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index a2b2684db3ca..c071d2c25bff 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -3,7 +3,7 @@ _ruby_abiver=3.1.0
pkgname=ruby
version=3.1.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --disable-rpath
PKG_CONFIG=/usr/bin/pkg-config"
diff --git a/srcpkgs/sox/template b/srcpkgs/sox/template
index 1f5f8a43da09..89cf177771ca 100644
--- a/srcpkgs/sox/template
+++ b/srcpkgs/sox/template
@@ -1,7 +1,7 @@
# Template file for 'sox'
pkgname=sox
version=14.4.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-distro=Void"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template
index 44788bd15f25..db3e75ed2b1c 100644
--- a/srcpkgs/stlink/template
+++ b/srcpkgs/stlink/template
@@ -1,7 +1,7 @@
# Template file for 'stlink'
pkgname=stlink
version=1.7.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSTLINK_UDEV_RULES_DIR=/usr/lib/udev/rules.d
-DSTLINK_MODPROBED_DIR=/usr/lib/modprobe.d -DSTLINK_LIBRARY_PATH=/usr/lib"
diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index a60bd06c540c..1f41155a11ad 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
# Template file for 'subtle'
pkgname=subtle
version=0.11.6579
-revision=3
+revision=4
hostmakedepends="python3 mercurial ruby-devel pkg-config"
makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
libXinerama-devel libXrandr-devel libXtst-devel"
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index 6de8fe42b408..f1278024f4ff 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,7 +1,7 @@
# Template file for 'sudo'
pkgname=sudo
version=1.9.12p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ignore-dot --with-insults=disabled --with-all-insults --with-env-editor
--enable-shell-sets-home --enable-noargs-shell --without-sendmail
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index f51642d31f18..3ca728ac94c8 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,7 +1,7 @@
# Template file for 'svt-av1'
pkgname=svt-av1
version=1.4.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="nasm"
short_desc="AV1-compliant encoder/decoder library core"
diff --git a/srcpkgs/tcltls/template b/srcpkgs/tcltls/template
index ffd98107f706..7f02d2e810f3 100644
--- a/srcpkgs/tcltls/template
+++ b/srcpkgs/tcltls/template
@@ -1,7 +1,7 @@
# Template file for 'tcltls'
pkgname=tcltls
version=1.7.22
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-tcl=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index 556cb92210dd..3da8fe017d46 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -1,7 +1,7 @@
# Template file for 'testdisk'
pkgname=testdisk
version=7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 40ade86edbcc..db7d53929815 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=4
+revision=5
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1 DATADIR=/share/hydra"
makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d1b1a1c1f909..84b53fb8fe1f 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=102.6.1
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
index fb18b07ba3f2..78ed8c565e14 100644
--- a/srcpkgs/tini/template
+++ b/srcpkgs/tini/template
@@ -1,7 +1,7 @@
# Template file for 'tini'
pkgname=tini
version=0.19.0
-revision=1
+revision=2
build_style=cmake
short_desc="Tiny but valid init for containers"
maintainer="PWA COLLECTIVE <pwa@cya.cx>"
diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index 65e4ec6e7b8b..c65bd2b6afe3 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,7 +1,7 @@
# Template file for 'tinyssh'
pkgname=tinyssh
version=20220801
-revision=1
+revision=2
build_style=gnu-makefile
make_dirs="/etc/tinyssh 0755 root root"
depends="ucspi-tcp"
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 1a656a99cb56..06b3879fd2f9 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.7.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
diff --git a/srcpkgs/tpm2-tools/template b/srcpkgs/tpm2-tools/template
index 258495e196f0..0bd3d595a397 100644
--- a/srcpkgs/tpm2-tools/template
+++ b/srcpkgs/tpm2-tools/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tools'
pkgname=tpm2-tools
version=5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake libtool pkg-config $(vopt_if man pandoc)"
makedepends="libcurl-devel openssl-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-totp/template b/srcpkgs/tpm2-totp/template
index ebdf3f359c30..4bf31a0c6469 100644
--- a/srcpkgs/tpm2-totp/template
+++ b/srcpkgs/tpm2-totp/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-totp'
pkgname=tpm2-totp
version=0.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf autoconf-archive automake doxygen libtool pkg-config $(vopt_if man pandoc)"
makedepends="dracut mkinitcpio qrencode-devel tpm2-tss-devel"
diff --git a/srcpkgs/tpm2-tss/template b/srcpkgs/tpm2-tss/template
index ddf3c7ce4a9a..9eb22b07ecaa 100644
--- a/srcpkgs/tpm2-tss/template
+++ b/srcpkgs/tpm2-tss/template
@@ -1,7 +1,7 @@
# Template file for 'tpm2-tss'
pkgname=tpm2-tss
version=3.2.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-weakcrypto --with-crypto=mbed --disable-fapi"
hostmakedepends="autoconf-archive automake libtool pkg-config doxygen libltdl-devel"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 25867af43440..210762b0a7e2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.18
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 01229a0c7dd1..29f4bd6a9594 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.70.1
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index dcc524fa6860..9b0397647569 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.16.6
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index 3943bf196dfc..67c9842aceee 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -1,7 +1,7 @@
# Template file for 'xnec2c'
pkgname=xnec2c
version=4.4.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel which"
makedepends="gtk+3-devel"
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index 432dba750033..01dea3511026 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,7 +6,7 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.3.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DGENERATE_MAN_PAGES=OFF"
hostmakedepends="automake libtool gengetopt pkg-config perl"
diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template
index b35b850480e9..23d693a0feb1 100644
--- a/srcpkgs/zmap/template
+++ b/srcpkgs/zmap/template
@@ -1,7 +1,7 @@
# Template file for 'zmap'
pkgname=zmap
version=2.1.1
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf"
hostmakedepends="flex byacc gengetopt pkg-config"
From e9dddada84a1baf3fcfafc838ded047cf354a801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 12 Feb 2023 13:04:38 +0700
Subject: [PATCH 4/4] qemu-user-static: rebuild for remove libssp, disable PIE
---
srcpkgs/qemu-user-static/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 399ac617ead7..08c4147dfe42 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -2,7 +2,7 @@
# This package should be updated together with qemu
pkgname=qemu-user-static
version=7.1.0
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp
^ permalink raw reply [flat|nested] 48+ messages in thread* Re: [PR PATCH] [Merged]: gcc: disable libssp
2022-12-26 2:16 [PR PATCH] gcc: disable libssp oreo639
` (45 preceding siblings ...)
2023-02-12 6:05 ` sgn
@ 2023-02-12 6:05 ` sgn
46 siblings, 0 replies; 48+ messages in thread
From: sgn @ 2023-02-12 6:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2698 bytes --]
There's a merged pull request on the void-packages repository
gcc: disable libssp
https://github.com/void-linux/void-packages/pull/41294
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
~~NOTE: Before this PR can be merged https://github.com/void-linux/void-packages/pull/41229 should be merged first and the cross compilers should finish building completely before this PR is merged.~~ Done.
It can be verified using:
`XBPS_TARGET_ARCH=... xbps-query -MRX libssp --repository=https://repo-default.voidlinux.org/current/aarch64/musl/ --repository=https://repo-default.voidlinux.org/current/musl/ --repository=https://repo-default.voidlinux.org/current/aarch64/`
Edit: I wrote a script here https://gist.github.com/oreo639/ba4dd28e022681467b1239f5375624c8
#### Testing the changes
- I tested the changes in this PR: **briefly**
There is no reason to have libssp when it is already implemented in the libc.
Most distros don't ship it (i.e. Fedora, Arch, Debian, Alpine, etc), for example, Debian stopped shipping it after gcc 4.2.
It also breaks qemu-user-static due to function/symbol redefinition errors between glibc and libssp.
libssp mostly exists as a fallback implementation.
According to Rich Felker:
https://gcc.gnu.org/legacy-ml/gcc/2020-01/msg00459.html
Q: Should gcc stop trying use musl on i386/powerpc here: ... and fall back to libssp instead?
> Absolutely not. libssp is unsafe and creates new vulns/attack surface by doing introspective stuff after the process is already *known to be* in a compromised state. It should never be used. musl's __stack_chk_fail is safe and terminates immediately.
All the packages that are bumped in this PR have been compiled. The following needed some changes to fix building:
+ ~~csync~~ (removed package)
+ ~~libtls~~ (already updated)
+ mozjs91
+ mozjs78
+ qemu-user-static
[ci skip]
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 48+ messages in thread