diff options
Diffstat (limited to 'net-mgmt/netdata/files')
7 files changed, 111 insertions, 54 deletions
diff --git a/net-mgmt/netdata/files/patch-CMakeLists.txt b/net-mgmt/netdata/files/patch-CMakeLists.txt index 5330282bf430..083905b6c5e3 100644 --- a/net-mgmt/netdata/files/patch-CMakeLists.txt +++ b/net-mgmt/netdata/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2025-01-02 17:07:23 UTC +--- CMakeLists.txt.orig 2025-05-28 22:57:42 UTC +++ CMakeLists.txt -@@ -33,7 +33,7 @@ set(CMAKE_C_STANDARD 11) +@@ -40,7 +40,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_INSTALL_MESSAGE LAZY) set(CMAKE_C_STANDARD 11) @@ -9,7 +9,7 @@ set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata") option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False) -@@ -94,7 +94,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") +@@ -95,7 +95,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OS_WINDOWS False) set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -18,26 +18,42 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(OS_MACOS True) -@@ -1307,7 +1307,6 @@ if(ENABLE_ML) - set(ML_FILES - src/ml/ad_charts.h - src/ml/ad_charts.cc -- src/ml/dlib/dlib/all/source.cpp - src/ml/ml.cc - src/ml/ml_calculated_number.h - src/ml/ml_host.h -@@ -2682,10 +2681,6 @@ endif() - target_compile_options(NetdataClaim PUBLIC -mwindows) +@@ -399,7 +399,7 @@ include(NetdataBacktrace) + include(NetdataJSONC) + include(NetdataYAML) + include(NetdataBacktrace) +-include(NetdataDlib) ++#include(NetdataDlib) + + if(ENABLE_LEGACY_EBPF_PROGRAMS) + include(NetdataEBPFLegacy) +@@ -424,9 +424,9 @@ endif() + netdata_bundle_sentry() endif() --target_compile_definitions(netdata PRIVATE -- "$<$<BOOL:${ENABLE_ML}>:DLIB_NO_GUI_SUPPORT>" --) -- - target_compile_options(netdata PRIVATE - "$<$<BOOL:${ENABLE_EXPORTER_MONGODB}>:${MONGOC_CFLAGS_OTHER}>" - "$<$<BOOL:${ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE}>:${SNAPPY_CFLAGS_OTHER}>" -@@ -2809,13 +2804,14 @@ endif() +-if(ENABLE_ML) +- netdata_bundle_dlib() +-endif() ++#if(ENABLE_ML) ++# netdata_bundle_dlib() ++#endif() + + # + # check include files +@@ -3006,9 +3006,9 @@ add_executable(netdata + "$<$<BOOL:${OS_WINDOWS}>:${NETDATA_RES_FILES}>" + ) + +-if(ENABLE_ML) +- netdata_add_dlib_to_target(netdata) +-endif() ++#if(ENABLE_ML) ++# netdata_add_dlib_to_target(netdata) ++#endif() + + if(OS_WINDOWS) + add_executable(NetdataClaim ${CLAIM_WINDOWS_FILES} ${NETDATA_CLAIM_RES_FILES}) +@@ -3152,12 +3152,12 @@ endif() string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}") endif() @@ -54,11 +70,9 @@ +set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d") +set(VARLIB_DIR "%%NETDATA_PERST%%") -+ # A non-default value is only used when building Debian packages (/var/lib/netdata/www) if(NOT DEFINED WEB_DIR) - set(WEB_DIR "share/netdata/web") -@@ -2839,11 +2835,11 @@ install(TARGETS netdata COMPONENT netdata DESTINATION +@@ -3210,11 +3210,12 @@ install(TARGETS netdata COMPONENT netdata DESTINATION install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}") @@ -67,6 +81,7 @@ -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/registry) -install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/cloud.d) -install(DIRECTORY COMPONENT netdata DESTINATION var/run/netdata) ++ +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_CACHE%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_LOG%%) +install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/registery) @@ -75,7 +90,7 @@ install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/custom-plugins.d) install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/health.d) -@@ -2858,11 +2854,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" +@@ -3229,11 +3230,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}" set(pkglibexecdir_POST "${NETDATA_RUNTIME_PREFIX}/libexec/netdata") set(localstatedir_POST "${NETDATA_RUNTIME_PREFIX}/var") set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}") @@ -92,7 +107,7 @@ set(netdata_user_POST "${NETDATA_USER}") set(netdata_group_POST "${NETDATA_USER}") -@@ -3368,8 +3364,8 @@ if(ENABLE_DASHBOARD) +@@ -3751,8 +3752,8 @@ if(ENABLE_DASHBOARD) # if(ENABLE_DASHBOARD) @@ -101,5 +116,5 @@ + #include(NetdataDashboard) + #bundle_dashboard() - include(src/web/gui/v1/dashboard_v1.cmake) - include(src/web/gui/gui.cmake) + install(FILES + COMPONENT dashboard diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake new file mode 100644 index 000000000000..4daa5ef3790a --- /dev/null +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataBacktrace.cmake @@ -0,0 +1,50 @@ +--- packaging/cmake/Modules/NetdataBacktrace.cmake.orig 2025-05-28 22:57:38 UTC ++++ packaging/cmake/Modules/NetdataBacktrace.cmake +@@ -10,43 +10,23 @@ function(netdata_bundle_libbacktrace) + function(netdata_bundle_libbacktrace) + message(STATUS "Preparing libbacktrace") + +- set(libbacktrace_SOURCE_DIR "${CMAKE_BINARY_DIR}/libbacktrace-src") +- set(libbacktrace_BINARY_DIR "${CMAKE_BINARY_DIR}/libbacktrace-build") +- set(libbacktrace_INSTALL_DIR "${CMAKE_BINARY_DIR}/libbacktrace-install") +- set(libbacktrace_LIBRARY "${libbacktrace_INSTALL_DIR}/lib/libbacktrace.a") ++ set(libbacktrace_LIBRARY "%%LOCALBASE%%/lib/libbacktrace.a") + +- # Clone and build libbacktrace +- ExternalProject_Add( +- libbacktrace +- GIT_REPOSITORY https://github.com/ianlancetaylor/libbacktrace.git +- SOURCE_DIR "${libbacktrace_SOURCE_DIR}" +- BINARY_DIR "${libbacktrace_BINARY_DIR}" +- CONFIGURE_COMMAND "${libbacktrace_SOURCE_DIR}/configure" --prefix=${libbacktrace_INSTALL_DIR} --enable-static +- BUILD_COMMAND make install +- INSTALL_COMMAND "" +- BUILD_BYPRODUCTS "${libbacktrace_LIBRARY}" +- EXCLUDE_FROM_ALL 1 +- UPDATE_DISCONNECTED ON +- ) +- + # Create an imported library target +- add_library(libbacktrace_library STATIC IMPORTED GLOBAL) ++ add_library(libbacktrace STATIC IMPORTED GLOBAL) + set_property( +- TARGET libbacktrace_library ++ TARGET libbacktrace + PROPERTY IMPORTED_LOCATION "${libbacktrace_LIBRARY}" + ) +- add_dependencies(libbacktrace_library libbacktrace) + + # Export variables to parent scope +- set(NETDATA_LIBBACKTRACE_INCLUDE_DIRS "${libbacktrace_INSTALL_DIR}/include" PARENT_SCOPE) +- set(NETDATA_LIBBACKTRACE_LIBRARIES libbacktrace_library PARENT_SCOPE) ++ set(NETDATA_LIBBACKTRACE_LIBRARIES libbacktrace PARENT_SCOPE) + set(HAVE_LIBBACKTRACE TRUE PARENT_SCOPE) + + message(STATUS "Finished preparing libbacktrace") + endfunction() + + function(netdata_add_libbacktrace_to_target _target) +- target_include_directories(${_target} BEFORE PUBLIC "${NETDATA_LIBBACKTRACE_INCLUDE_DIRS}") + target_link_libraries(${_target} PUBLIC ${NETDATA_LIBBACKTRACE_LIBRARIES}) + add_dependencies(${_target} libbacktrace) + endfunction() diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake index a87ba63098ff..d857caec25eb 100644 --- a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataGoTools.cmake @@ -1,6 +1,6 @@ ---- packaging/cmake/Modules/NetdataGoTools.cmake.orig 2025-01-02 17:07:16 UTC +--- packaging/cmake/Modules/NetdataGoTools.cmake.orig 2025-05-28 22:57:38 UTC +++ packaging/cmake/Modules/NetdataGoTools.cmake -@@ -33,7 +33,7 @@ macro(add_go_target target output build_src build_dir) +@@ -30,7 +30,7 @@ macro(add_go_target target output build_src build_dir) add_custom_command( OUTPUT ${output} diff --git a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake index ffb77ef0dc94..8d17a5be7bd2 100644 --- a/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake +++ b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake @@ -1,6 +1,6 @@ ---- packaging/cmake/Modules/NetdataVersion.cmake.orig 2025-01-02 17:07:16 UTC +--- packaging/cmake/Modules/NetdataVersion.cmake.orig 2025-05-28 22:57:38 UTC +++ packaging/cmake/Modules/NetdataVersion.cmake -@@ -7,22 +7,23 @@ function(netdata_version) +@@ -5,22 +5,23 @@ function(netdata_version) # packaging/version. This version field are used for cmake's project, # cpack's packaging, and the agent's functionality. function(netdata_version) diff --git a/net-mgmt/netdata/files/patch-src_collectors_freebsd.plugin_freebsd__ipfw.c b/net-mgmt/netdata/files/patch-src_collectors_freebsd.plugin_freebsd__ipfw.c new file mode 100644 index 000000000000..aa909ea21423 --- /dev/null +++ b/net-mgmt/netdata/files/patch-src_collectors_freebsd.plugin_freebsd__ipfw.c @@ -0,0 +1,14 @@ +--- src/collectors/freebsd.plugin/freebsd_ipfw.c.orig 2025-02-20 22:40:27 UTC ++++ src/collectors/freebsd.plugin/freebsd_ipfw.c +@@ -272,7 +272,11 @@ int do_ipfw(int update_every, usec_t dt) { + break; + + dyn_rule = (ipfw_dyn_rule *) (tlv + 1); ++#if __FreeBSD_version < 1500034 + bcopy(&dyn_rule->rule, &rulenum, sizeof(rulenum)); ++#else ++ bcopy(&dyn_rule->rulenum, &rulenum, sizeof(rulenum)); ++#endif + + for (srn = 0; srn < (static_rules_num - 1); srn++) { + if (dyn_rule->expire > 0) diff --git a/net-mgmt/netdata/files/patch-src_ml_ml__calculated__number.h b/net-mgmt/netdata/files/patch-src_ml_ml__calculated__number.h deleted file mode 100644 index a55a42642f98..000000000000 --- a/net-mgmt/netdata/files/patch-src_ml_ml__calculated__number.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ml/ml_calculated_number.h.orig 2025-01-02 17:07:23 UTC -+++ src/ml/ml_calculated_number.h -@@ -3,7 +3,7 @@ - #ifndef NETDATA_ML_CALCULATED_NUMBER_H - #define NETDATA_ML_CALCULATED_NUMBER_H - --#include "dlib/dlib/matrix.h" -+#include "dlib/matrix.h" - - // CentOS 7 shenanigans - #include <cmath> diff --git a/net-mgmt/netdata/files/patch-src_ml_ml__kmeans.cc b/net-mgmt/netdata/files/patch-src_ml_ml__kmeans.cc deleted file mode 100644 index 72143ec6178e..000000000000 --- a/net-mgmt/netdata/files/patch-src_ml_ml__kmeans.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/ml/ml_kmeans.cc.orig 2025-01-02 17:07:23 UTC -+++ src/ml/ml_kmeans.cc -@@ -2,7 +2,7 @@ - - #include "ml_kmeans.h" - #include "libnetdata/libnetdata.h" --#include "dlib/dlib/clustering.h" -+#include "dlib/clustering.h" - - void - ml_kmeans_init(ml_kmeans_t *kmeans) |