From 37bf6adc13c81fb350161972417dd9e2830e48b3 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 1 Sep 2023 23:15:18 +0200 Subject: [PATCH] Ports/ntbtls: Update ntbtls to version 0.3.1 This also sets the sysroot to to allow it to find libgpg-error when building with Clang. --- Ports/AvailablePorts.md | 2 +- Ports/ntbtls/package.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 0f1d6f283ea..af603a35ef6 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -228,7 +228,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`nnn`](nnn/) | nnn file manager | 4.8 | https://github.com/jarun/nnn | | [`npiet`](npiet/) | Piet language interpreter | 1.3f | https://www.bertnase.de/npiet/ | | [`npth`](npth/) | New GNU Portable Threads Library | 1.6 | https://gnupg.org/software/npth/index.html | -| [`ntbtls`](ntbtls/) | The Not Too Bad TLS Library | 0.2.0 | https://gnupg.org/software/ntbtls/index.html | +| [`ntbtls`](ntbtls/) | The Not Too Bad TLS Library | 0.3.1 | https://gnupg.org/software/ntbtls/index.html | | [`nyancat`](nyancat/) | Nyancat | | https://github.com/klange/nyancat | | [`ObjFW`](ObjFW/) | ObjFW | 2903ecd | https://objfw.nil.im/ | | [`oksh`](oksh/) | oksh | 7.1 | https://github.com/ibara/oksh | diff --git a/Ports/ntbtls/package.sh b/Ports/ntbtls/package.sh index c0d385e4224..d6c217a06d5 100755 --- a/Ports/ntbtls/package.sh +++ b/Ports/ntbtls/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port='ntbtls' -version='0.2.0' +version='0.3.1' useconfigure='true' use_fresh_config_sub='true' config_sub_paths=( @@ -13,7 +13,7 @@ depends=( 'zlib' ) files=( - "https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2#649fe74a311d13e43b16b26ebaa91665ddb632925b73902592eac3ed30519e17" + "https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2#8922181fef523b77b71625e562e4d69532278eabbd18bc74579dbe14135729ba" ) pre_configure() { @@ -26,6 +26,7 @@ configure() { --build="$("${workdir}/build-aux/config.guess")" \ --with-libgcrypt-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ --with-libgpg-error-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ + --with-sysroot="${SERENITY_INSTALL_ROOT}" \ --with-ksba-prefix="${SERENITY_INSTALL_ROOT}/usr/local" # It's documented as "--with-libksba-prefix" (note the "lib"), but if it is set it is # immediately overwritten by whatever is given through "--with-ksba-prefix",