From cd83c1108bf620c25d17ac4e053d06b14106fe18 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 5 Nov 2022 09:44:56 +0100 Subject: [PATCH 1/3] Include libnettle version in pihole-FTL -vv output Signed-off-by: DL6ER --- src/args.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/args.c b/src/args.c index 94bab36b..dee6e55f 100644 --- a/src/args.c +++ b/src/args.c @@ -13,6 +13,12 @@ #include "dnsmasq/dnsmasq.h" #undef __USE_XOPEN +#include +#if !defined(NETTLE_VERSION_MAJOR) +# define NETTLE_VERSION_MAJOR 2 +# define NETTLE_VERSION_MINOR 0 +#endif + #include "FTL.h" #include "args.h" #include "version.h" @@ -258,6 +264,10 @@ void parse_args(int argc, char* argv[]) printf("\n"); printf("******************************** LUA ********************************\n"); printf(LUA_COPYRIGHT"\n"); + printf("\n"); + printf("***************************** LIBNETTLE *****************************\n"); + printf("Version: %d.%d\n", NETTLE_VERSION_MAJOR, NETTLE_VERSION_MINOR); + printf("GMP: %s\n", NETTLE_USE_MINI_GMP ? "Mini" : "Full"); exit(EXIT_SUCCESS); } From 1429f9a25bbb1635e6cbaad0e0c6846291615c9c Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 5 Nov 2022 09:45:44 +0100 Subject: [PATCH 2/3] Do not check disk usage during tests Signed-off-by: DL6ER --- test/pihole-FTL.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pihole-FTL.conf b/test/pihole-FTL.conf index 2d562a67..1f941296 100644 --- a/test/pihole-FTL.conf +++ b/test/pihole-FTL.conf @@ -2,6 +2,7 @@ DEBUG_ALL=true RESOLVE_IPV4=no RESOLVE_IPV6=no CHECK_LOAD=false +CHECK_DISK=0 LOCAL_IPV4=10.100.0.10 LOCAL_IPV6=fe80::10 BLOCK_IPV4=10.100.0.11 From d318a8d020796c137c96025dc7015bfec51aa410 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sun, 6 Nov 2022 08:46:56 +0100 Subject: [PATCH 3/3] Use ftl-build:v1.22 containers Signed-off-by: DL6ER --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91652b08..e49cfd34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: needs: smoke-tests - container: ghcr.io/pi-hole/ftl-build:v1.19-${{ matrix.arch }} + container: ghcr.io/pi-hole/ftl-build:v1.22-${{ matrix.arch }} strategy: fail-fast: false