From f6ed3ae35af4872afee9915001b216681c0d84de Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:49:41 +0100 Subject: [PATCH 01/34] libsodium: update to 1.0.19. --- common/shlibs | 2 +- srcpkgs/libsodium/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 393b7436cefa2..10b456bfc44a6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1770,7 +1770,7 @@ libnftnl.so.11 libnftnl-1.1.2_1 libfcgi.so.0 fcgi-2.4.0_2 libdshconfig.so.1 libdshconfig-0.20.13_1 libpar2.so.1 libpar2-0.4_1 -libsodium.so.23 libsodium-1.0.15_1 +libsodium.so.26 libsodium-1.0.19_1 libstrophe.so.0 libstrophe-0.10.1_2 libganv-1.so.1 ganv-1.4.2_1 libblas.so.3 blas-3.5.0_1 diff --git a/srcpkgs/libsodium/template b/srcpkgs/libsodium/template index 240d6591fd76b..18ed0ebb86d84 100644 --- a/srcpkgs/libsodium/template +++ b/srcpkgs/libsodium/template @@ -1,15 +1,16 @@ # Template file for 'libsodium' pkgname=libsodium -version=1.0.18 +version=1.0.19 revision=1 build_style=gnu-configure configure_args="lt_cv_prog_compiler_static_works=yes" short_desc="Modern and easy-to-use crypto library" -maintainer="Orphaned " +maintainer="Duncaen " license="ISC" homepage="https://libsodium.org/" +changelog="https://raw.githubusercontent.com/jedisct1/libsodium/master/ChangeLog" distfiles="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz" -checksum=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 +checksum=018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea post_install() { vlicense LICENSE From 7ac6a0386f7ce6774cb2f83b16726d1e7f691556 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:37 +0100 Subject: [PATCH 02/34] 0ad: rebuild for libsodium-1.0.19_1 --- srcpkgs/0ad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template index 68cdd1e60d211..c743d97764c7b 100644 --- a/srcpkgs/0ad/template +++ b/srcpkgs/0ad/template @@ -1,7 +1,7 @@ # Template file for '0ad' pkgname=0ad version=0.0.26 -revision=8 +revision=9 archs="x86_64* i686* aarch64* armv7l* ppc64le*" hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang" makedepends="SDL2-devel boost-devel gloox-devel libcurl-devel libenet-devel From 5bfb5df2c07509f0f1f174551bb1cc6e49661ac1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:37 +0100 Subject: [PATCH 03/34] EternalTerminal: rebuild for libsodium-1.0.19_1 --- srcpkgs/EternalTerminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index 8289682c88b15..2c9701d93e714 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal version=6.2.1 -revision=4 +revision=5 # revisions used for the specific versions of submodules. # they can be found in the external/ directory of the source code. _sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b" From eb8fdc813da16bed32f021ee9117ef9fe29fb34a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 04/34] MEGAsdk: rebuild for libsodium-1.0.19_1 --- srcpkgs/MEGAsdk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index a0bdb5957bed2..87a66ab49c9f5 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.7.3c -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" make_build_args='LIBTOOLFLAGS="--tag=CXX"' From e38554a425805e6dde05b6571110030a079dba68 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 05/34] bcachefs-tools: rebuild for libsodium-1.0.19_1 --- srcpkgs/bcachefs-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template index 55420b54f482f..2176120db8144 100644 --- a/srcpkgs/bcachefs-tools/template +++ b/srcpkgs/bcachefs-tools/template @@ -2,7 +2,7 @@ pkgname=bcachefs-tools reverts="24_1" version=1.3.3 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="ROOT_SBINDIR=/usr/bin" make_use_env=yes From edcab69cba49e016a5a161400c6f857442217dab Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 06/34] dedup: rebuild for libsodium-1.0.19_1 --- srcpkgs/dedup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dedup/template b/srcpkgs/dedup/template index 444af8101d075..17d5a300b008b 100644 --- a/srcpkgs/dedup/template +++ b/srcpkgs/dedup/template @@ -1,7 +1,7 @@ # Template file for 'dedup' pkgname=dedup version=2.0 -revision=1 +revision=2 build_style=gnu-makefile make_install_args="MANPREFIX=/usr/share/man" makedepends="liblz4-devel libsodium-devel snappy-devel" From b47d86387e727bbd4a85c4074a3019486b5f7856 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 07/34] devilutionX: rebuild for libsodium-1.0.19_1 --- srcpkgs/devilutionX/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template index b9a7c445409f5..ad911b48f8631 100644 --- a/srcpkgs/devilutionX/template +++ b/srcpkgs/devilutionX/template @@ -1,7 +1,7 @@ # Template file for 'devilutionX' pkgname=devilutionX version=1.4.1 -revision=2 +revision=3 build_style=cmake configure_args="-DVERSION_NUM=$version -DDISABLE_ZERO_TIER=ON" hostmakedepends="pkg-config" From 1ec36fe45007e417850e121fed3599c9e22f3ce9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 08/34] dnsdist: rebuild for libsodium-1.0.19_1 --- srcpkgs/dnsdist/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template index abd050478bf24..05ee27512007d 100644 --- a/srcpkgs/dnsdist/template +++ b/srcpkgs/dnsdist/template @@ -1,7 +1,7 @@ # Template file for 'dnsdist' pkgname=dnsdist version=1.8.1 -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 4908575d5902700dfca899eef00cd9bfed650b25 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:38 +0100 Subject: [PATCH 09/34] dovecot: rebuild for libsodium-1.0.19_1 --- srcpkgs/dovecot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 0b8f470c1723a..15d82d279f86e 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.21 -revision=2 +revision=3 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 a1b7d2e314da8e14f2530146a08f5a5dfdd91461 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:39 +0100 Subject: [PATCH 10/34] dpp: rebuild for libsodium-1.0.19_1 --- srcpkgs/dpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dpp/template b/srcpkgs/dpp/template index 49c19ba381bce..b75c7087ac761 100644 --- a/srcpkgs/dpp/template +++ b/srcpkgs/dpp/template @@ -1,7 +1,7 @@ # Template file for 'dpp' pkgname=dpp version=10.0.28 -revision=1 +revision=2 build_style=cmake configure_args="-DDPP_NO_VCPKG=ON -DDPP_USE_EXTERNAL_JSON=ON" cmake_builddir=build From c593656b656c0249bd10845cfc049f9b201fac02 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:39 +0100 Subject: [PATCH 11/34] fastd: rebuild for libsodium-1.0.19_1 --- srcpkgs/fastd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fastd/template b/srcpkgs/fastd/template index d05ca42e9e924..fdb14ccdc1505 100644 --- a/srcpkgs/fastd/template +++ b/srcpkgs/fastd/template @@ -1,7 +1,7 @@ # Template file for 'fastd' pkgname=fastd version=21 -revision=1 +revision=2 build_style=meson configure_args="-Dcipher_aes128-ctr=disabled" hostmakedepends="bison pkg-config" From 63d589b2a54bf9d08d3dcf27d00c26b2068f3cfe Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:39 +0100 Subject: [PATCH 12/34] minisign: rebuild for libsodium-1.0.19_1 --- srcpkgs/minisign/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/minisign/template b/srcpkgs/minisign/template index 6da1c7d64d439..84d15ae925e26 100644 --- a/srcpkgs/minisign/template +++ b/srcpkgs/minisign/template @@ -1,7 +1,7 @@ # Template file for 'minisign' pkgname=minisign version=0.11 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="libsodium-devel" From 56c74eb213483b7f358198e2e97ed423420c00a4 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:39 +0100 Subject: [PATCH 13/34] mkp224o: rebuild for libsodium-1.0.19_1 --- srcpkgs/mkp224o/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mkp224o/template b/srcpkgs/mkp224o/template index 08b34d424330b..4a29d8459d509 100644 --- a/srcpkgs/mkp224o/template +++ b/srcpkgs/mkp224o/template @@ -1,7 +1,7 @@ # Template file for 'mkp224o' pkgname=mkp224o version=1.5.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf automake" makedepends="libsodium-devel" From 7f0207da5f34827b2e5f6dfbe9fa4fb97de898d2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:39 +0100 Subject: [PATCH 14/34] netsniff-ng: rebuild for libsodium-1.0.19_1 --- srcpkgs/netsniff-ng/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netsniff-ng/template b/srcpkgs/netsniff-ng/template index a6743ca915062..4c09d893b3886 100644 --- a/srcpkgs/netsniff-ng/template +++ b/srcpkgs/netsniff-ng/template @@ -1,7 +1,7 @@ # Template file for 'netsniff-ng' pkgname=netsniff-ng version=0.6.8 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr --disable-geoip" hostmakedepends="pkg-config flex bison which" From 8300d39e6034716cbab85d6cacd8f433a740712f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:40 +0100 Subject: [PATCH 15/34] nix: rebuild for libsodium-1.0.19_1 --- srcpkgs/nix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 44f7dfaf77b62..aa2d61286f7b4 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix version=2.11.0 -revision=9 +revision=10 build_style=gnu-configure build_helper=qemu # Use /nix/var as suggested by the official Manual. From c4960c3d1ddbade1441ae3de11b5beedf500691a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:40 +0100 Subject: [PATCH 16/34] ostree: rebuild for libsodium-1.0.19_1 --- srcpkgs/ostree/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template index 7415d9a06e626..a53d46e381bbf 100644 --- a/srcpkgs/ostree/template +++ b/srcpkgs/ostree/template @@ -1,7 +1,7 @@ # Template file for 'ostree' pkgname=ostree version=2023.8 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" From 2c7863e0da69d331a88d07d842748df0897b8b48 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:40 +0100 Subject: [PATCH 17/34] php8.1: rebuild for libsodium-1.0.19_1 --- srcpkgs/php8.1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index 2894f2bddbc3e..fd39dee18cc10 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,7 +1,7 @@ # Template file for 'php8.1' pkgname=php8.1 version=8.1.26 -revision=1 +revision=2 _php_version=8.1 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel From fed27f881878f00a093d56ea05fdcbff58d926c3 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:40 +0100 Subject: [PATCH 18/34] php8.2: rebuild for libsodium-1.0.19_1 --- srcpkgs/php8.2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template index e7fb74102db49..913d7f0f7e0d8 100644 --- a/srcpkgs/php8.2/template +++ b/srcpkgs/php8.2/template @@ -1,7 +1,7 @@ # Template file for 'php8.2' pkgname=php8.2 version=8.2.13 -revision=1 +revision=2 _php_version=8.2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel From 9f7f4f1483c550a8acfdd32f83c6dd53b52a5750 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:40 +0100 Subject: [PATCH 19/34] php8.3: rebuild for libsodium-1.0.19_1 --- srcpkgs/php8.3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template index fd20d1458f9f6..0014a4c3dce5a 100644 --- a/srcpkgs/php8.3/template +++ b/srcpkgs/php8.3/template @@ -1,7 +1,7 @@ # Template file for 'php8.3' pkgname=php8.3 version=8.3.0 -revision=1 +revision=2 _php_version=8.3 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel From 938a0dc2b3f2f64ce85ec02474880a10828e01f8 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 20/34] pijul: rebuild for libsodium-1.0.19_1 --- srcpkgs/pijul/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index f8ae3d352e096..43dfe4110a8e1 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,7 +1,7 @@ # Template file for 'pijul' pkgname=pijul version=1.0.0.beta.6 -revision=1 +revision=2 _crates_version="${version%.*.*}-${version#*.*.*.}" build_style=cargo build_helper=qemu From 383800e15e56f5b5b21e7d4279866568c1ae07fc Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 21/34] python3-etebase: rebuild for libsodium-1.0.19_1 --- srcpkgs/python3-etebase/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-etebase/template b/srcpkgs/python3-etebase/template index 31198dc19e79a..696a8d3d7c4f0 100644 --- a/srcpkgs/python3-etebase/template +++ b/srcpkgs/python3-etebase/template @@ -1,7 +1,7 @@ # Template file for 'python3-etebase' pkgname=python3-etebase version=0.31.5 -revision=5 +revision=6 build_style=python3-module build_helper="rust" hostmakedepends="python3-setuptools-rust python3-wheel cargo pkg-config" From c664ee1f872a0321c0f1385344808bbf28b4cfb5 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 22/34] python3-pynacl: rebuild for libsodium-1.0.19_1 --- srcpkgs/python3-pynacl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pynacl/template b/srcpkgs/python3-pynacl/template index e1741f1471556..71ee77e86d182 100644 --- a/srcpkgs/python3-pynacl/template +++ b/srcpkgs/python3-pynacl/template @@ -1,7 +1,7 @@ # Template file for 'python3-pynacl' pkgname=python3-pynacl version=1.5.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-cffi python3-wheel" makedepends="python3-devel python3-cffi libsodium-devel" From fa3dcc14627061027ab262034d2f1e55479e0226 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 23/34] qtox: rebuild for libsodium-1.0.19_1 --- srcpkgs/qtox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 39c643fecdb5a..bb70e7f51240a 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -1,7 +1,7 @@ # Template file for 'qtox' pkgname=qtox version=1.17.6 -revision=2 +revision=3 build_style=cmake configure_args="-DUPDATE_CHECK=OFF -DGIT_DESCRIBE=${version} From dca2f304329b738b79fc87def46cd43110b458e6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 24/34] rdedup: rebuild for libsodium-1.0.19_1 --- srcpkgs/rdedup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template index b831f28bf3425..e01140a59fcab 100644 --- a/srcpkgs/rdedup/template +++ b/srcpkgs/rdedup/template @@ -1,7 +1,7 @@ # Template file for 'rdedup' pkgname=rdedup version=3.2.1 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config clang" makedepends="openssl-devel liblzma-devel libsodium-devel" From b83ac2205363eaf472877d31e724b8bb81eadbac Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:41 +0100 Subject: [PATCH 25/34] remmina: rebuild for libsodium-1.0.19_1 --- srcpkgs/remmina/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index 9086e61fdf66c..7dc8212b08ec9 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,7 +1,7 @@ # Template file for 'remmina' pkgname=remmina version=1.4.31 -revision=3 +revision=4 build_style=cmake configure_args="-DCMAKE_USE_PTHREADS_INIT=ON -DWITH_KF5WALLET=on" hostmakedepends="glib-devel intltool pkg-config shared-mime-info qt5-host-tools qt5-qmake" From 6caa8610426ff9aade895355ddc97d470e99b886 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:42 +0100 Subject: [PATCH 26/34] reop: rebuild for libsodium-1.0.19_1 --- srcpkgs/reop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/reop/template b/srcpkgs/reop/template index def5e5cc1617c..70c57fda09169 100644 --- a/srcpkgs/reop/template +++ b/srcpkgs/reop/template @@ -1,7 +1,7 @@ # Template file for 'reop' pkgname=reop version=2.1.1 -revision=3 +revision=4 makedepends="libsodium-devel" short_desc="Create and verify cryptographic signatures" maintainer="Duncaen " From 6d7c3bafae71a23bcb36330612226691cd096c6c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:42 +0100 Subject: [PATCH 27/34] rooster: rebuild for libsodium-1.0.19_1 --- srcpkgs/rooster/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template index 9cfbbb2562333..dba4a9eca43db 100644 --- a/srcpkgs/rooster/template +++ b/srcpkgs/rooster/template @@ -1,7 +1,7 @@ # Template file for 'rooster' pkgname=rooster version=2.11.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config python3" makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel" From 44c5ddc352af2681970456ef2558967ab5438e25 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:42 +0100 Subject: [PATCH 28/34] shadowsocks-libev: rebuild for libsodium-1.0.19_1 --- srcpkgs/shadowsocks-libev/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/shadowsocks-libev/template b/srcpkgs/shadowsocks-libev/template index ed1c93cf4e06d..49b4737e399fd 100644 --- a/srcpkgs/shadowsocks-libev/template +++ b/srcpkgs/shadowsocks-libev/template @@ -1,7 +1,7 @@ # Template file for 'shadowsocks-libev' pkgname=shadowsocks-libev version=3.3.4 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-pcre=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config asciidoc xmlto" From ea68b89432fca8bc506c63fa11a1f5a43a300a8f Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:42 +0100 Subject: [PATCH 29/34] toxcore: rebuild for libsodium-1.0.19_1 --- srcpkgs/toxcore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/toxcore/template b/srcpkgs/toxcore/template index 7776430c29800..ac44f9fad6059 100644 --- a/srcpkgs/toxcore/template +++ b/srcpkgs/toxcore/template @@ -1,7 +1,7 @@ # Template file for 'toxcore' pkgname=toxcore version=0.2.18 -revision=2 +revision=3 build_style=cmake configure_args="-DMUST_BUILD_TOXAV=ON -DBUILD_TOXAV=ON -DDHT_BOOTSTRAP=OFF -DBOOTSTRAP_DAEMON=ON" From d7544d6df120ae2d5593956159356a7ab2496696 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:42 +0100 Subject: [PATCH 30/34] unbound: rebuild for libsodium-1.0.19_1 --- srcpkgs/unbound/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index 1508b14a11c05..46e7e02f2ac3e 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,7 +1,7 @@ # Template file for 'unbound' pkgname=unbound version=1.19.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr From 9d2b99e9e6ae0d655f169455d931c77f26af8875 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:43 +0100 Subject: [PATCH 31/34] usbguard: rebuild for libsodium-1.0.19_1 --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index d414b44ee5fe9..eacb488a66fde 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard version=1.1.2 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" From b106b6c02b82b4046577581d26a6dd7f050f69f6 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:43 +0100 Subject: [PATCH 32/34] warzone2100: rebuild for libsodium-1.0.19_1 --- srcpkgs/warzone2100/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index ed572964dec1d..0a0372f162a37 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,7 +1,7 @@ # Template file for 'warzone2100' pkgname=warzone2100 version=4.4.2 -revision=1 +revision=2 build_style=cmake configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void" hostmakedepends="zip unzip asciidoc gettext pkg-config shaderc" From a4a9177d6db063e605e50a631d75e2153de7c4df Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 19:50:43 +0100 Subject: [PATCH 33/34] zeromq: rebuild for libsodium-1.0.19_1 --- srcpkgs/zeromq/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeromq/template b/srcpkgs/zeromq/template index 0c94a4ecef34a..a496b85deb69d 100644 --- a/srcpkgs/zeromq/template +++ b/srcpkgs/zeromq/template @@ -1,7 +1,7 @@ # Template file for 'zeromq' pkgname=zeromq version=4.3.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-libsodium --disable-Werror" hostmakedepends="asciidoc pkg-config xmlto" From f1be04e74cd5d7a3ef967956fc50bb39dc7fa940 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 16 Dec 2023 21:57:40 +0100 Subject: [PATCH 34/34] fixup! netsniff-ng: rebuild for libsodium-1.0.19_1 --- srcpkgs/netsniff-ng/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/netsniff-ng/template b/srcpkgs/netsniff-ng/template index 4c09d893b3886..f222d52565283 100644 --- a/srcpkgs/netsniff-ng/template +++ b/srcpkgs/netsniff-ng/template @@ -17,7 +17,8 @@ checksum=ca22e98208003eb7f75b2d177378848f7178dab83f5c320a0fffb409bdfbb160 CFLAGS="-fcommon" post_extract() { - vsed -i "s|/sbin|/bin|g" Makefile + vsed -i -e 's|/sbin|/bin|g' -e '/--jobs=/d' Makefile + vsed -i 's/ncurses/ncursesw/g' flowtop/Makefile } pre_configure() { @@ -26,10 +27,6 @@ pre_configure() { export NACL_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib } -do_build() { - make ${makejobs} CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - pre_install() { vmkdir usr/bin }