diff --git a/.gitignore b/.gitignore index d2e5ef3..e0f7e90 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /netdata-1.17.0.tar.gz /netdata-1.17.1.tar.gz /netdata-1.18.1.tar.gz +/netdata-1.20.0.tar.gz diff --git a/netdata-fix-shebang-1.20.0.el6.patch b/netdata-fix-shebang-1.20.0.el6.patch new file mode 100644 index 0000000..c94c4b3 --- /dev/null +++ b/netdata-fix-shebang-1.20.0.el6.patch @@ -0,0 +1,471 @@ +Fix shebang according to +https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines + +diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh +--- a/backends/nc-backend.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/backends/nc-backend.sh 2020-03-01 19:25:35.487903898 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in +--- a/claim/netdata-claim.sh.in 2020-02-21 02:50:30.000000000 +0100 ++++ b/claim/netdata-claim.sh.in 2020-03-01 19:25:35.489903892 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2020-03-01 19:25:35.501903859 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2020-03-01 19:25:35.503903853 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2020-03-01 19:25:35.491903887 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2020-03-01 19:25:35.493903881 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2020-03-01 19:25:35.505903847 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2020-03-01 19:25:35.509903836 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2020-03-01 19:25:35.496903873 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2020-03-01 19:25:35.499903864 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2020-03-01 19:25:35.614903541 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2020-03-01 19:25:35.507903842 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/debian/install_go.sh 2020-03-01 19:25:35.515903819 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2020-03-01 19:25:35.513903825 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2020-03-01 19:25:35.512903828 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/coverity-scan.sh 2020-03-01 19:25:35.517903814 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # + # Coverity scan script + # +diff -rup a/cppcheck.sh b/cppcheck.sh +--- a/cppcheck.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/cppcheck.sh 2020-03-01 19:25:35.518903811 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2020-03-01 19:25:35.575903651 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/get-kubernetes-labels.sh.in 2020-03-01 19:25:35.520903805 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/system-info.sh 2020-03-01 19:25:35.573903656 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/bin/sh + + # ------------------------------------------------------------------------------------------------- + # detect the kernel +diff -rup a/diagrams/build.sh b/diagrams/build.sh +--- a/diagrams/build.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/diagrams/build.sh 2020-03-01 19:25:35.521903803 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + path=$(dirname "$0") +diff -rup a/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh +--- a/health/notifications/alarm-email.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-email.sh 2020-03-01 19:25:35.527903785 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2020-03-01 19:25:35.526903788 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-test.sh 2020-03-01 19:25:35.529903780 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/netdata-installer.sh 2020-03-01 19:25:35.532903771 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + # shellcheck disable=SC2046,SC2086,SC2166 +diff -rup a/packaging/docker/build.sh b/packaging/docker/build.sh +--- a/packaging/docker/build.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/build.sh 2020-03-01 19:25:35.565903679 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # + # + # Copyright: SPDX-License-Identifier: GPL-3.0-or-later +diff -rup a/packaging/docker/check_login.sh b/packaging/docker/check_login.sh +--- a/packaging/docker/check_login.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/check_login.sh 2020-03-01 19:25:35.566903676 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # + # This is a credential checker script, to help get early input on docker credentials status + # If these are wrong, then build/publish has no point running +diff -rup a/packaging/docker/publish.sh b/packaging/docker/publish.sh +--- a/packaging/docker/publish.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/publish.sh 2020-03-01 19:25:35.568903670 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # + # Cross-arch docker publish helper script + # Needs docker in version >18.02 due to usage of manifests +diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh +--- a/packaging/docker/run.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/run.sh 2020-03-01 19:25:35.563903684 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/install-required-packages.sh 2020-03-01 19:25:35.538903755 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + + export PATH="${PATH}:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" + export LC_ALL=C +diff -rup a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh +--- a/packaging/installer/kickstart.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/kickstart.sh 2020-03-01 19:25:35.577903645 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/kickstart-static64.sh 2020-03-01 19:25:35.579903639 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/netdata-uninstaller.sh 2020-03-01 19:25:35.542903743 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/netdata-updater.sh 2020-03-01 19:25:35.540903749 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + + # Netdata updater utility + # +diff -rup a/packaging/makeself/build.sh b/packaging/makeself/build.sh +--- a/packaging/makeself/build.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/build.sh 2020-03-01 19:25:35.582903631 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/build-x86_64-static.sh 2020-03-01 19:25:35.548903727 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/functions.sh 2020-03-01 19:25:35.546903732 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/install-alpine-packages.sh 2020-03-01 19:25:35.580903637 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/install-or-update.sh 2020-03-01 19:25:35.550903721 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/10-prepare-destination.install.sh 2020-03-01 19:25:35.555903707 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh +--- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh 2020-03-01 19:25:35.553903712 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh +--- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-curl-7.60.0.install.sh 2020-03-01 19:25:35.560903693 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-4.2.install.sh +--- a/packaging/makeself/jobs/50-fping-4.2.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-fping-4.2.install.sh 2020-03-01 19:25:35.562903687 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-ioping-1.1.install.sh b/packaging/makeself/jobs/50-ioping-1.1.install.sh +--- a/packaging/makeself/jobs/50-ioping-1.1.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-ioping-1.1.install.sh 2020-03-01 19:25:35.554903710 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/70-netdata-git.install.sh 2020-03-01 19:25:35.557903701 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/99-makeself.install.sh 2020-03-01 19:25:35.559903696 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh +--- a/packaging/makeself/run-all-jobs.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/run-all-jobs.sh 2020-03-01 19:25:35.551903718 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + LC_ALL=C +diff -rup a/packaging/manual_nightly_deployment.sh b/packaging/manual_nightly_deployment.sh +--- a/packaging/manual_nightly_deployment.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/manual_nightly_deployment.sh 2020-03-01 19:25:35.534903766 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # + # This tool allows netdata team to manually deploy nightlies + # It emulates the nightly operations required for a new version to be published for our users +diff -rup a/system/edit-config.in b/system/edit-config.in +--- a/system/edit-config.in 2020-02-21 02:50:30.000000000 +0100 ++++ b/system/edit-config.in 2020-03-01 19:25:35.583903628 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/bin/sh + + [ -f /etc/profile ] && . /etc/profile + +diff -rup a/system/netdata-lsb.in b/system/netdata-lsb.in +--- a/system/netdata-lsb.in 2020-02-21 02:50:30.000000000 +0100 ++++ b/system/netdata-lsb.in 2020-03-01 19:25:35.569903668 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/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 2020-02-21 02:50:30.000000000 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2020-03-01 19:25:35.571903662 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/bash + # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181 + + NETDATA_VARLIB_DIR="@varlibdir_POST@" +diff -rup a/tests/updater_checks.sh b/tests/updater_checks.sh +--- a/tests/updater_checks.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/tests/updater_checks.sh 2020-03-01 19:25:35.585903623 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/bin/sh + # + # Wrapper script that installs the required dependencies + # for the BATS script to run successfully diff --git a/netdata-fix-shebang-1.20.0.patch b/netdata-fix-shebang-1.20.0.patch new file mode 100644 index 0000000..5d2c9d9 --- /dev/null +++ b/netdata-fix-shebang-1.20.0.patch @@ -0,0 +1,471 @@ +Fix shebang according to +https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines + +diff -rup a/backends/nc-backend.sh b/backends/nc-backend.sh +--- a/backends/nc-backend.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/backends/nc-backend.sh 2020-03-01 19:25:35.487903898 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in +--- a/claim/netdata-claim.sh.in 2020-02-21 02:50:30.000000000 +0100 ++++ b/claim/netdata-claim.sh.in 2020-03-01 19:25:35.489903892 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-name.sh.in 2020-03-01 19:25:35.501903859 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2020-03-01 19:25:35.503903853 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2020-03-01 19:25:35.491903887 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/charts.d.plugin/charts.d.plugin.in 2020-03-01 19:25:35.493903881 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/fping.plugin/fping.plugin.in 2020-03-01 19:25:35.505903847 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/ioping.plugin/ioping.plugin.in 2020-03-01 19:25:35.509903836 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/node.d.plugin/node.d.plugin.in 2020-03-01 19:25:35.496903873 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/python.d.plugin/python.d.plugin.in 2020-03-01 19:25:35.499903864 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2020-03-01 19:25:35.614903541 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2020-03-01 19:25:35.507903842 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/debian/install_go.sh 2020-03-01 19:25:35.515903819 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/rhel/build-netdata-rpm.sh 2020-03-01 19:25:35.513903825 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/contrib/sles11/alarm-notify-basic.bash3.sh 2020-03-01 19:25:35.512903828 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/coverity-scan.sh 2020-03-01 19:25:35.517903814 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/cppcheck.sh 2020-03-01 19:25:35.518903811 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/anonymous-statistics.sh.in 2020-03-01 19:25:35.575903651 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/get-kubernetes-labels.sh.in 2020-03-01 19:25:35.520903805 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/daemon/system-info.sh 2020-03-01 19:25:35.573903656 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/diagrams/build.sh 2020-03-01 19:25:35.521903803 +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/health/notifications/alarm-email.sh b/health/notifications/alarm-email.sh +--- a/health/notifications/alarm-email.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-email.sh 2020-03-01 19:25:35.527903785 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-notify.sh.in 2020-03-01 19:25:35.526903788 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/health/notifications/alarm-test.sh 2020-03-01 19:25:35.529903780 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/netdata-installer.sh 2020-03-01 19:25:35.532903771 +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/docker/build.sh b/packaging/docker/build.sh +--- a/packaging/docker/build.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/build.sh 2020-03-01 19:25:35.565903679 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # + # Copyright: SPDX-License-Identifier: GPL-3.0-or-later +diff -rup a/packaging/docker/check_login.sh b/packaging/docker/check_login.sh +--- a/packaging/docker/check_login.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/check_login.sh 2020-03-01 19:25:35.566903676 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # This is a credential checker script, to help get early input on docker credentials status + # If these are wrong, then build/publish has no point running +diff -rup a/packaging/docker/publish.sh b/packaging/docker/publish.sh +--- a/packaging/docker/publish.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/publish.sh 2020-03-01 19:25:35.568903670 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Cross-arch docker publish helper script + # Needs docker in version >18.02 due to usage of manifests +diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh +--- a/packaging/docker/run.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/docker/run.sh 2020-03-01 19:25:35.563903684 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/install-required-packages.sh 2020-03-01 19:25:35.538903755 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + export PATH="${PATH}:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" + export LC_ALL=C +diff -rup a/packaging/installer/kickstart.sh b/packaging/installer/kickstart.sh +--- a/packaging/installer/kickstart.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/kickstart.sh 2020-03-01 19:25:35.577903645 +0100 +@@ -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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/kickstart-static64.sh 2020-03-01 19:25:35.579903639 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/netdata-uninstaller.sh 2020-03-01 19:25:35.542903743 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/installer/netdata-updater.sh 2020-03-01 19:25:35.540903749 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/build.sh 2020-03-01 19:25:35.582903631 +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-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh +--- a/packaging/makeself/build-x86_64-static.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/build-x86_64-static.sh 2020-03-01 19:25:35.548903727 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/functions.sh 2020-03-01 19:25:35.546903732 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/install-alpine-packages.sh 2020-03-01 19:25:35.580903637 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/install-or-update.sh 2020-03-01 19:25:35.550903721 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/10-prepare-destination.install.sh 2020-03-01 19:25:35.555903707 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh +--- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-bash-4.4.18.install.sh 2020-03-01 19:25:35.553903712 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.60.0.install.sh +--- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-curl-7.60.0.install.sh 2020-03-01 19:25:35.560903693 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-4.2.install.sh +--- a/packaging/makeself/jobs/50-fping-4.2.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-fping-4.2.install.sh 2020-03-01 19:25:35.562903687 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/jobs/50-ioping-1.1.install.sh b/packaging/makeself/jobs/50-ioping-1.1.install.sh +--- a/packaging/makeself/jobs/50-ioping-1.1.install.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/50-ioping-1.1.install.sh 2020-03-01 19:25:35.554903710 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/70-netdata-git.install.sh 2020-03-01 19:25:35.557903701 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/jobs/99-makeself.install.sh 2020-03-01 19:25:35.559903696 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + . $(dirname "${0}")/../functions.sh "${@}" || exit 1 +diff -rup a/packaging/makeself/run-all-jobs.sh b/packaging/makeself/run-all-jobs.sh +--- a/packaging/makeself/run-all-jobs.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/makeself/run-all-jobs.sh 2020-03-01 19:25:35.551903718 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + LC_ALL=C +diff -rup a/packaging/manual_nightly_deployment.sh b/packaging/manual_nightly_deployment.sh +--- a/packaging/manual_nightly_deployment.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/packaging/manual_nightly_deployment.sh 2020-03-01 19:25:35.534903766 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # This tool allows netdata team to manually deploy nightlies + # It emulates the nightly operations required for a new version to be published for our users +diff -rup a/system/edit-config.in b/system/edit-config.in +--- a/system/edit-config.in 2020-02-21 02:50:30.000000000 +0100 ++++ b/system/edit-config.in 2020-03-01 19:25:35.583903628 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/system/netdata-lsb.in 2020-03-01 19:25:35.569903668 +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 2020-02-21 02:50:30.000000000 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2020-03-01 19:25:35.571903662 +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/updater_checks.sh b/tests/updater_checks.sh +--- a/tests/updater_checks.sh 2020-02-21 02:50:30.000000000 +0100 ++++ b/tests/updater_checks.sh 2020-03-01 19:25:35.585903623 +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 --git a/netdata-remove-fonts-1.19.0.patch b/netdata-remove-fonts-1.19.0.patch new file mode 100644 index 0000000..155843e --- /dev/null +++ b/netdata-remove-fonts-1.19.0.patch @@ -0,0 +1,19 @@ +diff -rup a/web/gui/Makefile.am b/web/gui/Makefile.am +--- a/web/gui/Makefile.am 2019-11-27 23:47:29.000000000 +0100 ++++ b/web/gui/Makefile.am 2019-12-27 10:41:02.411942501 +0100 +@@ -111,15 +111,6 @@ dist_webcss_DATA = \ + css/c3-0.4.18.min.css \ + $(NULL) + +-webfontsdir=$(webdir)/fonts +-dist_webfonts_DATA = \ +- fonts/glyphicons-halflings-regular.eot \ +- fonts/glyphicons-halflings-regular.svg \ +- fonts/glyphicons-halflings-regular.ttf \ +- fonts/glyphicons-halflings-regular.woff \ +- fonts/glyphicons-halflings-regular.woff2 \ +- $(NULL) +- + webimagesdir=$(webdir)/images + dist_webimages_DATA = \ + images/netdata-logomark.svg \ diff --git a/netdata.spec b/netdata.spec index 555b52f..08c0ef4 100644 --- a/netdata.spec +++ b/netdata.spec @@ -4,6 +4,13 @@ %bcond_with systemd %endif +# Because libuv-devel and Judy-devel are not available in el8 yet +%if 0%{?rhel} && 0%{?rhel} == 8 +%bcond_with dbengine +%else +%bcond_without dbengine +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 # This is temporary and should eventually be resolved. This bypasses # the default rhel __os_install_post which throws a python compile @@ -15,12 +22,12 @@ %global _hardened_build 1 # Build release candidate -%global upver 1.18.1 +%global upver 1.20.0 #global rcver rc0 Name: netdata Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?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 @@ -29,11 +36,11 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{upver}%{?rcver:-%{ Source1: netdata.tmpfiles.conf Source2: netdata.init Source3: netdata.conf -Patch0: netdata-fix-shebang-1.18.0.patch -Patch1: netdata-fix-shebang-1.18.0.el6.patch +Patch0: netdata-fix-shebang-1.20.0.patch +Patch1: netdata-fix-shebang-1.20.0.el6.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.12.0.patch +Patch10: netdata-remove-fonts-1.19.0.patch %endif BuildRequires: zlib-devel @@ -46,10 +53,27 @@ BuildRequires: freeipmi-devel BuildRequires: httpd BuildRequires: cppcheck BuildRequires: gcc -Requires: nodejs +%if %{with dbengine} +BuildRequires: libuv-devel +BuildRequires: Judy-devel +%endif +BuildRequires: lz4-devel +BuildRequires: openssl-devel +BuildRequires: libmnl-devel +BuildRequires: make +BuildRequires: libcurl-devel +BuildRequires: cups-devel +# Only Fedora %if 0%{?fedora} -Requires: glyphicons-halflings-fonts +BuildRequires: python3 +BuildRequires: autoconf-archive +BuildRequires: autogen +BuildRequires: findutils +%else +# Only CentOS +BuildRequires: python2 %endif + %if %{with systemd} BuildRequires: systemd %{?systemd_requires} @@ -58,6 +82,14 @@ Requires: initscripts Requires: /sbin/service Requires: /sbin/chkconfig %endif + +Requires: nodejs +Requires: curl +Requires: nc +%if 0%{?fedora} +Requires: glyphicons-halflings-fonts +%endif + Requires: %{name}-data = %{version}-%{release} Requires: %{name}-conf = %{version}-%{release} @@ -131,6 +163,8 @@ mkdir -p %{buildroot}%{_initrddir} install -p -Dp -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name} %endif mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} +mkdir -p %{buildroot}%{_localstatedir}/log/%{name} +mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ @@ -223,6 +257,8 @@ fi %doc README.md CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTORS.md HISTORICAL_CHANGELOG.md %license LICENSE REDISTRIBUTED.md %{_sbindir}/%{name} +%{_sbindir}/%{name}-claim.sh +%{_sbindir}/%{name}cli %{_libexecdir}/%{name} %if %{with systemd} %{_unitdir}/%{name}.service @@ -266,6 +302,9 @@ fi %attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %changelog +* Sun Mar 01 2020 Didier Fabert 1.20.0-1 +- Update from upstream + * Wed Jan 29 2020 Fedora Release Engineering - 1.18.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 89741af..b7e39f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netdata-1.18.1.tar.gz) = fb72f4729e05ab83fe9462e31b10fc40243472ea9f6cbb9421e2ca549810f2f80b28b05e886faa66e15c53b317ee559a3e0fb3d382c36a424dd39fec779918d9 +SHA512 (netdata-1.20.0.tar.gz) = ada398cdccf1b1b4dbac5b24d4539f86aafb964458aa4f3bdfac336362504aab6d74b7f2f12bad18b62a44bb62d1a2a8ddd0c2ed80a7c16bc388854d4210bcb6