diff --git a/.gitignore b/.gitignore index aa9ba82..b28d541 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /netdata-1.30.0.tar.gz /netdata-1.30.1.tar.gz /netdata-1.31.0.tar.gz +/netdata-1.32.0.tar.gz diff --git a/netdata-fix-shebang-1.31.0.patch b/netdata-fix-shebang-1.31.0.patch deleted file mode 100644 index aa0aaf9..0000000 --- a/netdata-fix-shebang-1.31.0.patch +++ /dev/null @@ -1,525 +0,0 @@ -Fix shebang according to -https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines - -diff -rup a/aclk/legacy/tests/fake-charts.d.plugin b/aclk/legacy/tests/fake-charts.d.plugin ---- a/aclk/legacy/tests/fake-charts.d.plugin 2021-05-19 13:36:47.000000000 +0200 -+++ b/aclk/legacy/tests/fake-charts.d.plugin 2021-05-19 19:58:21.929165868 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - sleep 45 # Wait until popcorning finishes - -diff -rup a/aclk/legacy/tests/install-fake-charts.d.sh.in b/aclk/legacy/tests/install-fake-charts.d.sh.in ---- a/aclk/legacy/tests/install-fake-charts.d.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/aclk/legacy/tests/install-fake-charts.d.sh.in 2021-05-19 19:58:21.931165879 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - TARGET="@pluginsdir_POST@" - BASE="$(cd "$(dirname "$0")" && pwd)" -diff -rup a/aclk/legacy/tests/launch-paho.sh b/aclk/legacy/tests/launch-paho.sh ---- a/aclk/legacy/tests/launch-paho.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/aclk/legacy/tests/launch-paho.sh 2021-05-19 19:58:21.933165890 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - docker build -f paho.Dockerfile . --build-arg "HOST_HOSTNAME=$(ping -c1 "$(hostname).local" | head -n1 | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*')" -t paho-client - docker run -it paho-client -diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh ---- a/backends/nc-backend.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/backends/nc-backend.sh 2021-05-19 19:58:21.934165896 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - -diff -rup a/build_external/bin/clean-install.sh b/build_external/bin/clean-install.sh ---- a/build_external/bin/clean-install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/build_external/bin/clean-install.sh 2021-05-19 19:58:21.937165912 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - DISTRO="$1" - VERSION="$2" -diff -rup a/build_external/bin/make-install.sh b/build_external/bin/make-install.sh ---- a/build_external/bin/make-install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/build_external/bin/make-install.sh 2021-05-19 19:58:21.936165907 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - DISTRO="$1" - VERSION="$2" -diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/claim/netdata-claim.sh.in 2021-05-19 19:58:21.939165924 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # netdata - # real-time performance and health monitoring, done right! - # (C) 2017 Costa Tsaousis -diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in ---- a/collectors/cgroups.plugin/cgroup-name.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2021-05-19 19:58:21.947165968 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - #shellcheck disable=SC2001 - - # netdata -diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh ---- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2021-05-19 19:58:21.945165957 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # shellcheck disable=SC1117 - - # cgroup-network-helper.sh -diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh ---- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-05-19 19:58:21.942165940 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck disable=SC2181 -diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in ---- a/collectors/charts.d.plugin/charts.d.plugin.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2021-05-19 19:58:21.943165946 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # netdata -diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in ---- a/collectors/fping.plugin/fping.plugin.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/fping.plugin/fping.plugin.in 2021-05-19 19:58:21.952165996 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # netdata -diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in ---- a/collectors/ioping.plugin/ioping.plugin.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2021-05-19 19:58:21.953166002 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # netdata -diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in ---- a/collectors/node.d.plugin/node.d.plugin.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/node.d.plugin/node.d.plugin.in 2021-05-19 19:58:21.948165974 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" - - // shebang hack from: -diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in ---- a/collectors/python.d.plugin/python.d.plugin.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2021-05-19 19:58:21.950165985 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - '''':; - pybinary=$(which python || which python3 || which python2) - filtered=() -diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py ---- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-05-19 19:58:22.063166616 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+# - # -*- coding: utf-8 -*- - # - # client.py - Somewhat higher-level GUI_RPC API for BOINC core client -diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in ---- a/collectors/tc.plugin/tc-qos-helper.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2021-05-19 19:58:21.940165929 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # netdata - # real-time performance and health monitoring, done right! -diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh ---- a/contrib/debian/install_go.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/contrib/debian/install_go.sh 2021-05-19 19:58:21.957166024 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - GO_PACKAGE_VERSION="$1" - LIB_DIR="$2" -diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh ---- a/contrib/rhel/build-netdata-rpm.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/contrib/rhel/build-netdata-rpm.sh 2021-05-19 19:58:21.955166013 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # docker run -it --rm centos:6.9 /bin/sh - # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel -diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh ---- a/contrib/sles11/alarm-notify-basic.bash3.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2021-05-19 19:58:21.958166030 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # basic version of netdata notifier to work with bash3 - # only mail and syslog destinations are supported, one recipient each -diff -rup a/coverity-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/coverity-scan.sh 2021-05-19 19:58:21.960166041 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # Coverity scan script - # -diff -rup a/cppcheck.sh b/cppcheck.sh ---- a/cppcheck.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/cppcheck.sh 2021-05-19 19:58:21.961166046 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # echo >>/tmp/cppcheck.log "cppcheck ${*}" - -diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/daemon/anonymous-statistics.sh.in 2021-05-19 19:58:22.008166309 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # Valid actions: - -diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/daemon/get-kubernetes-labels.sh.in 2021-05-19 19:58:21.963166058 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # Checks if netdata is running in a kubernetes pod and fetches that pod's labels - -diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/daemon/system-info.sh 2021-05-19 19:58:22.007166303 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # ------------------------------------------------------------------------------------------------- - # detect the kernel -diff -rup a/diagrams/build.sh b/diagrams/build.sh ---- a/diagrams/build.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/diagrams/build.sh 2021-05-19 19:58:21.964166063 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - path=$(dirname "$0") -diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh ---- a/exporting/nc-exporting.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/exporting/nc-exporting.sh 2021-05-19 19:58:21.966166074 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - -diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh ---- a/health/notifications/alarm-email.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/health/notifications/alarm-email.sh 2021-05-19 19:58:21.968166086 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # OBSOLETE - REPLACED WITH -diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in ---- a/health/notifications/alarm-notify.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/health/notifications/alarm-notify.sh.in 2021-05-19 19:58:21.970166097 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - #shellcheck source=/dev/null disable=SC2086,SC2154 - - # netdata -diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh ---- a/health/notifications/alarm-test.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/health/notifications/alarm-test.sh 2021-05-19 19:58:21.971166102 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # netdata - # real-time performance and health monitoring, done right! -diff -rup a/netdata-installer.sh b/netdata-installer.sh ---- a/netdata-installer.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/netdata-installer.sh 2021-05-19 19:58:21.973166113 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - # shellcheck disable=SC2046,SC2086,SC2166 -diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh ---- a/packaging/check-kernel-config.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/check-kernel-config.sh 2021-05-19 19:58:21.981166158 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - get_kernel_version() { - r="$(uname -r | cut -f 1 -d '-')" -diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh ---- a/packaging/docker/run.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/docker/run.sh 2021-05-19 19:58:21.979166147 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # Entry point script for netdata - # -diff -rup a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh ---- a/packaging/installer/install-required-packages.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/installer/install-required-packages.sh 2021-05-19 19:58:21.975166124 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # shellcheck disable=SC2034 - # We use lots of computed variable names in here, so we need to disable shellcheck 2034 - -diff -rup a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh ---- a/packaging/installer/kickstart.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/installer/kickstart.sh 2021-05-19 19:58:22.011166326 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - # SPDX-License-Identifier: GPL-3.0-or-later - # - # Run me with: -diff -rup a/packaging/installer/kickstart-static64.sh b/packaging/installer/kickstart-static64.sh ---- a/packaging/installer/kickstart-static64.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/installer/kickstart-static64.sh 2021-05-19 19:58:22.010166320 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # SPDX-License-Identifier: GPL-3.0-or-later - # shellcheck disable=SC1117,SC2039,SC2059,SC2086 -diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh ---- a/packaging/installer/netdata-uninstaller.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/installer/netdata-uninstaller.sh 2021-05-19 19:58:21.976166130 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # This is the netdata uninstaller script - # -diff -rup a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh ---- a/packaging/installer/netdata-updater.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/installer/netdata-updater.sh 2021-05-19 19:58:21.978166141 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # Netdata updater utility - # -diff -rup a/packaging/makeself/build.sh b/packaging/makeself/build.sh ---- a/packaging/makeself/build.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/build.sh 2021-05-19 19:58:22.014166342 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - # SPDX-License-Identifier: GPL-3.0-or-later - - # ----------------------------------------------------------------------------- -diff -rup a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh ---- a/packaging/makeself/build-x86_64-static.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/build-x86_64-static.sh 2021-05-19 19:58:22.000166264 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - -diff -rup a/packaging/makeself/functions.sh b/packaging/makeself/functions.sh ---- a/packaging/makeself/functions.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/functions.sh 2021-05-19 19:58:21.998166253 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # ----------------------------------------------------------------------------- -diff -rup a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh ---- a/packaging/makeself/install-alpine-packages.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/install-alpine-packages.sh 2021-05-19 19:58:22.013166337 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - # - # Installation script for the alpine host - # to prepare the static binary -diff -rup a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh ---- a/packaging/makeself/install-or-update.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/install-or-update.sh 2021-05-19 19:58:21.995166236 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # SPDX-License-Identifier: GPL-3.0-or-later - -diff -rup a/packaging/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh ---- a/packaging/makeself/jobs/10-prepare-destination.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/10-prepare-destination.install.sh 2021-05-19 19:58:21.993166225 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/20-openssl.install.sh b/packaging/makeself/jobs/20-openssl.install.sh ---- a/packaging/makeself/jobs/20-openssl.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/20-openssl.install.sh 2021-05-19 19:58:21.986166186 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/50-bash-5.0.install.sh b/packaging/makeself/jobs/50-bash-5.0.install.sh ---- a/packaging/makeself/jobs/50-bash-5.0.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/50-bash-5.0.install.sh 2021-05-19 19:58:21.989166203 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/50-curl-7.73.0.install.sh b/packaging/makeself/jobs/50-curl-7.73.0.install.sh ---- a/packaging/makeself/jobs/50-curl-7.73.0.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/50-curl-7.73.0.install.sh 2021-05-19 19:58:21.984166175 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/50-fping-5.0.install.sh b/packaging/makeself/jobs/50-fping-5.0.install.sh ---- a/packaging/makeself/jobs/50-fping-5.0.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/50-fping-5.0.install.sh 2021-05-19 19:58:21.987166192 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/50-ioping-1.2.install.sh b/packaging/makeself/jobs/50-ioping-1.2.install.sh ---- a/packaging/makeself/jobs/50-ioping-1.2.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/50-ioping-1.2.install.sh 2021-05-19 19:58:21.990166208 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh ---- a/packaging/makeself/jobs/70-netdata-git.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/70-netdata-git.install.sh 2021-05-19 19:58:21.992166220 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=./packaging/makeself/functions.sh -diff -rup a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh ---- a/packaging/makeself/jobs/99-makeself.install.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/jobs/99-makeself.install.sh 2021-05-19 19:58:21.983166169 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - # shellcheck source=packaging/makeself/functions.sh -diff -rup a/packaging/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh ---- a/packaging/makeself/run-all-jobs.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/packaging/makeself/run-all-jobs.sh 2021-05-19 19:58:21.997166248 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # SPDX-License-Identifier: GPL-3.0-or-later - - set -e -diff -rup a/system/edit-config.in b/system/edit-config.in ---- a/system/edit-config.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/system/edit-config.in 2021-05-19 19:58:22.016166354 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - [ -f /etc/profile ] && . /etc/profile - -diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in ---- a/system/netdata-lsb.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/system/netdata-lsb.in 2021-05-19 19:58:22.002166275 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # Netdata LSB start script - # -diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in ---- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2021-05-19 13:36:47.000000000 +0200 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2021-05-19 19:58:22.004166286 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181 - - NETDATA_VARLIB_DIR="@varlibdir_POST@" -diff -rup a/tests/run-unit-tests.sh b/tests/run-unit-tests.sh ---- a/tests/run-unit-tests.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/tests/run-unit-tests.sh 2021-05-19 19:58:22.005166292 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # - # Unit-testing script - # -diff -rup a/tests/updater_checks.sh b/tests/updater_checks.sh ---- a/tests/updater_checks.sh 2021-05-19 13:36:47.000000000 +0200 -+++ b/tests/updater_checks.sh 2021-05-19 19:58:22.017166359 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - # - # Wrapper script that installs the required dependencies - # for the BATS script to run successfully -diff -rup a/web/gui/bundle_dashboard.py b/web/gui/bundle_dashboard.py ---- a/web/gui/bundle_dashboard.py 2021-05-19 13:36:47.000000000 +0200 -+++ b/web/gui/bundle_dashboard.py 2021-05-19 19:58:22.065166627 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/python33 - # - # Copyright: © 2021 Netdata Inc. - # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/netdata-fix-shebang-1.32.0.patch b/netdata-fix-shebang-1.32.0.patch new file mode 100644 index 0000000..da52ba5 --- /dev/null +++ b/netdata-fix-shebang-1.32.0.patch @@ -0,0 +1,534 @@ +Fix shebang according to +https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines + +diff -rup a/aclk/legacy/tests/fake-charts.d.plugin b/aclk/legacy/tests/fake-charts.d.plugin +--- a/aclk/legacy/tests/fake-charts.d.plugin 2021-11-30 14:11:58.000000000 +0100 ++++ b/aclk/legacy/tests/fake-charts.d.plugin 2021-12-05 19:43:08.622317720 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + sleep 45 # Wait until popcorning finishes + +diff -rup a/aclk/legacy/tests/install-fake-charts.d.sh.in b/aclk/legacy/tests/install-fake-charts.d.sh.in +--- a/aclk/legacy/tests/install-fake-charts.d.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/aclk/legacy/tests/install-fake-charts.d.sh.in 2021-12-05 19:43:08.624317796 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + TARGET="@pluginsdir_POST@" + BASE="$(cd "$(dirname "$0")" && pwd)" +diff -rup a/aclk/legacy/tests/launch-paho.sh b/aclk/legacy/tests/launch-paho.sh +--- a/aclk/legacy/tests/launch-paho.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/aclk/legacy/tests/launch-paho.sh 2021-12-05 19:43:08.625317834 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + docker build -f paho.Dockerfile . --build-arg "HOST_HOSTNAME=$(ping -c1 "$(hostname).local" | head -n1 | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*')" -t paho-client + docker run -it paho-client +diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh +--- a/backends/nc-backend.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/backends/nc-backend.sh 2021-12-05 19:43:08.627317910 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/build_external/bin/clean-install.sh b/build_external/bin/clean-install.sh +--- a/build_external/bin/clean-install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/build_external/bin/clean-install.sh 2021-12-05 19:43:08.630318024 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + DISTRO="$1" + VERSION="$2" +diff -rup a/build_external/bin/make-install.sh b/build_external/bin/make-install.sh +--- a/build_external/bin/make-install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/build_external/bin/make-install.sh 2021-12-05 19:43:08.628317948 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + DISTRO="$1" + VERSION="$2" +diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in +--- a/claim/netdata-claim.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/claim/netdata-claim.sh.in 2021-12-05 19:43:08.631318062 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # netdata + # real-time performance and health monitoring, done right! + # (C) 2017 Costa Tsaousis +diff -rup a/collectors/cgroups.plugin/cgroup-name.sh.in b/collectors/cgroups.plugin/cgroup-name.sh.in +--- a/collectors/cgroups.plugin/cgroup-name.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2021-12-05 19:43:08.640318404 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + #shellcheck disable=SC2001 + + # netdata +diff -rup a/collectors/cgroups.plugin/cgroup-network-helper.sh b/collectors/cgroups.plugin/cgroup-network-helper.sh +--- a/collectors/cgroups.plugin/cgroup-network-helper.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2021-12-05 19:43:08.638318328 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # shellcheck disable=SC1117 + + # cgroup-network-helper.sh +diff -rup a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh +--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2021-12-05 19:43:08.635318214 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck disable=SC2181 +diff -rup a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in +--- a/collectors/charts.d.plugin/charts.d.plugin.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2021-12-05 19:43:08.637318290 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # netdata +diff -rup a/collectors/fping.plugin/fping.plugin.in b/collectors/fping.plugin/fping.plugin.in +--- a/collectors/fping.plugin/fping.plugin.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2021-12-05 19:43:08.645318593 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # netdata +diff -rup a/collectors/ioping.plugin/ioping.plugin.in b/collectors/ioping.plugin/ioping.plugin.in +--- a/collectors/ioping.plugin/ioping.plugin.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2021-12-05 19:43:08.647318669 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # netdata +diff -rup a/collectors/node.d.plugin/node.d.plugin.in b/collectors/node.d.plugin/node.d.plugin.in +--- a/collectors/node.d.plugin/node.d.plugin.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2021-12-05 19:43:08.641318442 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + ':' //; exec "$(command -v nodejs || command -v node || echo "ERROR node IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" + + // shebang hack from: +diff -rup a/collectors/python.d.plugin/python.d.plugin.in b/collectors/python.d.plugin/python.d.plugin.in +--- a/collectors/python.d.plugin/python.d.plugin.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2021-12-05 19:43:08.643318517 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + '''':; + pybinary=$(which python || which python3 || which python2) + filtered=() +diff -rup a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py +--- a/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2021-12-05 19:43:08.765323149 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++# + # -*- coding: utf-8 -*- + # + # client.py - Somewhat higher-level GUI_RPC API for BOINC core client +diff -rup a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in +--- a/collectors/tc.plugin/tc-qos-helper.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2021-12-05 19:43:08.633318138 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # netdata + # real-time performance and health monitoring, done right! +diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh +--- a/contrib/debian/install_go.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/contrib/debian/install_go.sh 2021-12-05 19:43:08.650318783 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + GO_PACKAGE_VERSION="$1" + LIB_DIR="$2" +diff -rup a/contrib/rhel/build-netdata-rpm.sh b/contrib/rhel/build-netdata-rpm.sh +--- a/contrib/rhel/build-netdata-rpm.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2021-12-05 19:43:08.648318707 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # docker run -it --rm centos:6.9 /bin/sh + # yum -y install rpm-build redhat-rpm-config yum-utils autoconf automake curl gcc git libmnl-devel libuuid-devel make pkgconfig zlib-devel +diff -rup a/contrib/sles11/alarm-notify-basic.bash3.sh b/contrib/sles11/alarm-notify-basic.bash3.sh +--- a/contrib/sles11/alarm-notify-basic.bash3.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2021-12-05 19:43:08.652318859 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # basic version of netdata notifier to work with bash3 + # only mail and syslog destinations are supported, one recipient each +diff -rup a/coverity-scan.sh b/coverity-scan.sh +--- a/coverity-scan.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/coverity-scan.sh 2021-12-05 19:43:08.653318897 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Coverity scan script + # +diff -rup a/cppcheck.sh b/cppcheck.sh +--- a/cppcheck.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/cppcheck.sh 2021-12-05 19:43:08.655318973 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # echo >>/tmp/cppcheck.log "cppcheck ${*}" + +diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in +--- a/daemon/anonymous-statistics.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2021-12-05 19:43:08.705320871 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # Valid actions: + +diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in +--- a/daemon/get-kubernetes-labels.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/daemon/get-kubernetes-labels.sh.in 2021-12-05 19:43:08.657319049 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Checks if netdata is running in a kubernetes pod and fetches that pod's labels + +diff -rup a/daemon/system-info.sh b/daemon/system-info.sh +--- a/daemon/system-info.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/daemon/system-info.sh 2021-12-05 19:43:08.704320833 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # ------------------------------------------------------------------------------------------------- + # detect the kernel +diff -rup a/diagrams/build.sh b/diagrams/build.sh +--- a/diagrams/build.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/diagrams/build.sh 2021-12-05 19:43:08.658319087 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + path=$(dirname "$0") +diff -rup a/exporting/nc-exporting.sh b/exporting/nc-exporting.sh +--- a/exporting/nc-exporting.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/exporting/nc-exporting.sh 2021-12-05 19:43:08.660319163 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh +--- a/health/notifications/alarm-email.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/health/notifications/alarm-email.sh 2021-12-05 19:43:08.661319201 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # OBSOLETE - REPLACED WITH +diff -rup a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in +--- a/health/notifications/alarm-notify.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2021-12-05 19:43:08.663319277 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + #shellcheck source=/dev/null disable=SC2086,SC2154 + + # netdata +diff -rup a/health/notifications/alarm-test.sh b/health/notifications/alarm-test.sh +--- a/health/notifications/alarm-test.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/health/notifications/alarm-test.sh 2021-12-05 19:43:08.665319353 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # netdata + # real-time performance and health monitoring, done right! +diff -rup a/netdata-installer.sh b/netdata-installer.sh +--- a/netdata-installer.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/netdata-installer.sh 2021-12-05 19:43:08.667319429 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC2046,SC2086,SC2166 +diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh +--- a/packaging/check-kernel-config.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/check-kernel-config.sh 2021-12-05 19:43:08.677319808 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + get_kernel_version() { + r="$(uname -r | cut -f 1 -d '-')" +diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh +--- a/packaging/docker/run.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/docker/run.sh 2021-12-05 19:43:08.675319732 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Entry point script for netdata + # +diff -rup a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh +--- a/packaging/installer/install-required-packages.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/installer/install-required-packages.sh 2021-12-05 19:43:08.669319505 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # shellcheck disable=SC2034 + # We use lots of computed variable names in here, so we need to disable shellcheck 2034 + +diff -rup a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh +--- a/packaging/installer/kickstart.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/installer/kickstart.sh 2021-12-05 19:43:08.673319657 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + # + # Run me with: +diff -rup a/packaging/installer/kickstart-static64.sh b/packaging/installer/kickstart-static64.sh +--- a/packaging/installer/kickstart-static64.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/installer/kickstart-static64.sh 2021-12-05 19:43:08.707320947 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC1117,SC2039,SC2059,SC2086 +diff -rup a/packaging/installer/netdata-uninstaller.sh b/packaging/installer/netdata-uninstaller.sh +--- a/packaging/installer/netdata-uninstaller.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/installer/netdata-uninstaller.sh 2021-12-05 19:43:08.670319543 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # This is the netdata uninstaller script + # +diff -rup a/packaging/installer/netdata-updater.sh b/packaging/installer/netdata-updater.sh +--- a/packaging/installer/netdata-updater.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/installer/netdata-updater.sh 2021-12-05 19:43:08.672319618 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Netdata updater utility + # +diff -rup a/packaging/makeself/build.sh b/packaging/makeself/build.sh +--- a/packaging/makeself/build.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/build.sh 2021-12-05 19:43:08.710321061 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + # SPDX-License-Identifier: GPL-3.0-or-later + + # ----------------------------------------------------------------------------- +diff -rup a/packaging/makeself/build-static.sh b/packaging/makeself/build-static.sh +--- a/packaging/makeself/build-static.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/build-static.sh 2021-12-05 19:43:08.695320491 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh +--- a/packaging/makeself/build-x86_64-static.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/build-x86_64-static.sh 2021-12-05 19:43:08.697320567 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/packaging/makeself/functions.sh b/packaging/makeself/functions.sh +--- a/packaging/makeself/functions.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/functions.sh 2021-12-05 19:43:08.694320453 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # ----------------------------------------------------------------------------- +diff -rup a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh +--- a/packaging/makeself/install-alpine-packages.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/install-alpine-packages.sh 2021-12-05 19:43:08.708320985 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + # + # Installation script for the alpine host + # to prepare the static binary +diff -rup a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh +--- a/packaging/makeself/install-or-update.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/install-or-update.sh 2021-12-05 19:43:08.691320340 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/packaging/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh +--- a/packaging/makeself/jobs/10-prepare-destination.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/10-prepare-destination.install.sh 2021-12-05 19:43:08.689320264 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/20-openssl.install.sh b/packaging/makeself/jobs/20-openssl.install.sh +--- a/packaging/makeself/jobs/20-openssl.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/20-openssl.install.sh 2021-12-05 19:43:08.681319960 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/50-bash-5.1.8.install.sh b/packaging/makeself/jobs/50-bash-5.1.8.install.sh +--- a/packaging/makeself/jobs/50-bash-5.1.8.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/50-bash-5.1.8.install.sh 2021-12-05 19:43:08.683320036 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/50-curl-7.78.0.install.sh b/packaging/makeself/jobs/50-curl-7.78.0.install.sh +--- a/packaging/makeself/jobs/50-curl-7.78.0.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/50-curl-7.78.0.install.sh 2021-12-05 19:43:08.680319922 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/50-fping-5.0.install.sh b/packaging/makeself/jobs/50-fping-5.0.install.sh +--- a/packaging/makeself/jobs/50-fping-5.0.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/50-fping-5.0.install.sh 2021-12-05 19:43:08.685320112 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/50-ioping-1.2.install.sh b/packaging/makeself/jobs/50-ioping-1.2.install.sh +--- a/packaging/makeself/jobs/50-ioping-1.2.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/50-ioping-1.2.install.sh 2021-12-05 19:43:08.686320150 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh +--- a/packaging/makeself/jobs/70-netdata-git.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/70-netdata-git.install.sh 2021-12-05 19:43:08.688320226 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=./packaging/makeself/functions.sh +diff -rup a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh +--- a/packaging/makeself/jobs/99-makeself.install.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/jobs/99-makeself.install.sh 2021-12-05 19:43:08.678319846 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # shellcheck source=packaging/makeself/functions.sh +diff -rup a/packaging/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh +--- a/packaging/makeself/run-all-jobs.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/packaging/makeself/run-all-jobs.sh 2021-12-05 19:43:08.692320378 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + set -e +diff -rup a/system/edit-config.in b/system/edit-config.in +--- a/system/edit-config.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/system/edit-config.in 2021-12-05 19:43:08.711321099 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + [ -f /etc/profile ] && . /etc/profile + +diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in +--- a/system/netdata-lsb.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/system/netdata-lsb.in 2021-12-05 19:43:08.699320643 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Netdata LSB start script + # +diff -rup a/tests/health_mgmtapi/health-cmdapi-test.sh.in b/tests/health_mgmtapi/health-cmdapi-test.sh.in +--- a/tests/health_mgmtapi/health-cmdapi-test.sh.in 2021-11-30 14:11:58.000000000 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2021-12-05 19:43:08.700320681 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181 + + NETDATA_VARLIB_DIR="@varlibdir_POST@" +diff -rup a/tests/run-unit-tests.sh b/tests/run-unit-tests.sh +--- a/tests/run-unit-tests.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/tests/run-unit-tests.sh 2021-12-05 19:43:08.702320757 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Unit-testing script + # +diff -rup a/tests/updater_checks.sh b/tests/updater_checks.sh +--- a/tests/updater_checks.sh 2021-11-30 14:11:58.000000000 +0100 ++++ b/tests/updater_checks.sh 2021-12-05 19:43:08.713321175 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + # + # Wrapper script that installs the required dependencies + # for the BATS script to run successfully +diff -rup a/web/gui/bundle_dashboard.py b/web/gui/bundle_dashboard.py +--- a/web/gui/bundle_dashboard.py 2021-11-30 14:11:58.000000000 +0100 ++++ b/web/gui/bundle_dashboard.py 2021-12-05 19:43:08.767323225 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright: © 2021 Netdata Inc. + # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/netdata-remove-fonts-1.31.0.patch b/netdata-remove-fonts-1.31.0.patch deleted file mode 100644 index c09fe9b..0000000 --- a/netdata-remove-fonts-1.31.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am ---- a/web/gui/dashboard/Makefile.am 2021-05-19 13:36:47.000000000 +0200 -+++ b/web/gui/dashboard/Makefile.am 2021-05-19 20:05:17.473963841 +0200 -@@ -163,36 +163,3 @@ dist_webstaticjs_DATA = \ - static/js/runtime-main.6c7b39cd.js \ - static/js/runtime-main.6c7b39cd.js.map \ - $(NULL) -- --webstaticmediadir=$(webdir)/static/media --dist_webstaticmedia_DATA = \ -- static/media/ibm-plex-sans-latin-100.245539db.woff2 \ -- static/media/ibm-plex-sans-latin-100.9a582f3a.woff \ -- static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \ -- static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \ -- static/media/ibm-plex-sans-latin-200.67524c36.woff \ -- static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \ -- static/media/ibm-plex-sans-latin-200italic.52df2560.woff \ -- static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \ -- static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \ -- static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \ -- static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \ -- static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \ -- static/media/ibm-plex-sans-latin-400.263d6267.woff2 \ -- static/media/ibm-plex-sans-latin-400.a2c56f94.woff \ -- static/media/ibm-plex-sans-latin-400italic.272f8611.woff \ -- static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \ -- static/media/ibm-plex-sans-latin-500.0866c244.woff2 \ -- static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \ -- static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \ -- static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \ -- static/media/ibm-plex-sans-latin-600.337b1651.woff \ -- static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \ -- static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \ -- static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \ -- static/media/ibm-plex-sans-latin-700.b8809d61.woff \ -- static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \ -- static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \ -- static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \ -- static/media/material-icons.0509ab09.woff2 \ -- $(NULL) diff --git a/netdata-remove-fonts-1.32.0.patch b/netdata-remove-fonts-1.32.0.patch new file mode 100644 index 0000000..a848627 --- /dev/null +++ b/netdata-remove-fonts-1.32.0.patch @@ -0,0 +1,39 @@ +diff -rup a/web/gui/dashboard/Makefile.am b/web/gui/dashboard/Makefile.am +--- a/web/gui/dashboard/Makefile.am 2021-11-30 14:11:58.000000000 +0100 ++++ b/web/gui/dashboard/Makefile.am 2021-12-05 19:46:17.706207809 +0100 +@@ -164,35 +164,3 @@ dist_webstaticjs_DATA = \ + static/js/runtime-main.ea592e2f.js.map \ + $(NULL) + +-webstaticmediadir=$(webdir)/static/media +-dist_webstaticmedia_DATA = \ +- static/media/ibm-plex-sans-latin-100.245539db.woff2 \ +- static/media/ibm-plex-sans-latin-100.9a582f3a.woff \ +- static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \ +- static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \ +- static/media/ibm-plex-sans-latin-200.67524c36.woff \ +- static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \ +- static/media/ibm-plex-sans-latin-200italic.52df2560.woff \ +- static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \ +- static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \ +- static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \ +- static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \ +- static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \ +- static/media/ibm-plex-sans-latin-400.263d6267.woff2 \ +- static/media/ibm-plex-sans-latin-400.a2c56f94.woff \ +- static/media/ibm-plex-sans-latin-400italic.272f8611.woff \ +- static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \ +- static/media/ibm-plex-sans-latin-500.0866c244.woff2 \ +- static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \ +- static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \ +- static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \ +- static/media/ibm-plex-sans-latin-600.337b1651.woff \ +- static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \ +- static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \ +- static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \ +- static/media/ibm-plex-sans-latin-700.b8809d61.woff \ +- static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \ +- static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \ +- static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \ +- static/media/material-icons.0509ab09.woff2 \ +- $(NULL) diff --git a/netdata.spec b/netdata.spec index b1c7eaa..b874d46 100644 --- a/netdata.spec +++ b/netdata.spec @@ -28,7 +28,7 @@ ExcludeArch: s390x %global _hardened_build 1 # Build release candidate -%global upver 1.31.0 +%global upver 1.32.0 #global rcver rc0 # libwebsockets in Fedora 33: 4.1.2 @@ -46,7 +46,7 @@ ExcludeArch: s390x Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 6%{?dist} +Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see LICENSE-REDISTRIBUTED.md License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL @@ -60,10 +60,10 @@ Source4: netdata.profile Source10: https://github.com/warmcat/libwebsockets/archive/v%{lws_version}/libwebsockets-%{lws_version}.tar.gz # used only if with bundledmosquitto is true, but must be present anyway to build complete srpm Source11: https://github.com/netdata/mosquitto/archive/v.%{mosquitto_version}%{mosquitto_patch}/mosquitto-%{mosquitto_version}%{mosquitto_patch}.tar.gz -Patch0: netdata-fix-shebang-1.31.0.patch +Patch0: netdata-fix-shebang-1.32.0.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.31.0.patch +Patch10: netdata-remove-fonts-1.32.0.patch %endif BuildRequires: zlib-devel @@ -179,7 +179,7 @@ freeipmi plugin for netdata %if 0%{?fedora} # Remove embedded font(added in requires) %patch10 -p1 -rm -rf web/fonts +rm -rf web/fonts web/gui/dashboard/static/media %endif ### BEGIN netdata cloud @@ -265,6 +265,7 @@ done mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh +rm -f %{buildroot}%{_sysconfdir}/netdata/.install-type %check make tests @@ -349,6 +350,9 @@ echo "Config should be edited with %{_libexecdir}/%{name}/edit-config" %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Thu Dec 02 2021 Didier Fabert 1.32.0-1 +- Update from upstream + * Sat Nov 06 2021 Adrian Reber - 1.31.0-6 - Rebuilt for protobuf 3.19.0 diff --git a/sources b/sources index 10057c2..5f65613 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (netdata-1.31.0.tar.gz) = b0f093ffa26808918a64d0c48275254180fe129c093486fafb180a9df45fdfecd1f4a36bc1206ccc8f840f17d55123be26e00bd19ed87fa84a9e5a79a0ca4158 +SHA512 (netdata-1.32.0.tar.gz) = 5947097d6f876944c5ae852cf9d4ba4a71cdae03690f36c3147360b3c5faa0fb5cca7c13df34a5080d9c248f870f8bb740016c5958853f91780d7afdcd165e29 SHA512 (libwebsockets-3.2.2.tar.gz) = be6cd57ae1d15de059c277ce56e9ccc87f7918811b40a427c96978397f2b1d446e1b5ed6ae62a6aa82c6d775871d6a15885d283d74d7887e98205ab61d206fc0 SHA512 (mosquitto-1.6.8_Netdata-5.tar.gz) = 5661c7219517ed9a804f1b6fbac6f18f840aa1855d0acae2edf609c869eea826239ce57e604e77a9f1e95b8aca18564066c56ce71f7022a0017211b77a1d6c30