include Judy into our source tree (#13362)

17 files changed, 5 insertions, 73 deletions

diff --git a/packaging/bundle-judy.sh b/packaging/bundle-judy.sh
deleted file mode 100755
index 2c0f3214e4..0000000000
--- a/packaging/bundle-judy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-JUDY_TARBALL="v$(cat "${1}/packaging/judy.version").tar.gz"
-JUDY_BUILD_PATH="${1}/externaldeps/libJudy/libjudy-$(cat "${1}/packaging/judy.version")"
-
-mkdir -p "${1}/externaldeps/libJudy" || exit 1
-curl -sSL --connect-timeout 10 --retry 3 "https://github.com/netdata/libjudy/archive/${JUDY_TARBALL}" > "${JUDY_TARBALL}" || exit 1
-sha256sum -c "${1}/packaging/judy.checksums" || exit 1
-tar -xzf "${JUDY_TARBALL}" -C "${1}/externaldeps/libJudy" || exit 1
-OLDPWD="${PWD}"
-cd "${JUDY_BUILD_PATH}" || exit 1
-libtoolize --force --copy || exit 1
-aclocal || exit 1
-autoheader || exit 1
-automake --add-missing --force --copy --include-deps || exit 1
-autoconf || exit 1
-./configure --disable-dependency-tracking || exit 1
-make -C src || exit 1
-ar -r src/libJudy.a src/Judy*/*.o || exit 1
-cd "${OLDPWD}" || exit 1
-
-cp -a "${JUDY_BUILD_PATH}/src/libJudy.a" "${1}/externaldeps/libJudy" || exit 1
-cp -a "${JUDY_BUILD_PATH}/src/Judy.h" "${1}/externaldeps/libJudy" || exit 1
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 1dfabc7e2a..287c592bb8 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -8,8 +8,6 @@ FROM netdata/builder:latest as builder
 # One of 'nightly' or 'stable'
 ARG RELEASE_CHANNEL=nightly
 
-ENV JUDY_VER 1.0.5
-
 ARG CFLAGS
 
 ENV CFLAGS=$CFLAGS
diff --git a/packaging/installer/dependencies/arch.sh b/packaging/installer/dependencies/arch.sh
index fbad754061..dc37bcb9a0 100755
--- a/packaging/installer/dependencies/arch.sh
+++ b/packaging/installer/dependencies/arch.sh
@@ -24,7 +24,6 @@ declare -a package_tree=(
   libuv
   lz4
   openssl
-  judy
   libelf
   git
   pkgconfig
diff --git a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh
index eea71ca325..f5f478ac1d 100755
--- a/packaging/installer/dependencies/centos.sh
+++ b/packaging/installer/dependencies/centos.sh
@@ -139,9 +139,6 @@ validate_tree_centos() {
     echo >&2 " > Updating libarchive ..."
     dnf ${opts} install libarchive
 
-    echo >&2 " > Installing Judy-devel directly ..."
-    dnf ${opts} install http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
-    dnf makecache --refresh
   elif [[ $(os_version) =~ ^7(\..*)?$ ]]; then
     package_manager=yum
     echo >&2 " > Checking for EPEL ..."
diff --git a/packaging/installer/dependencies/debian.sh b/packaging/installer/dependencies/debian.sh
index e8c2d0c6c7..61ff3e4aac 100755
--- a/packaging/installer/dependencies/debian.sh
+++ b/packaging/installer/dependencies/debian.sh
@@ -31,7 +31,6 @@ package_tree="
   libuv1-dev
   liblz4-dev
   libssl-dev
-  libjudy-dev
   libelf-dev
   python
   python3
diff --git a/packaging/installer/dependencies/fedora.sh b/packaging/installer/dependencies/fedora.sh
index 62a129f4c0..4cfe7cbb14 100755
--- a/packaging/installer/dependencies/fedora.sh
+++ b/packaging/installer/dependencies/fedora.sh
@@ -43,7 +43,6 @@ declare -a package_tree=(
   libuv-devel
   lz4-devel
   openssl-devel
-  Judy-devel
   elfutils-libelf-devel
   git
   pkgconfig
diff --git a/packaging/installer/dependencies/freebsd.sh b/packaging/installer/dependencies/freebsd.sh
index 7d286c4818..6afaca3370 100755
--- a/packaging/installer/dependencies/freebsd.sh
+++ b/packaging/installer/dependencies/freebsd.sh
@@ -25,7 +25,6 @@ package_tree="
   libuv
   liblz4
   openssl
-  Judy
   python3
   "
 
diff --git a/packaging/installer/dependencies/gentoo.sh b/packaging/installer/dependencies/gentoo.sh
index ae1a4af275..ae82cf3b3a 100755
--- a/packaging/installer/dependencies/gentoo.sh
+++ b/packaging/installer/dependencies/gentoo.sh
@@ -28,7 +28,6 @@ package_tree="
   dev-libs/libuv
   app-arch/lz4
   dev-libs/openssl
-  dev-libs/judy
   virtual/libelf
   dev-lang/python
   dev-libs/libuv
diff --git a/packaging/installer/dependencies/opensuse.sh b/packaging/installer/dependencies/opensuse.sh
index 7c5b840e7f..51a6d909e9 100755
--- a/packaging/installer/dependencies/opensuse.sh
+++ b/packaging/installer/dependencies/opensuse.sh
@@ -29,7 +29,6 @@ declare -a package_tree=(
   libuv-devel
   liblz4-devel
   libopenssl-devel
-  judy-devel
   libelf-devel
   git
   tar
diff --git a/packaging/installer/dependencies/ubuntu.sh b/packaging/installer/dependencies/ubuntu.sh
index 2bf116a11d..b990988218 100755
--- a/packaging/installer/dependencies/ubuntu.sh
+++ b/packaging/installer/dependencies/ubuntu.sh
@@ -31,7 +31,6 @@ package_tree="
   libuv1-dev
   liblz4-dev
   libssl-dev
-  libjudy-dev
   libelf-dev
   python3
   "
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh
index a5883420a1..da3cf5e4a3 100755
--- a/packaging/installer/install-required-packages.sh
+++ b/packaging/installer/install-required-packages.sh
@@ -665,13 +665,6 @@ declare -A pkg_automake=(
   ['default']="automake"
 )
 
-# required to bundle libJudy
-declare -A pkg_libtool=(
-  ['gentoo']="sys-devel/libtool"
-  ['clearlinux']="c-basic"
-  ['default']="libtool"
-)
-
 # Required to build libwebsockets and libmosquitto on some systems.
 declare -A pkg_cmake=(
   ['gentoo']="dev-util/cmake"
@@ -1112,17 +1105,6 @@ declare -A pkg_openssl=(
   ['default']="openssl-devel"
 )
 
-declare -A pkg_judy=(
-  ['debian']="libjudy-dev"
-  ['ubuntu']="libjudy-dev"
-  ['suse']="judy-devel"
-  ['gentoo']="dev-libs/judy"
-  ['arch']="judy"
-  ['freebsd']="Judy"
-  ['fedora']="Judy-devel"
-  ['default']="NOTREQUIRED"
-)
-
 declare -A pkg_python3=(
   ['gentoo']="dev-lang/python"
   ['sabayon']="dev-lang/python:3.4"
@@ -1289,7 +1271,6 @@ packages() {
   suitable_package autoconf-archive
   require_cmd autogen || suitable_package autogen
   require_cmd automake || suitable_package automake
-  require_cmd libtoolize || suitable_package libtool
   require_cmd pkg-config || suitable_package pkg-config
   require_cmd cmake || suitable_package cmake
 
@@ -1361,7 +1342,6 @@ packages() {
     suitable_package libuv
     suitable_package lz4
     suitable_package openssl
-    suitable_package judy
   fi
 
   # -------------------------------------------------------------------------
@@ -1579,9 +1559,6 @@ validate_tree_centos() {
     echo >&2 " > Updating libarchive ..."
     run ${sudo} yum ${opts} install libarchive
 
-    echo >&2 " > Installing Judy-devel directly ..."
-    run ${sudo} yum ${opts} install http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
-
   elif [[ "${version}" =~ ^7(\..*)?$ ]]; then
     echo >&2 " > Checking for EPEL ..."
     if ! rpm -qa | grep epel-release > /dev/null; then
diff --git a/packaging/installer/methods/freebsd.md b/packaging/installer/methods/freebsd.md
index 12b55d6ad5..3523157bd5 100644
--- a/packaging/installer/methods/freebsd.md
+++ b/packaging/installer/methods/freebsd.md
@@ -20,7 +20,7 @@ This is how to install the latest Netdata version on FreeBSD:
 Install required packages (**need root permission**):
 
 ```sh
-pkg install bash e2fsprogs-libuuid git curl autoconf automake pkgconf pidof Judy liblz4 libuv json-c cmake gmake
+pkg install bash e2fsprogs-libuuid git curl autoconf automake pkgconf pidof liblz4 libuv json-c cmake gmake
 ```
 
 Download Netdata:
diff --git a/packaging/installer/methods/manual.md b/packaging/installer/methods/manual.md
index aaf1451df7..c47c2e3641 100644
--- a/packaging/installer/methods/manual.md
+++ b/packaging/installer/methods/manual.md
@@ -25,9 +25,6 @@ and other operating systems and is regularly tested. You can find this tool [her
 -   **Alpine** Linux and its derivatives
     -   You have to install `bash` yourself, before using the installer.
 
--   **Arch** Linux and its derivatives
-    -   You need arch/aur for package Judy.
-
 -   **Gentoo** Linux and its derivatives
 
 -   **Debian** Linux and its derivatives (including **Ubuntu**, **Mint**)
@@ -67,16 +64,16 @@ This is how to do it by hand:
 
 ```sh
 # Debian / Ubuntu
-apt-get install zlib1g-dev uuid-dev libuv1-dev liblz4-dev libjudy-dev libssl-dev libelf-dev libmnl-dev libprotobuf-dev protobuf-compiler gcc g++ make git autoconf autoconf-archive autogen automake pkg-config curl python cmake
+apt-get install zlib1g-dev uuid-dev libuv1-dev liblz4-dev libssl-dev libelf-dev libmnl-dev libprotobuf-dev protobuf-compiler gcc g++ make git autoconf autoconf-archive autogen automake pkg-config curl python cmake
 
 # Fedora
-dnf install zlib-devel libuuid-devel libuv-devel lz4-devel Judy-devel openssl-devel elfutils-libelf-devel libmnl-devel protobuf-devel protobuf-compiler gcc gcc-c++ make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake
+dnf install zlib-devel libuuid-devel libuv-devel lz4-devel openssl-devel elfutils-libelf-devel libmnl-devel protobuf-devel protobuf-compiler gcc gcc-c++ make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake
 
 # CentOS / Red Hat Enterprise Linux
-yum install autoconf automake curl gcc gcc-c++ git libmnl-devel libuuid-devel openssl-devel libuv-devel lz4-devel Judy-devel elfutils-libelf-devel protobuf protobuf-devel protobuf-compiler make nc pkgconfig python zlib-devel cmake
+yum install autoconf automake curl gcc gcc-c++ git libmnl-devel libuuid-devel openssl-devel libuv-devel lz4-devel elfutils-libelf-devel protobuf protobuf-devel protobuf-compiler make nc pkgconfig python zlib-devel cmake
 
 # openSUSE
-zypper install zlib-devel libuuid-devel libuv-devel liblz4-devel judy-devel libopenssl-devel libelf-devel libmnl-devel protobuf-devel gcc gcc-c++ make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake
+zypper install zlib-devel libuuid-devel libuv-devel liblz4-devel libopenssl-devel libelf-devel libmnl-devel protobuf-devel gcc gcc-c++ make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake
 ```
 
 Once Netdata is compiled, to run it the following packages are required (already installed using the above commands):
@@ -117,7 +114,6 @@ Netdata DB engine can be enabled when these are installed (they are optional):
 | package  | description|
 |:-----:|-----------|
 | `liblz4` | Extremely fast compression algorithm, version r129 or greater|
-| `Judy`   | General purpose dynamic array|
 | `openssl`| Cryptography and SSL/TLS toolkit|
 
 *Netdata will greatly benefit if you have the above packages installed, but it will still work without them.*
@@ -175,8 +171,6 @@ yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/okay-release-1-3.
 # Install Devel Packages
 yum install autoconf automake curl gcc git cmake libuuid-devel openssl-devel libuv-devel lz4-devel make nc pkgconfig python3 zlib-devel
 
-# Install Judy-Devel directly
-yum install -y http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.1.0+217+4d875839.x86_64.rpm
 ```
 
 ## Install Netdata
diff --git a/packaging/installer/methods/pfsense.md b/packaging/installer/methods/pfsense.md
index f0d730036c..e0556629c5 100644
--- a/packaging/installer/methods/pfsense.md
+++ b/packaging/installer/methods/pfsense.md
@@ -25,7 +25,6 @@ pkg install -y pkgconf bash e2fsprogs-libuuid libuv nano
 Then run the following commands to download various dependencies from the FreeBSD repository.
 
 ```sh
-pkg add http://pkg.freebsd.org/FreeBSD:12:amd64/latest/All/Judy-1.0.5_3.txz
 pkg add http://pkg.freebsd.org/FreeBSD:12:amd64/latest/All/json-c-0.15_1.txz
 pkg add http://pkg.freebsd.org/FreeBSD:12:amd64/latest/All/py38-certifi-2021.10.8.txz
 pkg add http://pkg.freebsd.org/FreeBSD:12:amd64/latest/All/py38-asn1crypto-1.4.0.txz
diff --git a/packaging/installer/methods/source.md b/packaging/installer/methods/source.md
index a25323f0cf..d8f4f0bda2 100644
--- a/packaging/installer/methods/source.md
+++ b/packaging/installer/methods/source.md
@@ -32,7 +32,6 @@ Additionally, the following build time features require additional dependencies:
 -   dbengine metric storage:
     -   liblz4 r129 or newer
     -   OpenSSL 1.0 or newer (LibreSSL _amy_ work, but is largely untested).
-    -   [libJudy](http://judy.sourceforge.net/)
 -   Netdata Cloud support:
     -   A working internet connection
     -   A recent version of CMake
diff --git a/packaging/judy.checksums b/packaging/judy.checksums
deleted file mode 100644
index 7d4665bc57..0000000000
--- a/packaging/judy.checksums
+++ /dev/null
@@ -1 +0,0 @@
-e623a06bf091758b43f5cd97c3609f8109442d1a0441bc44819b60f2861c61b1  v1.0.5-netdata2.tar.gz
diff --git a/packaging/judy.version b/packaging/judy.version
deleted file mode 100644
index 934246c2d0..0000000000
--- a/packaging/judy.version
+++ /dev/null
@@ -1 +0,0 @@
-1.0.5-netdata2