New upstream version 1.11.0+dfsgupstream/1.11.0+dfsg

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

6 files changed, 16 insertions, 34 deletions

diff --git a/makeself/jobs/10-prepare-destination.install.sh b/makeself/jobs/10-prepare-destination.install.sh
index 58c8c25fd..019732636 100755
--- a/makeself/jobs/10-prepare-destination.install.sh
+++ b/makeself/jobs/10-prepare-destination.install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
diff --git a/makeself/jobs/50-bash-4.4.install.sh b/makeself/jobs/50-bash-4.4.18.install.sh
index 7868a1e76..000765825 100755
--- a/makeself/jobs/50-bash-4.4.install.sh
+++ b/makeself/jobs/50-bash-4.4.18.install.sh
@@ -1,14 +1,18 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
-fetch "bash-4.4" "http://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz"
+fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
 
 run ./configure \
 	--prefix=${NETDATA_INSTALL_PATH} \
+	--without-bash-malloc \
 	--enable-static-link \
+	--enable-net-redirections \
+	--enable-array-variables \
+	--disable-profiling \
 	--disable-nls \
-	--without-bash-malloc \
 #	--disable-rpath \
 #	--enable-alias \
 #	--enable-arith-for-command \
diff --git a/makeself/jobs/50-curl-7.53.1.install.sh b/makeself/jobs/50-curl-7.60.0.install.sh
index ea80f0d2c..2b5c8f139 100755
--- a/makeself/jobs/50-curl-7.53.1.install.sh
+++ b/makeself/jobs/50-curl-7.60.0.install.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
-fetch "curl-curl-7_53_1" "https://github.com/curl/curl/archive/curl-7_53_1.tar.gz"
+fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz"
 
 export LDFLAGS="-static"
 export PKG_CONFIG="pkg-config --static"
diff --git a/makeself/jobs/50-fping-4.0.install.sh b/makeself/jobs/50-fping-4.0.install.sh
index 2e22ebf8d..7928f1aa4 100755
--- a/makeself/jobs/50-fping-4.0.install.sh
+++ b/makeself/jobs/50-fping-4.0.install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
diff --git a/makeself/jobs/70-netdata-git.install.sh b/makeself/jobs/70-netdata-git.install.sh
index fea3a88bd..71ea0f63a 100755
--- a/makeself/jobs/70-netdata-git.install.sh
+++ b/makeself/jobs/70-netdata-git.install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1
 
@@ -12,13 +13,6 @@ else
 #    export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness"
 fi
 
-if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
-    then
-    # make sure we don't have an old etc path, so that the installer
-    # will install all files without examining changes
-    run mv "${NETDATA_INSTALL_PATH}/etc" "${NETDATA_INSTALL_PATH}/etc.new"
-fi
-
 run ./netdata-installer.sh --install "${NETDATA_INSTALL_PARENT}" \
     --dont-wait \
     --dont-start-it \
diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
index 698f2f92d..0e0d5c9da 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/makeself/jobs/99-makeself.install.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
@@ -12,18 +13,18 @@ ORIGIN="$(git config --get remote.origin.url || echo "unknown")"
 if [[ "${ORIGIN}" =~ ^git@github.com:.*/netdata.*$ ]]
     then
     NOWNER="${ORIGIN/git@github.com:/}"
-    NOWNER="${NOWNER/\/netdata*/}"
+    NOWNER="$( echo ${NOWNER} | cut -d '/' -f 1 )"
 
 elif [[ "${ORIGIN}" =~ ^https://github.com/.*/netdata.*$ ]]
     then
     NOWNER="${ORIGIN/https:\/\/github.com\//}"
-    NOWNER="${NOWNER/\/netdata*/}"
+    NOWNER="$( echo ${NOWNER} | cut -d '/' -f 1 )"
 fi
 
 # make sure it does not have any slashes in it
 NOWNER="${NOWNER//\//_}"
 
-if [ "${NOWNER}" = "firehol" ]
+if [ "${NOWNER}" = "netdata" ]
     then
     NOWNER=
 else
@@ -64,6 +65,7 @@ run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
 
 cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
 #!${NETDATA_INSTALL_PATH}/bin/bash
+export NETDATA_BASH_LOADABLES="DISABLE"
 export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}"
 exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}"
 EOF
@@ -71,27 +73,6 @@ run chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
 
 
 # -----------------------------------------------------------------------------
-# move etc to protect the destination when unpacked
-
-if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
-    then
-    if [ -d "${NETDATA_INSTALL_PATH}/etc.new" ]
-        then
-        run rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
-    fi
-
-    run mv "${NETDATA_INSTALL_PATH}/etc" \
-        "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
-
-    if [ -f "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf" ]
-        then
-        # delete the generated netdata.conf, so that the static installer will generate a new one
-        run rm "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf"
-    fi
-fi
-
-
-# -----------------------------------------------------------------------------
 # remove the links to allow untaring the archive
 
 run rm "${NETDATA_INSTALL_PATH}/sbin" \