Merging upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 98 deletions

diff --git a/netdata-installer.sh b/netdata-installer.sh
index 736fafdb..f6f4fd52 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -239,7 +239,6 @@ USAGE: ${PROGRAM} [options]
   --enable-ml                Enable anomaly detection with machine learning. Default: autodetect.
   --disable-ml               Explicitly disable anomaly detection with machine learning.
   --disable-x86-sse          Disable SSE instructions & optimizations. Default: enabled.
-  --use-system-lws           Use a system copy of libwebsockets instead of bundled copy. Default: bundled.
   --use-system-protobuf      Use a system copy of libprotobuf instead of bundled copy. Default: bundled.
   --zlib-is-really-here
   --libs-are-really-here     If you see errors about missing zlib or libuuid but you know it is available, you might
@@ -308,7 +307,6 @@ while [ -n "${1}" ]; do
     "--disable-https") NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-https)}" | sed 's/$/ --disable-plugin-https/g')" ;;
     "--disable-dbengine")
       NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-dbengine)}" | sed 's/$/ --disable-dbengine/g')"
-      NETDATA_DISABLE_DBENGINE=1
       ;;
     "--enable-plugin-nfacct") NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--enable-plugin-nfacct)}" | sed 's/$/ --enable-plugin-nfacct/g')" ;;
     "--disable-plugin-nfacct") NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-plugin-nfacct)}" | sed 's/$/ --disable-plugin-nfacct/g')" ;;
@@ -368,9 +366,6 @@ while [ -n "${1}" ]; do
     "--build-json-c")
       NETDATA_BUILD_JSON_C=1
       ;;
-    "--build-judy")
-      NETDATA_BUILD_JUDY=1
-      ;;
     "--install")
       NETDATA_PREFIX="${2}/netdata"
       shift 1
@@ -660,98 +655,6 @@ bundle_protobuf() {
 bundle_protobuf
 
 # -----------------------------------------------------------------------------
-
-build_judy() {
-  env_cmd=''
-  libtoolize="libtoolize"
-
-  if [ -z "${DONT_SCRUB_CFLAGS_EVEN_THOUGH_IT_MAY_BREAK_THINGS}" ]; then
-    env_cmd="env CFLAGS='-fPIC -pipe' CXXFLAGS='-fPIC -pipe' LDFLAGS="
-  fi
-
-  if [ "$(uname)" = "Darwin" ]; then
-    libtoolize="glibtoolize"
-  fi
-
-  cd "${1}" > /dev/null || return 1
-  if run eval "${env_cmd} ${libtoolize} --force --copy" &&
-    run eval "${env_cmd} aclocal" &&
-    run eval "${env_cmd} autoheader" &&
-    run eval "${env_cmd} automake --add-missing --force --copy --include-deps" &&
-    run eval "${env_cmd} autoconf" &&
-    run eval "${env_cmd} ./configure" &&
-    run eval "${env_cmd} ${make} ${MAKEOPTS} -C src" &&
-    run eval "${env_cmd} ar -r src/libJudy.a src/Judy*/*.o"; then
-    cd - > /dev/null || return 1
-  else
-    cd - > /dev/null || return 1
-    return 1
-  fi
-}
-
-copy_judy() {
-  target_dir="${PWD}/externaldeps/libJudy"
-
-  run mkdir -p "${target_dir}" || return 1
-
-  run cp "${1}/src/libJudy.a" "${target_dir}/libJudy.a" || return 1
-  run cp "${1}/src/Judy.h" "${target_dir}/Judy.h" || return 1
-}
-
-bundle_judy() {
-  # If --build-judy flag or no Judy on the system and we're building the dbengine, bundle our own libJudy.
-  # shellcheck disable=SC2235,SC2030,SC2031
-  if [ -n "${NETDATA_DISABLE_DBENGINE}" ] || ([ -z "${NETDATA_BUILD_JUDY}" ] && [ -e /usr/include/Judy.h ]); then
-    return 0
-  elif [ -n "${NETDATA_BUILD_JUDY}" ]; then
-    progress "User requested bundling of libJudy, building it now"
-  elif [ ! -e /usr/include/Judy.h ]; then
-    progress "/usr/include/Judy.h does not exist, but we need libJudy, building our own copy"
-  fi
-
-  [ -n "${GITHUB_ACTIONS}" ] && echo "::group::Bundling libJudy."
-
-  progress "Prepare libJudy"
-
-  JUDY_PACKAGE_VERSION="$(cat packaging/judy.version)"
-
-  tmp="$(mktemp -d -t netdata-judy-XXXXXX)"
-  JUDY_PACKAGE_BASENAME="v${JUDY_PACKAGE_VERSION}.tar.gz"
-
-  if fetch_and_verify "judy" \
-    "https://github.com/netdata/libjudy/archive/${JUDY_PACKAGE_BASENAME}" \
-    "${JUDY_PACKAGE_BASENAME}" \
-    "${tmp}" \
-    "${NETDATA_LOCAL_TARBALL_OVERRIDE_JUDY}"; then
-    if run tar --no-same-owner -xf "${tmp}/${JUDY_PACKAGE_BASENAME}" -C "${tmp}" &&
-      build_judy "${tmp}/libjudy-${JUDY_PACKAGE_VERSION}" &&
-      copy_judy "${tmp}/libjudy-${JUDY_PACKAGE_VERSION}" &&
-      rm -rf "${tmp}"; then
-      run_ok "libJudy built and prepared."
-      NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS} --with-bundled-libJudy"
-    else
-      if [ -n "${NETDATA_BUILD_JUDY}" ]; then
-        [ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::"
-        fatal "failed to build libJudy." I0003
-      else
-        run_failed "Failed to build libJudy, dbengine support will be disabled."
-      fi
-    fi
-  else
-    if [ -n "${NETDATA_BUILD_JUDY}" ]; then
-      [ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::"
-      fatal "Unable to fetch sources for libJudy, which is required for this build of Netdata." I0004
-    else
-      run_failed "Unable to fetch sources for libJudy, which is required for this build of Netdata."
-    fi
-  fi
-
-  [ -n "${GITHUB_ACTIONS}" ] && echo "::endgroup::"
-}
-
-bundle_judy
-
-# -----------------------------------------------------------------------------
 build_jsonc() {
   env_cmd=''
 
@@ -1859,7 +1762,6 @@ echo >&2
 
 # -----------------------------------------------------------------------------
 progress "Installing (but not enabling) the netdata updater tool"
-cleanup_old_netdata_updater || run_failed "Cannot cleanup old netdata updater tool."
 install_netdata_updater || run_failed "Cannot install netdata updater tool."
 
 # -----------------------------------------------------------------------------