From b446723d53e15b1cda7826216ff5f56ddcdad065 Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 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 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 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 " From 7bedefad32a9d2c2a0850fee25a5d1e717aae3ad Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 " From 5b33a55b59ad06e4cc459e7f6a7c07f80f9a2d23 Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 " From e5a8f629edacbe4775e507e324c065abd2b2c7a8 Mon Sep 17 00:00:00 2001 From: oreo639 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 " From 66a27c8b7bc5df0ae19033c2cf6c378bd37cb6c9 Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 +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[a-z]+)(?:\s+(?P\S+)(?:\s+(?P\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 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 +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[a-z]+)(?:\s+(?P\S+)(?:\s+(?P\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 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 " From 0ca3c930ee47ebb5f2e64826cb957b5f7ccbd83e Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 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 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 " From 2ace67aeb94b9eb915a1563a96b4c8c27a3e7441 Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 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 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 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 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 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 " 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 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 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 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 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 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 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 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 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 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 " From 6641a3ce9ef35e4427d97668eda4354bb71fb6e3 Mon Sep 17 00:00:00 2001 From: oreo639 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 " From 4798800e8bef396fd94585f2a2ff40fdf3f3876c Mon Sep 17 00:00:00 2001 From: oreo639 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 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 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 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 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 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 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 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 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 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 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 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"