diff --git a/CMakeLists.txt b/CMakeLists.txt index b35adbde..71ceb63f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.14.3) project(chef VERSION "1.3.2") +# on ubuntu 24+ wolfssl craps out on some string operations which +# we do not care about +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-stringop-overflow") + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) option(CHEF_BUILD_TOOLS "Build the bake toolset" ON) diff --git a/libs/chefclient/client.c b/libs/chefclient/client.c index 4c32022c..23be75ff 100644 --- a/libs/chefclient/client.c +++ b/libs/chefclient/client.c @@ -48,7 +48,7 @@ static int __load_settings(struct chefclient* client, const char* path) char buff[PATH_MAX]; json_error_t error; - snprintf(&buff[0], sizeof(buff), "%s" CHEF_PATH_SEPARATOR_S "client.json", path);; + snprintf(&buff[0], sizeof(buff), "%s" CHEF_PATH_SEPARATOR_S "client.json", path); client->settings_path = platform_strdup(&buff[0]); client->settings = json_load_file(&buff[0], 0, &error); diff --git a/libs/vafs b/libs/vafs index a1e98420..cd8159fd 160000 --- a/libs/vafs +++ b/libs/vafs @@ -1 +1 @@ -Subproject commit a1e9842073cd404d26c237cf019f123a0b6d4e13 +Subproject commit cd8159fd01af3c75a3236adff6fa567e5f0e9d44 diff --git a/tools/serve/commands/install.c b/tools/serve/commands/install.c index 3b8f210e..f7084e90 100644 --- a/tools/serve/commands/install.c +++ b/tools/serve/commands/install.c @@ -268,7 +268,7 @@ static char* __get_unsafe_infoname(struct chef_package* package, struct chef_ver return name; } -static char* __get_safe_infoname(char* publisher, struct chef_package* package, struct chef_version* version) +static char* __get_safe_infoname(const char* publisher, struct chef_package* package, struct chef_version* version) { char* name;