diff -uprN FTL-5.20.1/src/CMakeLists.txt FTL-5.20.1.cust/src/CMakeLists.txt --- FTL-5.20.1/src/CMakeLists.txt 2023-01-15 20:57:00.000000000 +0100 +++ FTL-5.20.1.cust/src/CMakeLists.txt 2023-01-16 15:57:12.518830560 +0100 @@ -30,7 +30,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PRO # SQLITE_OMIT_DESERIALIZE: This option causes the the sqlite3_serialize() and sqlite3_deserialize() interfaces to be omitted from the build (was the default before 3.36.0) # HAVE_READLINE: Enable readline support to allow easy editing, history and auto-completion # SQLITE_DEFAULT_CACHE_SIZE=-16384: Allow up to 16 MiB of cache to be used by SQLite3 (default is 2000 kiB) -set(SQLITE_DEFINES "-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_DQS=0 -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_OMIT_DESERIALIZE -DHAVE_READLINE -DSQLITE_DEFAULT_CACHE_SIZE=-16384") +set(SQLITE_DEFINES "-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_DQS=0 -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_OMIT_DESERIALIZE -DSQLITE_DEFAULT_CACHE_SIZE=-16384") # Code hardening and debugging improvements # -fstack-protector-strong: The program will be resistant to having its stack overflowed @@ -85,7 +85,7 @@ if(CMAKE_C_COMPILER_VERSION VERSION_EQUA else() set(EXTRAWARN_GCC8 "") endif() -set(EXTRAWARN "-Werror -Waddress -Wlogical-op -Wmissing-field-initializers -Woverlength-strings -Wformat -Wformat-nonliteral -Wuninitialized -Wswitch-enum -Wshadow -Wfloat-equal -Wbad-function-cast -Wwrite-strings -Wparentheses -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Winline ${EXTRAWARN_GCC8}") +set(EXTRAWARN "-Waddress -Wlogical-op -Wmissing-field-initializers -Woverlength-strings -Wformat -Wformat-nonliteral -Wuninitialized -Wswitch-enum -Wshadow -Wfloat-equal -Wbad-function-cast -Wwrite-strings -Wparentheses -Wlogical-op -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Winline ${EXTRAWARN_GCC8}") separate_arguments(EXTRAWARN) # Do we want to compile a statically linked musl executable? @@ -194,10 +194,10 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) # for DNSSEC we need the nettle (+ hogweed) crypto and the gmp math libraries -find_library(LIBHOGWEED NAMES libhogweed${CMAKE_STATIC_LIBRARY_SUFFIX} hogweed) -find_library(LIBGMP NAMES libgmp${CMAKE_STATIC_LIBRARY_SUFFIX} gmp) -find_library(LIBNETTLE NAMES libnettle${CMAKE_STATIC_LIBRARY_SUFFIX} nettle) -find_library(LIBIDN NAMES libidn${CMAKE_STATIC_LIBRARY_SUFFIX} idn) +find_library(LIBHOGWEED NAMES libhogweed${CMAKE_SHARED_LIBRARY_SUFFIX} hogweed) +find_library(LIBGMP NAMES libgmp${CMAKE_SHARED_LIBRARY_SUFFIX} gmp) +find_library(LIBNETTLE NAMES libnettle${CMAKE_SHARED_LIBRARY_SUFFIX} nettle) +find_library(LIBIDN NAMES libidn${CMAKE_SHARED_LIBRARY_SUFFIX} idn) target_link_libraries(pihole-FTL rt Threads::Threads ${LIBHOGWEED} ${LIBGMP} ${LIBNETTLE} ${LIBIDN}) @@ -206,9 +206,9 @@ if(LUA_DL STREQUAL "true") target_link_libraries(pihole-FTL ${LIBDL}) endif() -find_library(LIBREADLINE NAMES libreadline${CMAKE_STATIC_LIBRARY_SUFFIX} readline) -find_library(LIBHISTORY NAMES libhistory${CMAKE_STATIC_LIBRARY_SUFFIX} history) -find_library(LIBTERMCAP NAMES libtermcap${CMAKE_STATIC_LIBRARY_SUFFIX} termcap) +find_library(LIBREADLINE NAMES libreadline${CMAKE_SHARED_LIBRARY_SUFFIX} readline) +find_library(LIBHISTORY NAMES libhistory${CMAKE_SHARED_LIBRARY_SUFFIX} history) +find_library(LIBTERMCAP NAMES libtermcap${CMAKE_SHARED_LIBRARY_SUFFIX} termcap) if(LIBREADLINE AND LIBHISTORY AND LIBTERMCAP) message(STATUS "Building FTL with readline support: YES") target_compile_definitions(FTL PRIVATE LUA_USE_READLINE) diff -uprN FTL-5.20.1/src/config.c FTL-5.20.1.cust/src/config.c --- FTL-5.20.1/src/config.c 2023-01-15 20:57:00.000000000 +0100 +++ FTL-5.20.1.cust/src/config.c 2023-01-16 15:57:12.524830593 +0100 @@ -76,7 +76,7 @@ void getLogFilePath(void) } // Read LOGFILE value if available - // defaults to: "/var/log/pihole/FTL.log" + // defaults to: "/run/log/pihole-ftl/pihole-FTL.log" buffer = parse_FTLconf(fp, "LOGFILE"); errno = 0; @@ -84,7 +84,7 @@ void getLogFilePath(void) if(buffer == NULL || sscanf(buffer, "%127ms", &FTLfiles.log) != 1) { // Use standard path if no custom path was obtained from the config file - FTLfiles.log = strdup("/var/log/pihole/FTL.log"); + FTLfiles.log = strdup("/run/log/pihole-ftl/pihole-FTL.log"); } // Test if memory allocation was successful @@ -336,10 +336,10 @@ void read_FTLconf(void) logg(" DBIMPORT: Not importing history from database"); // PIDFILE - getpath(fp, "PIDFILE", "/run/pihole-FTL.pid", &FTLfiles.pid); + getpath(fp, "PIDFILE", "/run/pihole-ftl/pihole-FTL.pid", &FTLfiles.pid); // SOCKETFILE - getpath(fp, "SOCKETFILE", "/run/pihole/FTL.sock", &FTLfiles.socketfile); + getpath(fp, "SOCKETFILE", "/run/pihole-ftl/FTL.sock", &FTLfiles.socketfile); // SETUPVARSFILE getpath(fp, "SETUPVARSFILE", "/etc/pihole/setupVars.conf", &FTLfiles.setupVars); diff -uprN FTL-5.20.1/src/version.h.in FTL-5.20.1.cust/src/version.h.in --- FTL-5.20.1/src/version.h.in 2023-01-15 20:57:00.000000000 +0100 +++ FTL-5.20.1.cust/src/version.h.in 2023-01-16 15:57:12.512830526 +0100 @@ -1,11 +1,11 @@ #ifndef VERSION_H #define VERSION_H -#define GIT_VERSION "@GIT_VERSION@" -#define GIT_DATE "@GIT_DATE@" -#define GIT_BRANCH "@GIT_BRANCH@" -#define GIT_TAG "@GIT_TAG@" -#define GIT_HASH "@GIT_HASH@" +#define GIT_VERSION "v5.20.1" +#define GIT_DATE "2023-01-16" +#define GIT_BRANCH "master" +#define GIT_TAG "v5.20.1" +#define GIT_HASH "builtfromreleasetarball" #define FTL_ARCH "@FTL_ARCH@" #define FTL_CC "@FTL_CC@" diff -uprN FTL-5.20.1/tools/socket_client.c FTL-5.20.1.cust/tools/socket_client.c --- FTL-5.20.1/tools/socket_client.c 2023-01-15 20:57:00.000000000 +0100 +++ FTL-5.20.1.cust/tools/socket_client.c 2023-01-16 15:57:12.525830599 +0100 @@ -40,7 +40,7 @@ int main (int argc, char **argv) { address.sun_family = AF_LOCAL; char *command = ">stats"; - strcpy(address.sun_path,"/run/pihole/FTL.sock"); + strcpy(address.sun_path,"/run/pihole-ftl/FTL.sock"); int i; for(i = 1; i < argc; i++) {