The package rpms/netdata.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=ad64966fff5b1... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=79a30ca2511d4... https://src.fedoraproject.org/cgit/rpms/netdata.git/commit/?id=078188eeae327....
Change: +%ifarch x86_64 aarch64 +%ifarch x86_64 -%ifnarch i686
Thanks.
Full change: ============
commit e2869d73d3e16553af400b83aff4ad9e3b04deb7 Author: Didier Fabert didier.fabert@gmail.com Date: Tue Mar 26 23:04:14 2024 +0100
Remove poost install message
diff --git a/netdata.spec b/netdata.spec index 2b823c8..179017c 100644 --- a/netdata.spec +++ b/netdata.spec @@ -385,7 +385,6 @@ sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf. sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: %systemd_post %{name}.service echo "Netdata config should be edited with %{_libexecdir}/%{name}/edit-config" -echo "Netdata go plugin is now embedded"
%preun %systemd_preun %{name}.service
commit ad64966fff5b1047b583bbd84d086366a55607a1 Author: Didier Fabert didier.fabert@gmail.com Date: Tue Mar 26 22:45:48 2024 +0100
Fix aarch64 build
diff --git a/netdata.spec b/netdata.spec index 27cf809..2b823c8 100644 --- a/netdata.spec +++ b/netdata.spec @@ -35,7 +35,7 @@ ExcludeArch: s390x
# Only on fedora %if 0%{?fedora} -%ifarch x86_64 +%ifarch x86_64 aarch64 %bcond_without xenstat %else %bcond_with xenstat
commit 79a30ca2511d43aa1a4a8a13ad74c72106c6d1fb Author: Didier Fabert didier.fabert@gmail.com Date: Tue Mar 26 20:36:31 2024 +0100
Fix s390x and ppc64le x86 builds
diff --git a/netdata.spec b/netdata.spec index 0d5fe69..27cf809 100644 --- a/netdata.spec +++ b/netdata.spec @@ -35,7 +35,7 @@ ExcludeArch: s390x
# Only on fedora %if 0%{?fedora} -%ifnarch i686 +%ifarch x86_64 %bcond_without xenstat %else %bcond_with xenstat
commit c85595cd1d7b5508e77ccc2479629e439915510a Author: Didier Fabert didier.fabert@gmail.com Date: Tue Mar 26 19:33:59 2024 +0100
Fix el8 build
diff --git a/netdata.spec b/netdata.spec index f858beb..0d5fe69 100644 --- a/netdata.spec +++ b/netdata.spec @@ -121,7 +121,9 @@ BuildRequires: openssl-devel BuildRequires: libpfm-devel BuildRequires: libyaml-devel BuildRequires: ninja-build +%if %{with plugin_go} BuildRequires: golang >= 1.21 +%endif BuildRequires: systemd-devel
# Prometheus @@ -323,6 +325,9 @@ find %{buildroot} -name '.keep' -delete mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d +%if 0%{?rhel} && 0%{?rhel} <= 8 +%global _vpath_builddir . +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 install -Dp -m 0644 %{_vpath_builddir}/system/systemd/netdata.service.v235 %{buildroot}%{_unitdir}/%{name}.service %else
commit 078188eeae327da6826196826ea79e5d31c1d548 Author: Didier Fabert didier.fabert@gmail.com Date: Mon Mar 25 22:48:23 2024 +0100
Update to upstream release 1.45.0
diff --git a/.gitignore b/.gitignore index 97076e9..875d25c 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,5 @@ /netdata-v1.44.2.tar.gz /go.d.plugin-config-v0.58.0.tar.gz /netdata-v1.44.3.tar.gz +/netdata-v1.45.0.tar.gz +/go.d.plugin-vendor-1.45.0.tar.xz diff --git a/create-go-vendor.sh b/create-go-vendor.sh new file mode 100755 index 0000000..e8fd2ea --- /dev/null +++ b/create-go-vendor.sh @@ -0,0 +1,29 @@ + #!/bin/bash + +version=$1 +source='a' + +[ -z "${version}" ] && read -p 'version: ' version + +rm -rf a b +[ -f "v${version}.tar.gz" ] && tar -xzf v${version}.tar.gz +[ -f "netdata-v${version}.tar.gz" ] && tar -xzf netdata-v${version}.tar.gz +if [ ! -d "netdata-v${version}" ] +then + echo "Error: Archive is not extracted or archive is corrupted" + exit 1 +fi +mv netdata-v${version} a + +pushd a/src/go/collectors/go.d.plugin/ + +sed -i -e '/github.com/ilyam8/hashstructure v1.1.0 /s/h1.*$/h1:o3hpiGa1yergDO4AlUVBJGNvCEeaD+Ynu0OWYxee0iA=/' go.sum +go mod vendor +if [ $? -ne 0 ] +then + echo "Error: Cannot get all go modules" + exit 1 +fi +tar -cJf ../../../../../go.d.plugin-vendor-${version}.tar.xz vendor +popd +rm -rf a diff --git a/netdata-fix-shebang-1.41.0.patch b/netdata-fix-shebang-1.41.0.patch deleted file mode 100644 index 6e46c65..0000000 --- a/netdata-fix-shebang-1.41.0.patch +++ /dev/null @@ -1,426 +0,0 @@ -Fix shebang according to -https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines - -diff -rup a/claim/netdata-claim.sh.in b/claim/netdata-claim.sh.in ---- a/claim/netdata-claim.sh.in 2023-07-19 21:45:35.983657826 +0200 -+++ b/claim/netdata-claim.sh.in 2023-07-22 10:40:10.426293646 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # netdata - # real-time performance and health monitoring, done right! - # (C) 2023 Netdata Inc. -diff -rup a/collectors/cgroups.plugin/cgroup-name.sh b/collectors/cgroups.plugin/cgroup-name.sh ---- a/collectors/cgroups.plugin/cgroup-name.sh 2023-07-19 21:45:35.987657802 +0200 -+++ b/collectors/cgroups.plugin/cgroup-name.sh 2023-07-22 10:40:10.447293883 +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 2023-07-19 21:45:35.987657802 +0200 -+++ b/collectors/cgroups.plugin/cgroup-network-helper.sh 2023-07-22 10:40:10.449293905 +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 2023-07-19 21:45:35.987657802 +0200 -+++ b/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2023-07-22 10:40:10.432293714 +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 b/collectors/charts.d.plugin/charts.d.plugin ---- a/collectors/charts.d.plugin/charts.d.plugin 2023-07-19 21:46:28.419213057 +0200 -+++ b/collectors/charts.d.plugin/charts.d.plugin 2023-07-22 10:40:10.429293680 +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/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 2023-07-19 21:45:35.987657802 +0200 -+++ b/collectors/charts.d.plugin/charts.d.plugin.in 2023-07-22 10:40:10.435293748 +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 b/collectors/ioping.plugin/ioping.plugin ---- a/collectors/ioping.plugin/ioping.plugin 2023-07-19 21:46:28.611211423 +0200 -+++ b/collectors/ioping.plugin/ioping.plugin 2023-07-22 10:40:10.437293770 +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 2023-07-19 21:45:36.003657704 +0200 -+++ b/collectors/ioping.plugin/ioping.plugin.in 2023-07-22 10:40:10.439293793 +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/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin ---- a/collectors/python.d.plugin/python.d.plugin 2023-07-19 21:46:28.887209073 +0200 -+++ b/collectors/python.d.plugin/python.d.plugin 2023-07-22 10:40:10.441293815 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - '''':; - pybinary=$(which python3 || which python || which python2) - filtered=() -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 2023-07-19 21:45:36.023657583 +0200 -+++ b/collectors/python.d.plugin/python.d.plugin.in 2023-07-22 10:40:10.444293849 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - '''':; - pybinary=$(which python3 || which python || 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 2023-07-19 21:45:36.027657558 +0200 -+++ b/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2023-07-22 10:40:10.690296620 +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 b/collectors/tc.plugin/tc-qos-helper.sh ---- a/collectors/tc.plugin/tc-qos-helper.sh 2023-07-19 21:46:29.387204817 +0200 -+++ b/collectors/tc.plugin/tc-qos-helper.sh 2023-07-22 10:40:10.453293950 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # netdata - # real-time performance and health monitoring, done right! -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 2023-07-19 21:45:36.035657510 +0200 -+++ b/collectors/tc.plugin/tc-qos-helper.sh.in 2023-07-22 10:40:10.451293928 +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 2023-07-19 21:45:36.035657510 +0200 -+++ b/contrib/debian/install_go.sh 2023-07-22 10:40:10.456293984 +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 2023-07-19 21:45:36.039657485 +0200 -+++ b/contrib/rhel/build-netdata-rpm.sh 2023-07-22 10:40:10.458294007 +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/coverity-scan.sh b/coverity-scan.sh ---- a/coverity-scan.sh 2023-07-19 21:45:36.039657485 +0200 -+++ b/coverity-scan.sh 2023-07-22 10:40:10.460294029 +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 2023-07-19 21:45:36.039657485 +0200 -+++ b/cppcheck.sh 2023-07-22 10:40:10.462294052 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # echo >>/tmp/cppcheck.log "cppcheck ${*}" - -diff -rup a/daemon/anonymous-statistics.sh b/daemon/anonymous-statistics.sh ---- a/daemon/anonymous-statistics.sh 2023-07-19 21:46:29.427204477 +0200 -+++ b/daemon/anonymous-statistics.sh 2023-07-22 10:40:10.501294491 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # Valid actions: - -diff -rup a/daemon/anonymous-statistics.sh.in b/daemon/anonymous-statistics.sh.in ---- a/daemon/anonymous-statistics.sh.in 2023-07-19 21:45:36.039657485 +0200 -+++ b/daemon/anonymous-statistics.sh.in 2023-07-22 10:40:10.496294435 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # Valid actions: - -diff -rup a/daemon/get-kubernetes-labels.sh b/daemon/get-kubernetes-labels.sh ---- a/daemon/get-kubernetes-labels.sh 2023-07-19 21:46:29.435204409 +0200 -+++ b/daemon/get-kubernetes-labels.sh 2023-07-22 10:40:10.467294108 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - me="$(basename "${0}")" - - # Checks if netdata is running in a kubernetes pod and fetches: -diff -rup a/daemon/get-kubernetes-labels.sh.in b/daemon/get-kubernetes-labels.sh.in ---- a/daemon/get-kubernetes-labels.sh.in 2023-07-19 21:45:36.039657485 +0200 -+++ b/daemon/get-kubernetes-labels.sh.in 2023-07-22 10:40:10.465294085 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - me="$(basename "${0}")" - - # Checks if netdata is running in a kubernetes pod and fetches: -diff -rup a/daemon/system-info.sh b/daemon/system-info.sh ---- a/daemon/system-info.sh 2023-07-19 21:45:36.043657461 +0200 -+++ b/daemon/system-info.sh 2023-07-22 10:40:10.499294469 +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 2023-07-19 21:45:36.119656999 +0200 -+++ b/diagrams/build.sh 2023-07-22 10:40:10.469294131 +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 2023-07-19 21:45:36.139656877 +0200 -+++ b/exporting/nc-exporting.sh 2023-07-22 10:40:10.471294153 +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 2023-07-19 21:45:36.147656828 +0200 -+++ b/health/notifications/alarm-email.sh 2023-07-22 10:40:10.477294221 +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 b/health/notifications/alarm-notify.sh ---- a/health/notifications/alarm-notify.sh 2023-07-19 21:46:30.059199097 +0200 -+++ b/health/notifications/alarm-notify.sh 2023-07-22 10:40:10.474294187 +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-notify.sh.in b/health/notifications/alarm-notify.sh.in ---- a/health/notifications/alarm-notify.sh.in 2023-07-19 21:45:36.147656828 +0200 -+++ b/health/notifications/alarm-notify.sh.in 2023-07-22 10:40:10.479294243 +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 2023-07-19 21:45:36.147656828 +0200 -+++ b/health/notifications/alarm-test.sh 2023-07-22 10:40:10.483294288 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - - # netdata - # real-time performance and health monitoring, done right! -diff -rup a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py ---- a/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2023-07-19 21:45:48.807528720 +0200 -+++ b/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2023-07-22 10:40:10.701296744 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/python33 - # - # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] - # -diff -rup a/ml/dlib/dlib/travis/build-and-test.sh b/ml/dlib/dlib/travis/build-and-test.sh ---- a/ml/dlib/dlib/travis/build-and-test.sh 2023-07-19 21:45:48.903527474 +0200 -+++ b/ml/dlib/dlib/travis/build-and-test.sh 2023-07-22 10:40:10.485294311 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # Exit if anything fails. - set -eux - -diff -rup a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py ---- a/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2023-07-19 21:45:48.967526642 +0200 -+++ b/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2023-07-22 10:40:10.695296677 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - # This script takes the dlib lenet model trained by the - # examples/dnn_introduction_ex.cpp example program and runs it using caffe. -diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh ---- a/packaging/check-kernel-config.sh 2023-07-19 21:45:36.175656658 +0200 -+++ b/packaging/check-kernel-config.sh 2023-07-22 10:40:10.487294333 +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/system/edit-config b/system/edit-config ---- a/system/edit-config 2023-07-19 21:45:36.183656609 +0200 -+++ b/system/edit-config 2023-07-22 10:40:10.507294559 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # shellcheck disable=SC1091 - [ -f /etc/profile ] && . /etc/profile -diff -rup a/system/install-service.sh.in b/system/install-service.sh.in ---- a/system/install-service.sh.in 2023-07-19 21:45:36.187656585 +0200 -+++ b/system/install-service.sh.in 2023-07-22 10:40:10.504294525 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env sh -+#!/usr/bin/sh - - # SPDX-License-Identifier: GPL-3.0-or-later - -diff -rup a/system/lsb/init.d/netdata.in b/system/lsb/init.d/netdata.in ---- a/system/lsb/init.d/netdata.in 2023-07-19 21:45:36.187656585 +0200 -+++ b/system/lsb/init.d/netdata.in 2023-07-22 10:40:10.489294356 +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 b/tests/health_mgmtapi/health-cmdapi-test.sh ---- a/tests/health_mgmtapi/health-cmdapi-test.sh 2023-07-19 21:46:28.215214793 +0200 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh 2023-07-22 10:40:10.492294390 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/usr/bin/bash - # shellcheck disable=SC1117,SC2034,SC2059,SC2086,SC2181 - - NETDATA_VARLIB_DIR="/var/lib/netdata" -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 2023-07-19 21:45:36.187656585 +0200 -+++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2023-07-22 10:40:10.494294412 +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/web/server/h2o/libh2o/deps/brotli/python/bro.py b/web/server/h2o/libh2o/deps/brotli/python/bro.py ---- a/web/server/h2o/libh2o/deps/brotli/python/bro.py 2023-07-19 21:45:49.811515680 +0200 -+++ b/web/server/h2o/libh2o/deps/brotli/python/bro.py 2023-07-22 10:40:10.721296970 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/python3 - """bro %s -- compression/decompression utility using the Brotli algorithm.""" - - from __future__ import print_function -diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py ---- a/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2023-07-19 21:45:49.811515680 +0200 -+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2023-07-22 10:40:10.725297015 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - from __future__ import print_function - import glob - import sys -diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py ---- a/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2023-07-19 21:45:49.811515680 +0200 -+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2023-07-22 10:40:10.731297082 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - from __future__ import print_function - import sys - import os -diff -rup a/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py b/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py ---- a/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2023-07-19 21:45:49.811515680 +0200 -+++ b/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2023-07-22 10:40:10.728297049 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - from __future__ import print_function - import sys - import os -diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py ---- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2023-07-19 21:45:49.943513966 +0200 -+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2023-07-22 10:40:10.708296823 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - import sys - -diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py ---- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2023-07-19 21:45:49.943513966 +0200 -+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2023-07-22 10:40:10.704296778 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - import sys - -diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py ---- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2023-07-19 21:45:49.943513966 +0200 -+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2023-07-22 10:40:10.715296902 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - import sys - -diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py ---- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2023-07-19 21:45:49.943513966 +0200 -+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2023-07-22 10:40:10.711296857 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - import sys - -diff -rup a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py ---- a/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2023-07-19 21:45:49.943513966 +0200 -+++ b/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2023-07-22 10:40:10.718296936 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - import sys - -diff -rup a/web/server/h2o/libh2o/misc/mkhufftbl.py b/web/server/h2o/libh2o/misc/mkhufftbl.py ---- a/web/server/h2o/libh2o/misc/mkhufftbl.py 2023-07-19 21:45:50.095511991 +0200 -+++ b/web/server/h2o/libh2o/misc/mkhufftbl.py 2023-07-22 10:40:10.734297116 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # The MIT License diff --git a/netdata-fix-shebang-1.45.0.patch b/netdata-fix-shebang-1.45.0.patch new file mode 100644 index 0000000..932cb3f --- /dev/null +++ b/netdata-fix-shebang-1.45.0.patch @@ -0,0 +1,1182 @@ +Fix shebang according to +https://docs.fedoraproject.org/en-US/packaging-guidelines/#_shebang_lines + +diff -rup a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh +--- a/contrib/debian/install_go.sh 2024-03-21 12:47:48.843874196 +0100 ++++ b/contrib/debian/install_go.sh 2024-03-21 14:58:54.175429679 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + GO_PACKAGE_VERSION="$1" + LIB_DIR="$2" +diff -rup a/docs/diagrams/build.sh b/docs/diagrams/build.sh +--- a/docs/diagrams/build.sh 2024-03-21 12:47:48.851874281 +0100 ++++ b/docs/diagrams/build.sh 2024-03-21 14:58:54.177429688 +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/integrations/check_collector_metadata.py b/integrations/check_collector_metadata.py +--- a/integrations/check_collector_metadata.py 2024-03-21 12:47:48.867874452 +0100 ++++ b/integrations/check_collector_metadata.py 2024-03-21 14:58:54.633431852 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import sys + +diff -rup a/integrations/gen_integrations.py b/integrations/gen_integrations.py +--- a/integrations/gen_integrations.py 2024-03-21 12:47:48.867874452 +0100 ++++ b/integrations/gen_integrations.py 2024-03-21 14:58:54.636431866 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import json + import os +diff -rup a/packaging/check-kernel-config.sh b/packaging/check-kernel-config.sh +--- a/packaging/check-kernel-config.sh 2024-03-21 12:47:48.887874664 +0100 ++++ b/packaging/check-kernel-config.sh 2024-03-21 14:58:54.179429697 +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/dag/main.py b/packaging/dag/main.py +--- a/packaging/dag/main.py 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/dag/main.py 2024-03-21 14:58:54.640431885 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import click + +diff -rup a/packaging/docker/run.sh b/packaging/docker/run.sh +--- a/packaging/docker/run.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/docker/run.sh 2024-03-21 14:58:54.181429707 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Entry point script for netdata + # +diff -rup a/packaging/installer/dependencies/arch.sh b/packaging/installer/dependencies/arch.sh +--- a/packaging/installer/dependencies/arch.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/arch.sh 2024-03-21 14:58:54.183429717 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << ArchLinux: [base] [base-devel] >> | << Manjaro >> + +diff -rup a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh +--- a/packaging/installer/dependencies/centos.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/centos.sh 2024-03-21 14:58:54.185429726 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << CentOS: [7] [8] [9] >> + +diff -rup a/packaging/installer/dependencies/clearlinux.sh b/packaging/installer/dependencies/clearlinux.sh +--- a/packaging/installer/dependencies/clearlinux.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/clearlinux.sh 2024-03-21 14:58:54.187429736 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << ClearLinux: [base] >> + +diff -rup a/packaging/installer/dependencies/debian.sh b/packaging/installer/dependencies/debian.sh +--- a/packaging/installer/dependencies/debian.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/debian.sh 2024-03-21 14:58:54.190429750 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Debian: [9] [10] [11] >> + +diff -rup a/packaging/installer/dependencies/fedora.sh b/packaging/installer/dependencies/fedora.sh +--- a/packaging/installer/dependencies/fedora.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/fedora.sh 2024-03-21 14:58:54.192429759 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Fedora: [24->38] >> + +diff -rup a/packaging/installer/dependencies/freebsd.sh b/packaging/installer/dependencies/freebsd.sh +--- a/packaging/installer/dependencies/freebsd.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/freebsd.sh 2024-03-21 14:58:54.194429769 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << FreeBSD >> + +diff -rup a/packaging/installer/dependencies/gentoo.sh b/packaging/installer/dependencies/gentoo.sh +--- a/packaging/installer/dependencies/gentoo.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/gentoo.sh 2024-03-21 14:58:54.196429778 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Gentoo >> | << Pentoo >> + +diff -rup a/packaging/installer/dependencies/ol.sh b/packaging/installer/dependencies/ol.sh +--- a/packaging/installer/dependencies/ol.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/ol.sh 2024-03-21 14:58:54.198429788 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Oracle Linux: [8, 9] >> + +diff -rup a/packaging/installer/dependencies/opensuse.sh b/packaging/installer/dependencies/opensuse.sh +--- a/packaging/installer/dependencies/opensuse.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/opensuse.sh 2024-03-21 14:58:54.200429797 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << opeSUSE >> + # supported versions: leap/15.3 and tumbleweed +diff -rup a/packaging/installer/dependencies/rockylinux.sh b/packaging/installer/dependencies/rockylinux.sh +--- a/packaging/installer/dependencies/rockylinux.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/rockylinux.sh 2024-03-21 14:58:54.202429807 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Rocky Linux:[8.5] >> + +diff -rup a/packaging/installer/dependencies/ubuntu.sh b/packaging/installer/dependencies/ubuntu.sh +--- a/packaging/installer/dependencies/ubuntu.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/dependencies/ubuntu.sh 2024-03-21 14:58:54.204429816 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Package tree used for installing netdata on distribution: + # << Ubuntu: [18.04] [20.04] [20.10] [21.04] [21.10] >> | << Linux Mint >> + +diff -rup a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh +--- a/packaging/installer/install-required-packages.sh 2024-03-21 12:47:48.891874707 +0100 ++++ b/packaging/installer/install-required-packages.sh 2024-03-21 14:58:54.206429826 +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/makeself/build.sh b/packaging/makeself/build.sh +--- a/packaging/makeself/build.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/build.sh 2024-03-21 14:58:54.313430333 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/build-static.sh 2024-03-21 14:58:54.209429840 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/build-x86_64-static.sh 2024-03-21 14:58:54.211429849 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/functions.sh 2024-03-21 14:58:54.213429859 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/install-alpine-packages.sh 2024-03-21 14:58:54.315430343 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/install-or-update.sh 2024-03-21 14:58:54.215429868 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/10-prepare-destination.install.sh 2024-03-21 14:58:54.217429878 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/20-openssl.install.sh 2024-03-21 14:58:54.219429887 +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.16.install.sh b/packaging/makeself/jobs/50-bash-5.1.16.install.sh +--- a/packaging/makeself/jobs/50-bash-5.1.16.install.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/50-bash-5.1.16.install.sh 2024-03-21 14:58:54.221429897 +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.install.sh b/packaging/makeself/jobs/50-curl.install.sh +--- a/packaging/makeself/jobs/50-curl.install.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/50-curl.install.sh 2024-03-21 14:58:54.223429906 +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.3.install.sh b/packaging/makeself/jobs/50-ioping-1.3.install.sh +--- a/packaging/makeself/jobs/50-ioping-1.3.install.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/50-ioping-1.3.install.sh 2024-03-21 14:58:54.225429916 +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-libnetfilter_acct-1.0.3.install.sh b/packaging/makeself/jobs/50-libnetfilter_acct-1.0.3.install.sh +--- a/packaging/makeself/jobs/50-libnetfilter_acct-1.0.3.install.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/50-libnetfilter_acct-1.0.3.install.sh 2024-03-21 14:58:54.227429925 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + # + # Install the libnetfilter_acct and it's dependency libmnl +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/70-netdata-git.install.sh 2024-03-21 14:58:54.229429935 +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/90-netdata-runtime-check.sh b/packaging/makeself/jobs/90-netdata-runtime-check.sh +--- a/packaging/makeself/jobs/90-netdata-runtime-check.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/90-netdata-runtime-check.sh 2024-03-21 14:58:54.231429944 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/jobs/99-makeself.install.sh 2024-03-21 14:58:54.233429954 +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 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/makeself/run-all-jobs.sh 2024-03-21 14:58:54.235429963 +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/packaging/utils/coverity-scan.sh b/packaging/utils/coverity-scan.sh +--- a/packaging/utils/coverity-scan.sh 2024-03-21 12:47:48.895874750 +0100 ++++ b/packaging/utils/coverity-scan.sh 2024-03-21 14:58:54.237429973 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Coverity scan script + # +diff -rup a/src/aclk/aclk-schemas/Makefile b/src/aclk/aclk-schemas/Makefile +--- a/src/aclk/aclk-schemas/Makefile 2024-03-21 12:47:59.591998446 +0100 ++++ b/src/aclk/aclk-schemas/Makefile 2024-03-21 14:58:54.240429987 +0100 +@@ -1,4 +1,4 @@ +-SHELL := /usr/bin/env bash -o pipefail ++SHELL := /usr/bin/bash -o pipefail + + # This controls the location of the cache. + PROJECT := cloud-schemas +diff -rup a/src/claim/netdata-claim.sh.in b/src/claim/netdata-claim.sh.in +--- a/src/claim/netdata-claim.sh.in 2024-03-21 12:47:48.903874834 +0100 ++++ b/src/claim/netdata-claim.sh.in 2024-03-21 14:58:54.242429996 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # netdata + # real-time performance and health monitoring, done right! + # (C) 2023 Netdata Inc. +diff -rup a/src/collectors/cgroups.plugin/cgroup-name.sh.in b/src/collectors/cgroups.plugin/cgroup-name.sh.in +--- a/src/collectors/cgroups.plugin/cgroup-name.sh.in 2024-03-21 12:47:48.907874877 +0100 ++++ b/src/collectors/cgroups.plugin/cgroup-name.sh.in 2024-03-21 14:58:54.244430006 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + #shellcheck disable=SC2001 + + # netdata +diff -rup a/src/collectors/cgroups.plugin/cgroup-network-helper.sh.in b/src/collectors/cgroups.plugin/cgroup-network-helper.sh.in +--- a/src/collectors/cgroups.plugin/cgroup-network-helper.sh.in 2024-03-21 12:47:48.907874877 +0100 ++++ b/src/collectors/cgroups.plugin/cgroup-network-helper.sh.in 2024-03-21 14:58:54.246430016 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # shellcheck disable=SC1117 + + # cgroup-network-helper.sh +diff -rup a/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh +--- a/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2024-03-21 12:47:48.907874877 +0100 ++++ b/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh 2024-03-21 14:58:54.248430025 +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/src/collectors/charts.d.plugin/charts.d.plugin.in b/src/collectors/charts.d.plugin/charts.d.plugin.in +--- a/src/collectors/charts.d.plugin/charts.d.plugin.in 2024-03-21 12:47:48.907874877 +0100 ++++ b/src/collectors/charts.d.plugin/charts.d.plugin.in 2024-03-21 14:58:54.250430035 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # netdata +diff -rup a/src/collectors/ioping.plugin/ioping.plugin.in b/src/collectors/ioping.plugin/ioping.plugin.in +--- a/src/collectors/ioping.plugin/ioping.plugin.in 2024-03-21 12:47:48.923875048 +0100 ++++ b/src/collectors/ioping.plugin/ioping.plugin.in 2024-03-21 14:58:54.253430049 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # SPDX-License-Identifier: GPL-3.0-or-later + + # netdata +diff -rup a/src/collectors/log2journal/tests.sh b/src/collectors/log2journal/tests.sh +--- a/src/collectors/log2journal/tests.sh 2024-03-21 12:47:48.927875090 +0100 ++++ b/src/collectors/log2journal/tests.sh 2024-03-21 14:58:54.255430058 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + if [ -f "${PWD}/log2journal" ]; then + log2journal_bin="${PWD}/log2journal" +diff -rup a/src/collectors/python.d.plugin/python.d.plugin.in b/src/collectors/python.d.plugin/python.d.plugin.in +--- a/src/collectors/python.d.plugin/python.d.plugin.in 2024-03-21 12:47:48.947875303 +0100 ++++ b/src/collectors/python.d.plugin/python.d.plugin.in 2024-03-21 14:58:54.257430068 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + '''':; + pybinary=$(which python3 || which python || which python2) + filtered=() +diff -rup a/src/collectors/python.d.plugin/python_modules/third_party/boinc_client.py b/src/collectors/python.d.plugin/python_modules/third_party/boinc_client.py +--- a/src/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2024-03-21 12:47:48.951875346 +0100 ++++ b/src/collectors/python.d.plugin/python_modules/third_party/boinc_client.py 2024-03-21 14:58:54.643431899 +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/src/collectors/systemd-journal.plugin/systemd-journal-self-signed-certs.sh b/src/collectors/systemd-journal.plugin/systemd-journal-self-signed-certs.sh +--- a/src/collectors/systemd-journal.plugin/systemd-journal-self-signed-certs.sh 2024-03-21 12:47:48.963875473 +0100 ++++ b/src/collectors/systemd-journal.plugin/systemd-journal-self-signed-certs.sh 2024-03-21 14:58:54.262430091 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + me="${0}" + dst="/etc/ssl/systemd-journal" +diff -rup a/src/collectors/tc.plugin/tc-qos-helper.sh.in b/src/collectors/tc.plugin/tc-qos-helper.sh.in +--- a/src/collectors/tc.plugin/tc-qos-helper.sh.in 2024-03-21 12:47:48.963875473 +0100 ++++ b/src/collectors/tc.plugin/tc-qos-helper.sh.in 2024-03-21 14:58:54.264430101 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # netdata + # real-time performance and health monitoring, done right! +diff -rup a/src/daemon/anonymous-statistics.sh.in b/src/daemon/anonymous-statistics.sh.in +--- a/src/daemon/anonymous-statistics.sh.in 2024-03-21 12:47:48.967875515 +0100 ++++ b/src/daemon/anonymous-statistics.sh.in 2024-03-21 14:58:54.317430352 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # Valid actions: + +diff -rup a/src/daemon/get-kubernetes-labels.sh.in b/src/daemon/get-kubernetes-labels.sh.in +--- a/src/daemon/get-kubernetes-labels.sh.in 2024-03-21 12:47:48.967875515 +0100 ++++ b/src/daemon/get-kubernetes-labels.sh.in 2024-03-21 14:58:54.266430110 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + me="$(basename "${0}")" + + # Checks if netdata is running in a kubernetes pod and fetches: +diff -rup a/src/daemon/system-info.sh b/src/daemon/system-info.sh +--- a/src/daemon/system-info.sh 2024-03-21 12:47:48.971875558 +0100 ++++ b/src/daemon/system-info.sh 2024-03-21 14:58:54.319430362 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # ------------------------------------------------------------------------------------------------- + # detect the kernel +diff -rup a/src/exporting/nc-exporting.sh b/src/exporting/nc-exporting.sh +--- a/src/exporting/nc-exporting.sh 2024-03-21 12:47:49.027876154 +0100 ++++ b/src/exporting/nc-exporting.sh 2024-03-21 14:58:54.268430120 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/src/fluent-bit/install.sh b/src/fluent-bit/install.sh +--- a/src/fluent-bit/install.sh 2024-03-21 12:48:04.636053406 +0100 ++++ b/src/fluent-bit/install.sh 2024-03-21 14:58:54.270430129 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + set -e + + # Provided primarily to simplify testing for staging, etc. +diff -rup a/src/fluent-bit/lib/c-ares-1.19.1/ltmain.sh b/src/fluent-bit/lib/c-ares-1.19.1/ltmain.sh +--- a/src/fluent-bit/lib/c-ares-1.19.1/ltmain.sh 2024-03-21 12:48:04.660053662 +0100 ++++ b/src/fluent-bit/lib/c-ares-1.19.1/ltmain.sh 2024-03-21 14:58:54.323430381 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env sh ++#! /usr/bin/sh + ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in + ## by inline-source v2019-02-19.15 + +diff -rup a/src/fluent-bit/lib/c-ares-1.19.1/test/ltmain.sh b/src/fluent-bit/lib/c-ares-1.19.1/test/ltmain.sh +--- a/src/fluent-bit/lib/c-ares-1.19.1/test/ltmain.sh 2024-03-21 12:48:04.684053919 +0100 ++++ b/src/fluent-bit/lib/c-ares-1.19.1/test/ltmain.sh 2024-03-21 14:58:54.328430405 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env sh ++#! /usr/bin/sh + ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in + ## by inline-source v2019-02-19.15 + +diff -rup a/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_run_tests.py b/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_run_tests.py +--- a/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_run_tests.py 2024-03-21 12:48:04.752054646 +0100 ++++ b/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_run_tests.py 2024-03-21 14:58:54.649431928 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import sys + from itertools import combinations +diff -rup a/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_travis.py b/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_travis.py +--- a/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_travis.py 2024-03-21 12:48:04.752054646 +0100 ++++ b/src/fluent-bit/lib/jemalloc-5.3.0/scripts/gen_travis.py 2024-03-21 14:58:54.652431942 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + from itertools import combinations, chain + from enum import Enum, auto +diff -rup a/src/fluent-bit/lib/jemalloc-5.3.0/src/ticker.py b/src/fluent-bit/lib/jemalloc-5.3.0/src/ticker.py +--- a/src/fluent-bit/lib/jemalloc-5.3.0/src/ticker.py 2024-03-21 12:48:04.756054689 +0100 ++++ b/src/fluent-bit/lib/jemalloc-5.3.0/src/ticker.py 2024-03-21 14:58:54.655431956 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import math + +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/configure b/src/fluent-bit/lib/librdkafka-2.1.0/configure +--- a/src/fluent-bit/lib/librdkafka-2.1.0/configure 2024-03-21 12:48:04.784054988 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/configure 2024-03-21 14:58:54.273430144 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + + BASHVER=$(expr ${BASH_VERSINFO[0]} * 1000 + ${BASH_VERSINFO[1]}) +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/lds-gen.py b/src/fluent-bit/lib/librdkafka-2.1.0/lds-gen.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/lds-gen.py 2024-03-21 12:48:04.788055031 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/lds-gen.py 2024-03-21 14:58:54.658431971 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # librdkafka - Apache Kafka C library + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/get_version.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/get_version.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/get_version.py 2024-03-21 12:48:04.792055074 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/get_version.py 2024-03-21 14:58:54.661431985 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import sys + +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/artifact.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/artifact.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/artifact.py 2024-03-21 12:48:04.792055074 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/artifact.py 2024-03-21 14:58:54.664431999 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # Collects CI artifacts from S3 storage, downloading them +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/cleanup-s3.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/cleanup-s3.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/cleanup-s3.py 2024-03-21 12:48:04.792055074 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/cleanup-s3.py 2024-03-21 14:58:54.667432013 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Clean up test builds from librdkafka's S3 bucket. + # This also covers python builds. +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/nugetpackage.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/nugetpackage.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/nugetpackage.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/nugetpackage.py 2024-03-21 14:58:54.670432027 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Create NuGet package + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/packaging.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/packaging.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/packaging.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/packaging.py 2024-03-21 14:58:54.673432042 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Packaging script. + # Assembles packages using CI artifacts. +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/release.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/release.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/release.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/release.py 2024-03-21 14:58:54.677432061 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # NuGet release packaging tool. +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/staticpackage.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/staticpackage.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/staticpackage.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/staticpackage.py 2024-03-21 14:58:54.680432075 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Create self-contained static-library tar-ball package + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/zfile/zfile.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/zfile/zfile.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/zfile/zfile.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/nuget/zfile/zfile.py 2024-03-21 14:58:54.682432084 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + import os + import tarfile +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/tools/gh-release-checksums.py b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/tools/gh-release-checksums.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/packaging/tools/gh-release-checksums.py 2024-03-21 12:48:04.800055159 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/packaging/tools/gh-release-checksums.py 2024-03-21 14:58:54.685432099 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Calculate checksums for GitHub release artifacts/assets. + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/broker_version_tests.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/broker_version_tests.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/broker_version_tests.py 2024-03-21 12:48:04.848055673 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/broker_version_tests.py 2024-03-21 14:58:54.691432127 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # Run librdkafka regression tests on with different SASL parameters +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/cluster_testing.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/cluster_testing.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/cluster_testing.py 2024-03-21 12:48:04.848055673 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/cluster_testing.py 2024-03-21 14:58:54.694432141 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # Cluster testing helper +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/interactive_broker_version.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/interactive_broker_version.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/interactive_broker_version.py 2024-03-21 12:48:04.848055673 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/interactive_broker_version.py 2024-03-21 14:58:54.697432156 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # Run librdkafka regression tests on different supported broker versions. +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/LibrdkafkaTestApp.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/LibrdkafkaTestApp.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/LibrdkafkaTestApp.py 2024-03-21 12:48:04.848055673 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/LibrdkafkaTestApp.py 2024-03-21 14:58:54.688432113 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # librdkafka test trivup app module + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/performance_plot.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/performance_plot.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/performance_plot.py 2024-03-21 12:48:04.852055715 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/performance_plot.py 2024-03-21 14:58:54.700432170 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + + import sys +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/run-test.sh b/src/fluent-bit/lib/librdkafka-2.1.0/tests/run-test.sh +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/run-test.sh 2024-03-21 12:48:04.852055715 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/run-test.sh 2024-03-21 14:58:54.275430153 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + + RED='\033[31m' +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/sasl_test.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/sasl_test.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/sasl_test.py 2024-03-21 12:48:04.852055715 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/sasl_test.py 2024-03-21 14:58:54.703432184 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # + # Run librdkafka regression tests on with different SASL parameters +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/graph.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/graph.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/graph.py 2024-03-21 12:48:04.852055715 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/graph.py 2024-03-21 14:58:54.706432198 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Use pandas + bokeh to create graphs/charts/plots for stats CSV (to_csv.py). + # +diff -rup a/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/to_csv.py b/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/to_csv.py +--- a/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/to_csv.py 2024-03-21 12:48:04.852055715 +0100 ++++ b/src/fluent-bit/lib/librdkafka-2.1.0/tests/tools/stats/to_csv.py 2024-03-21 14:58:54.709432212 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Parse librdkafka stats JSON from stdin, one stats object per line, pick out + # the relevant fields and emit CSV files suitable for plotting with graph.py +diff -rup a/src/fluent-bit/lib/monkey/mk_core/deps/libevent/checkpatch.sh b/src/fluent-bit/lib/monkey/mk_core/deps/libevent/checkpatch.sh +--- a/src/fluent-bit/lib/monkey/mk_core/deps/libevent/checkpatch.sh 2024-03-21 12:48:04.912056357 +0100 ++++ b/src/fluent-bit/lib/monkey/mk_core/deps/libevent/checkpatch.sh 2024-03-21 14:58:54.277430163 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # TODO: + # - inline replace +diff -rup a/src/fluent-bit/lib/monkey/mk_core/deps/libevent/event_rpcgen.py b/src/fluent-bit/lib/monkey/mk_core/deps/libevent/event_rpcgen.py +--- a/src/fluent-bit/lib/monkey/mk_core/deps/libevent/event_rpcgen.py 2024-03-21 12:48:04.912056357 +0100 ++++ b/src/fluent-bit/lib/monkey/mk_core/deps/libevent/event_rpcgen.py 2024-03-21 14:58:54.715432241 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/python32 + # + # Copyright (c) 2005-2007 Niels Provos provos@citi.umich.edu + # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson +diff -rup a/src/fluent-bit/lib/monkey/qa/checklog b/src/fluent-bit/lib/monkey/qa/checklog +--- a/src/fluent-bit/lib/monkey/qa/checklog 2024-03-21 12:48:04.932056571 +0100 ++++ b/src/fluent-bit/lib/monkey/qa/checklog 2024-03-21 14:58:54.718432255 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # Copyright (C) 2010, Eduardo Silva edsiper@gmail.com + # +diff -rup a/src/fluent-bit/lib/onigmo/testpy.py b/src/fluent-bit/lib/onigmo/testpy.py +--- a/src/fluent-bit/lib/onigmo/testpy.py 2024-03-21 12:48:04.956056827 +0100 ++++ b/src/fluent-bit/lib/onigmo/testpy.py 2024-03-21 14:58:54.722432274 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + + from __future__ import print_function, unicode_literals +diff -rup a/src/fluent-bit/lib/onigmo/tool/update-doc.py b/src/fluent-bit/lib/onigmo/tool/update-doc.py +--- a/src/fluent-bit/lib/onigmo/tool/update-doc.py 2024-03-21 12:48:04.956056827 +0100 ++++ b/src/fluent-bit/lib/onigmo/tool/update-doc.py 2024-03-21 14:58:54.725432288 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # -*- coding: utf-8 -*- + + # Usage: +diff -rup a/src/fluent-bit/lib/onigmo/win32/makedef.py b/src/fluent-bit/lib/onigmo/win32/makedef.py +--- a/src/fluent-bit/lib/onigmo/win32/makedef.py 2024-03-21 12:48:04.956056827 +0100 ++++ b/src/fluent-bit/lib/onigmo/win32/makedef.py 2024-03-21 14:58:54.728432303 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + from __future__ import print_function + import re +diff -rup a/src/fluent-bit/lib/tutf8e/codegen.py b/src/fluent-bit/lib/tutf8e/codegen.py +--- a/src/fluent-bit/lib/tutf8e/codegen.py 2024-03-21 12:48:05.000057298 +0100 ++++ b/src/fluent-bit/lib/tutf8e/codegen.py 2024-03-21 14:58:54.731432317 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + + encodings = [ + 'windows-1250', 'windows-1251', 'windows-1252', +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/build-scripts/build_llvm.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/build-scripts/build_llvm.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/build-scripts/build_llvm.py 2024-03-21 12:48:05.004057340 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/build-scripts/build_llvm.py 2024-03-21 14:58:54.755432431 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/build_wamr.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/build_wamr.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/build_wamr.sh 2024-03-21 12:48:05.004057340 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/build_wamr.sh 2024-03-21 14:58:54.279430172 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/coding_guidelines_check.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/coding_guidelines_check.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/coding_guidelines_check.py 2024-03-21 12:48:05.004057340 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/ci/coding_guidelines_check.py 2024-03-21 14:58:54.758432445 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/extract_from_release_notes.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/extract_from_release_notes.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/extract_from_release_notes.py 2024-03-21 12:48:05.000057298 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/extract_from_release_notes.py 2024-03-21 14:58:54.734432331 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/fetch_and_compare_version.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/fetch_and_compare_version.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/fetch_and_compare_version.py 2024-03-21 12:48:05.000057298 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/fetch_and_compare_version.py 2024-03-21 14:58:54.737432346 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/reuse_latest_release_binaries.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/reuse_latest_release_binaries.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/reuse_latest_release_binaries.py 2024-03-21 12:48:05.000057298 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/.github/scripts/reuse_latest_release_binaries.py 2024-03-21 14:58:54.740432360 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/build.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/build.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/build.sh 2024-03-21 12:48:05.056057897 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/build.sh 2024-03-21 14:58:54.281430181 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/build.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/build.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/build.sh 2024-03-21 12:48:05.056057897 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/build.sh 2024-03-21 14:58:54.283430191 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/run.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/run.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/run.sh 2024-03-21 12:48:05.056057897 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/go/samples/run.sh 2024-03-21 14:58:54.285430201 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/python/wasm-c-api/samples/hello_oop.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/python/wasm-c-api/samples/hello_oop.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/python/wasm-c-api/samples/hello_oop.py 2024-03-21 12:48:05.060057939 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/language-bindings/python/wasm-c-api/samples/hello_oop.py 2024-03-21 14:58:54.774432521 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/product-mini/platforms/windows/build_llvm.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/product-mini/platforms/windows/build_llvm.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/product-mini/platforms/windows/build_llvm.py 2024-03-21 12:48:05.064057982 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/product-mini/platforms/windows/build_llvm.py 2024-03-21 14:58:54.821432744 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/simple/sample_test_run.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/simple/sample_test_run.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/simple/sample_test_run.py 2024-03-21 12:48:05.072058068 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/simple/sample_test_run.py 2024-03-21 14:58:54.824432758 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/socket-api/sample_test_run.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/socket-api/sample_test_run.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/socket-api/sample_test_run.py 2024-03-21 12:48:05.072058068 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/samples/socket-api/sample_test_run.py 2024-03-21 14:58:54.827432772 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2023 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/all.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/all.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/all.py 2024-03-21 12:48:05.100058367 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/all.py 2024-03-21 14:58:54.840432834 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/collect_coverage.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/collect_coverage.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/collect_coverage.sh 2024-03-21 12:48:05.100058367 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/collect_coverage.sh 2024-03-21 14:58:54.287430210 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/runtest.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/runtest.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/runtest.py 2024-03-21 12:48:05.100058367 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/spec-test-script/runtest.py 2024-03-21 14:58:54.843432848 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + from __future__ import print_function + +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/test_wamr.sh b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/test_wamr.sh +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/test_wamr.sh 2024-03-21 12:48:05.100058367 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/tests/wamr-test-suites/test_wamr.sh 2024-03-21 14:58:54.289430220 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/IoT-APP-Store-Demo/wasm_django/manage.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/IoT-APP-Store-Demo/wasm_django/manage.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/IoT-APP-Store-Demo/wasm_django/manage.py 2024-03-21 12:48:05.080058153 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/IoT-APP-Store-Demo/wasm_django/manage.py 2024-03-21 14:58:54.830432787 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """Django's command-line utility for administrative tasks.""" + import os + import sys +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/pick-up-emscripten-headers/collect_files.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/pick-up-emscripten-headers/collect_files.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/pick-up-emscripten-headers/collect_files.py 2024-03-21 12:48:05.092058281 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/test-tools/pick-up-emscripten-headers/collect_files.py 2024-03-21 14:58:54.836432815 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/wamr-compiler/build_llvm.py b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/wamr-compiler/build_llvm.py +--- a/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/wamr-compiler/build_llvm.py 2024-03-21 12:48:05.100058367 +0100 ++++ b/src/fluent-bit/lib/wasm-micro-runtime-WAMR-1.2.2/wamr-compiler/build_llvm.py 2024-03-21 14:58:54.846432863 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright (C) 2019 Intel Corporation. All rights reserved. + # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +diff -rup a/src/go/collectors/go.d.plugin/hack/go-build.sh b/src/go/collectors/go.d.plugin/hack/go-build.sh +--- a/src/go/collectors/go.d.plugin/hack/go-build.sh 2024-03-21 12:47:49.039876282 +0100 ++++ b/src/go/collectors/go.d.plugin/hack/go-build.sh 2024-03-21 14:58:54.292430234 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/src/health/notifications/alarm-email.sh b/src/health/notifications/alarm-email.sh +--- a/src/health/notifications/alarm-email.sh 2024-03-21 12:47:49.167877645 +0100 ++++ b/src/health/notifications/alarm-email.sh 2024-03-21 14:58:54.294430243 +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/src/health/notifications/alarm-notify.sh.in b/src/health/notifications/alarm-notify.sh.in +--- a/src/health/notifications/alarm-notify.sh.in 2024-03-21 12:47:49.167877645 +0100 ++++ b/src/health/notifications/alarm-notify.sh.in 2024-03-21 14:58:54.296430253 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + #shellcheck source=/dev/null disable=SC2086,SC2154 + + # netdata +diff -rup a/src/health/notifications/alarm-test.sh b/src/health/notifications/alarm-test.sh +--- a/src/health/notifications/alarm-test.sh 2024-03-21 12:47:49.167877645 +0100 ++++ b/src/health/notifications/alarm-test.sh 2024-03-21 14:58:54.299430267 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + # netdata + # real-time performance and health monitoring, done right! +diff -rup a/src/libnetdata/gorilla/benchmark.sh b/src/libnetdata/gorilla/benchmark.sh +--- a/src/libnetdata/gorilla/benchmark.sh 2024-03-21 12:47:49.179877772 +0100 ++++ b/src/libnetdata/gorilla/benchmark.sh 2024-03-21 14:58:54.301430276 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # SPDX-License-Identifier: GPL-3.0-or-later + # +diff -rup a/src/libnetdata/gorilla/fuzzer.sh b/src/libnetdata/gorilla/fuzzer.sh +--- a/src/libnetdata/gorilla/fuzzer.sh 2024-03-21 12:47:49.179877772 +0100 ++++ b/src/libnetdata/gorilla/fuzzer.sh 2024-03-21 14:58:54.303430286 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # SPDX-License-Identifier: GPL-3.0-or-later + # +diff -rup a/src/ml/dlib/dlib/external/pybind11/tools/mkdoc.py b/src/ml/dlib/dlib/external/pybind11/tools/mkdoc.py +--- a/src/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2024-03-21 12:48:08.568095449 +0100 ++++ b/src/ml/dlib/dlib/external/pybind11/tools/mkdoc.py 2024-03-21 14:58:54.866432958 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] + # +diff -rup a/src/ml/dlib/dlib/travis/build-and-test.sh b/src/ml/dlib/dlib/travis/build-and-test.sh +--- a/src/ml/dlib/dlib/travis/build-and-test.sh 2024-03-21 12:48:08.664096475 +0100 ++++ b/src/ml/dlib/dlib/travis/build-and-test.sh 2024-03-21 14:58:54.305430295 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # Exit if anything fails. + set -eux + +diff -rup a/src/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py b/src/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py +--- a/src/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2024-03-21 12:48:08.724097117 +0100 ++++ b/src/ml/dlib/tools/convert_dlib_nets_to_caffe/running_a_dlib_model_with_caffe_example.py 2024-03-21 14:58:54.869432972 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + # This script takes the dlib lenet model trained by the + # examples/dnn_introduction_ex.cpp example program and runs it using caffe. +diff -rup a/src/web/gui/bundle_dashboard_v1.py b/src/web/gui/bundle_dashboard_v1.py +--- a/src/web/gui/bundle_dashboard_v1.py 2024-03-21 12:47:49.215878156 +0100 ++++ b/src/web/gui/bundle_dashboard_v1.py 2024-03-21 14:58:54.872432986 +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 -rup a/src/web/gui/bundle_dashboard_v2.py b/src/web/gui/bundle_dashboard_v2.py +--- a/src/web/gui/bundle_dashboard_v2.py 2024-03-21 12:47:49.215878156 +0100 ++++ b/src/web/gui/bundle_dashboard_v2.py 2024-03-21 14:58:54.875433000 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python33 + # + # Copyright: © 2023 Netdata Inc. + # SPDX-License-Identifier: GPL-3.0-or-later +diff -rup a/src/web/server/h2o/libh2o/deps/brotli/python/bro.py b/src/web/server/h2o/libh2o/deps/brotli/python/bro.py +--- a/src/web/server/h2o/libh2o/deps/brotli/python/bro.py 2024-03-21 12:48:08.784097759 +0100 ++++ b/src/web/server/h2o/libh2o/deps/brotli/python/bro.py 2024-03-21 14:58:54.878433015 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python3 + """bro %s -- compression/decompression utility using the Brotli algorithm.""" + + from __future__ import print_function +diff -rup a/src/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py b/src/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py +--- a/src/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2024-03-21 12:48:08.784097759 +0100 ++++ b/src/web/server/h2o/libh2o/deps/brotli/python/tests/compatibility_test.py 2024-03-21 14:58:54.881433029 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + from __future__ import print_function + import glob + import sys +diff -rup a/src/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py b/src/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py +--- a/src/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2024-03-21 12:48:08.784097759 +0100 ++++ b/src/web/server/h2o/libh2o/deps/brotli/python/tests/custom_dictionary_test.py 2024-03-21 14:58:54.884433043 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + from __future__ import print_function + import sys + import os +diff -rup a/src/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py b/src/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py +--- a/src/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2024-03-21 12:48:08.784097759 +0100 ++++ b/src/web/server/h2o/libh2o/deps/brotli/python/tests/roundtrip_test.py 2024-03-21 14:58:54.887433057 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + from __future__ import print_function + import sys + import os +diff -rup a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py +--- a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2024-03-21 12:48:08.904099042 +0100 ++++ b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_arm.py 2024-03-21 14:58:54.890433071 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + +diff -rup a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py +--- a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2024-03-21 12:48:08.904099042 +0100 ++++ b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr_extra.py 2024-03-21 14:58:54.896433100 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + +diff -rup a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py +--- a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2024-03-21 12:48:08.904099042 +0100 ++++ b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/mult_avr.py 2024-03-21 14:58:54.893433086 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + +diff -rup a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py +--- a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2024-03-21 12:48:08.904099042 +0100 ++++ b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_arm.py 2024-03-21 14:58:54.899433114 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + +diff -rup a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py +--- a/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2024-03-21 12:48:08.904099042 +0100 ++++ b/src/web/server/h2o/libh2o/deps/picotls/deps/micro-ecc/scripts/square_avr.py 2024-03-21 14:58:54.902433128 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import sys + +diff -rup a/src/web/server/h2o/libh2o/misc/mkhufftbl.py b/src/web/server/h2o/libh2o/misc/mkhufftbl.py +--- a/src/web/server/h2o/libh2o/misc/mkhufftbl.py 2024-03-21 12:48:09.088101009 +0100 ++++ b/src/web/server/h2o/libh2o/misc/mkhufftbl.py 2024-03-21 14:58:54.905433143 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + + # The MIT License +diff -rup a/system/edit-config b/system/edit-config +--- a/system/edit-config 2024-03-21 12:47:49.423880370 +0100 ++++ b/system/edit-config 2024-03-21 14:58:54.331430419 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # shellcheck disable=SC1091 + [ -f /etc/profile ] && . /etc/profile +diff -rup a/system/install-service.sh.in b/system/install-service.sh.in +--- a/system/install-service.sh.in 2024-03-21 12:47:49.423880370 +0100 ++++ b/system/install-service.sh.in 2024-03-21 14:58:54.333430428 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env sh ++#!/usr/bin/sh + + # SPDX-License-Identifier: GPL-3.0-or-later + +diff -rup a/system/lsb/init.d/netdata.in b/system/lsb/init.d/netdata.in +--- a/system/lsb/init.d/netdata.in 2024-03-21 12:47:49.427880413 +0100 ++++ b/system/lsb/init.d/netdata.in 2024-03-21 14:58:54.307430305 +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 2024-03-21 12:47:49.427880413 +0100 ++++ b/tests/health_mgmtapi/health-cmdapi-test.sh.in 2024-03-21 14:58:54.309430315 +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 2024-03-21 12:47:49.427880413 +0100 ++++ b/tests/run-unit-tests.sh 2024-03-21 14:58:54.311430324 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + # + # Unit-testing script + # diff --git a/netdata-remove-fonts-1.41.0.patch b/netdata-remove-fonts-1.41.0.patch deleted file mode 100644 index 0c15444..0000000 --- a/netdata-remove-fonts-1.41.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -rup a/web/gui/v1/Makefile.am b/web/gui/v1/Makefile.am ---- a/web/gui/v1/Makefile.am 2023-02-06 15:18:31.201561714 +0100 -+++ b/web/gui/v1/Makefile.am 2023-02-07 08:59:30.617627390 +0100 -@@ -171,36 +171,3 @@ dist_webstaticjs_DATA = \ - $(srcdir)/static/js/runtime-main.08abed8f.js \ - $(srcdir)/static/js/runtime-main.08abed8f.js.map \ - $(NULL) -- --webstaticmediadir=$(webdir)/static/media --dist_webstaticmedia_DATA = \ -- $(srcdir)/static/media/ibm-plex-sans-latin-100.245539db.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-100.9a582f3a.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-200.67524c36.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-200.bf72c841.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-200italic.52df2560.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-400.263d6267.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-400.a2c56f94.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-400italic.272f8611.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-500.0866c244.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-600.337b1651.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-700.b8809d61.woff \ -- $(srcdir)/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2 \ -- $(srcdir)/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff \ -- $(srcdir)/static/media/material-icons.0509ab09.woff2 \ -- $(NULL) diff --git a/netdata-remove-fonts-1.45.0.patch b/netdata-remove-fonts-1.45.0.patch new file mode 100644 index 0000000..86a286c --- /dev/null +++ b/netdata-remove-fonts-1.45.0.patch @@ -0,0 +1,15 @@ +diff -rup a/src/web/gui/v1/dashboard_v1.cmake b/src/web/gui/v1/dashboard_v1.cmake +--- a/src/web/gui/v1/dashboard_v1.cmake 2024-03-21 12:47:49.227878283 +0100 ++++ b/src/web/gui/v1/dashboard_v1.cmake 2024-03-23 13:54:39.902314666 +0100 +@@ -30,11 +30,6 @@ src/web/gui/v1/css/bootstrap-theme-3.3.7 + src/web/gui/v1/css/bootstrap-toggle-2.2.2.min.css + src/web/gui/v1/css/dashboard.css + src/web/gui/v1/css/dashboard.slate.css DESTINATION ${WEB_DEST}/css) +- install(FILES src/web/gui/v1/fonts/glyphicons-halflings-regular.eot +-src/web/gui/v1/fonts/glyphicons-halflings-regular.svg +-src/web/gui/v1/fonts/glyphicons-halflings-regular.ttf +-src/web/gui/v1/fonts/glyphicons-halflings-regular.woff +-src/web/gui/v1/fonts/glyphicons-halflings-regular.woff2 DESTINATION ${WEB_DEST}/fonts) + install(FILES src/web/gui/v1/images/alert-128-orange.png + src/web/gui/v1/images/alert-128-red.png + src/web/gui/v1/images/alert-multi-size-orange.ico diff --git a/netdata.init b/netdata.init deleted file mode 100644 index 3505e11..0000000 --- a/netdata.init +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# -# netdata This shell script takes care of starting and stopping netdata. -# -# chkconfig: 345 99 01 -# description: netdata is a Real-time performance monitoring -# probe: false -# processname: netdata -# pidfile: /var/run/netdata.pid -### BEGIN INIT INFO -# Provides: netdata -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 3 4 5 -# Short-Description: netdata. -# Description: netdata is a highly optimized Linux daemon providing real-time -# performance monitoring for Linux systems, Applications, SNMP devices, over -# the web! -#It tries to visualize the truth of now, in its greatest detail, so that you -#can get insights of what is happening now and what just happened, on your -#systems and applications. -### END INIT INFO - - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -f /usr/sbin/netdata ] || exit 0 - -# See how we were called. -case "$1" in - start) - if [ -n "`/sbin/pidof netdata`" ]; then - echo -n "netdata: already running" - RETVAL=$? - echo - exit $RETVAL - fi - echo -n "Starting netdata: " - /usr/sbin/netdata ${OPTIONS} - RETVAL=$? - [ $RETVAL -eq 0 ] && success || failure - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/netdata - ;; - stop) - echo -n "Stopping netdata: " - killproc netdata - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netdata - ;; - status) - status netdata - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - *) - echo "Usage: netdata {start|stop|status|restart}" - exit 1 - ;; -esac - -exit $RETVAL diff --git a/netdata.spec b/netdata.spec index 658ba8a..f858beb 100644 --- a/netdata.spec +++ b/netdata.spec @@ -33,6 +33,23 @@ ExcludeArch: s390x %bcond_with bundled_judy %endif
+# Only on fedora +%if 0%{?fedora} +%ifnarch i686 +%bcond_without xenstat +%else +%bcond_with xenstat +%endif +%bcond_without plugin_go +%else +%bcond_with xenstat +%bcond_with plugin_go +%endif + +%bcond_without ml +%bcond_without exporter_mongodb +%bcond_with ebpf + %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 @@ -40,11 +57,14 @@ ExcludeArch: s390x %global __os_install_post %{nil} %endif
+# Workaroound for Missing build-id on go.d.plugin +%global _missing_build_ids_terminate_build 0 + # We use some plugins which need suid %global _hardened_build 1
# Build release candidate -%global upver 1.44.3 +%global upver 1.45.0 #global rcver rc0
# Last python 2 support (el7 only) @@ -52,9 +72,6 @@ ExcludeArch: s390x # el8 only %global judy_ver 1.0.5-netdata2
-# -%global plugin_go_ver 0.58.0 - %global netdata_conf_stock %{_prefix}/lib/%{name}
Name: netdata @@ -62,31 +79,28 @@ Version: %{upver}%{?rcver:~%{rcver}} Release: 1%{?dist} Summary: Real-time performance monitoring # For a breakdown of the licensing, see license REDISTRIBUTED.md -License: GPL-3.0-only +License: GPL-3.0-or-later URL: http://my-netdata.io Source0: https://github.com/netdata/netdata/releases/download/v%%7Bupver%7D%%7B?rcver... Source1: netdata.tmpfiles.conf -Source2: netdata.init Source3: netdata.conf Source4: netdata.profile Source5: README-packager.md -Source20: https://github.com/netdata/go.d.plugin/releases/download/v%%7Bplugin_go_ver%... -Source21: netdata-install-go-plugins.sh +Source20: go.d.plugin-vendor-%{upver}%{?rcver:-%{rcver}}.tar.xz # Only for el7 Source10: https://github.com/protocolbuffers/protobuf/releases/download/v%%7Bprotobuf_... # Only for el8 Source11: https://github.com/netdata/libjudy/archive/v%%7Bjudy_ver%7D/libjudy-%%7Bjudy... -Patch0: netdata-fix-shebang-1.41.0.patch +Patch0: netdata-fix-shebang-1.45.0.patch %if 0%{?fedora} # Remove embedded font -Patch10: netdata-remove-fonts-1.41.0.patch +Patch10: netdata-remove-fonts-1.45.0.patch %endif
BuildRequires: zlib-devel BuildRequires: git -BuildRequires: autoconf -BuildRequires: autoconf-archive -BuildRequires: automake +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libuuid-devel BuildRequires: freeipmi-devel @@ -103,15 +117,12 @@ BuildRequires: openssl-devel BuildRequires: libmnl-devel BuildRequires: make BuildRequires: libcurl-devel -BuildRequires: systemd BuildRequires: openssl-devel BuildRequires: libpfm-devel BuildRequires: libyaml-devel -### TODO Remove condition when autogen become available in el9 -%if 0%{?rhel} && 0%{?rhel} == 9 -%else -BuildRequires: autogen -%endif +BuildRequires: ninja-build +BuildRequires: golang >= 1.21 +BuildRequires: systemd-devel
# Prometheus BuildRequires: snappy-devel @@ -120,19 +131,29 @@ BuildRequires: protobuf-c-devel BuildRequires: findutils
# Cloud client -BuildRequires: cmake -BuildRequires: gcc-c++ BuildRequires: json-c-devel BuildRequires: libcap-devel
# For tests BuildRequires: libcmocka-devel
+# ebpf +#BuildRequires: elfutils-libelf-devel +# exporter mongodb +%if %{with exporter_mongodb} +BuildRequires: pkgconfig(libmongoc-1.0) +%endif + +%if %{with xenstat} +BuildRequires: pkgconfig(xenstat) +BuildRequires: pkgconfig(xenlight) +%endif %if %{with cups} BuildRequires: cups-devel >= 1.7 %endif %if %{with netfilteracct} BuildRequires: libnetfilter_acct-devel +BuildRequires: libmnl-devel %endif # Only Fedora or el8+ %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -194,11 +215,11 @@ freeipmi plugin for netdata
%prep %setup -qn %{name}-v%{upver}%{?rcver:-%{rcver}} -%patch0 -p1 +%patch -P0 -p1 %if 0%{?fedora} # Remove embedded font(added in requires) -%patch10 -p1 -rm -rf web/fonts web/gui/dashboard/static/media +%patch -P10 -p1 +rm -rf src/web/gui/v1/fonts/ %endif cp %{SOURCE5} . ### BEGIN netdata cloud @@ -208,19 +229,13 @@ tar -xzf %{SOURCE10} -C externaldeps/protobuf %endif ### END netdata cloud
-### BEGIN el8 judy dirty hack -%if %{with bundled_judy} -mkdir -p externaldeps/libJudy -tar -xzf %{SOURCE11} -C externaldeps/libJudy +### BEGIN go.d.plugin +%if %{with plugin_go} +pushd src/go/collectors/go.d.plugin/ +tar -xf %{SOURCE20} +popd %endif -### END el8 judy dirty hack - -gover=$(grep go.d.plugin packaging/go.d.checksums | grep linux-amd64 | cut -d ' ' -f2 | sed -e 's/*go.d.plugin-v([0-9.]+).linux-amd64.tar.gz/\1/') -if [ "${gover}" != "%{plugin_go_ver}" ] -then - echo "Version of go.d.plugin mismatch: must be "${gover}", got "%{plugin_go_ver}"" - exit 1 -fi +### END go.d.plugin
%build ### BEGIN netdata cloud @@ -237,62 +252,84 @@ cp -a externaldeps/protobuf/protobuf-%{protobuf_cpp_ver}/src externaldeps/protob %endif ### END netdata cloud
-### BEGIN el8 judy dirty hack -%if %{with bundled_judy} -pushd externaldeps/libJudy/libjudy-%{judy_ver} -libtoolize --force --copy -aclocal -autoheader -automake --add-missing --force --copy --include-deps -autoconf -%configure -make -C src -ar -r src/libJudy.a src/Judy*/*.o -popd -cp -a externaldeps/libJudy/libjudy-%{judy_ver}/src/libJudy.a externaldeps/libJudy/ -cp -a externaldeps/libJudy/libjudy-%{judy_ver}/src/Judy.h externaldeps/libJudy/ -%endif -### END el8 judy dirty hack - -autoreconf -ivf -%configure \ - --enable-plugin-freeipmi \ -%if %{with netfilteracct} - --enable-plugin-nfacct \ +%cmake -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/ \ +%if 0%{?rhel} && 0%{?rhel} == 8 + -DUSE_CXX_11=On \ %endif %if %{with cups} - --enable-plugin-cups \ + -DENABLE_PLUGIN_CUPS=On \ +%else + -DENABLE_PLUGIN_CUPS=Off \ %endif +%if %{with netfilteracct} + -DENABLE_PLUGIN_NFACCT=On \ +%else + -DENABLE_PLUGIN_NFACCT=Off \ +%endif + -DENABLE_PLUGIN_FREEIPMI=On \ %if %{with bundled_protobuf} - --with-bundled-protobuf \ + -DENABLE_BUNDLED_PROTOBUF=On \ +%else + -DENABLE_BUNDLED_PROTOBUF=Off \ %endif -%if %{with bundled_judy} - --with-bundled-libJudy \ +%if %{with xenstat} + -DENABLE_PLUGIN_XENSTAT=On \ +%else + -DENABLE_PLUGIN_XENSTAT=Off \ +%endif +%if %{with ebpf} + -DENABLE_PLUGIN_EBPF=On \ +%else + -DENABLE_PLUGIN_EBPF=Off \ %endif - --with-zlib \ - --with-math \ - --with-user=netdata +%if %{with ml} + -DENABLE_ML=On \ +%else + -DENABLE_ML=Off \ +%endif +%if %{with exporter_mongodb} + -DENABLE_EXPORTER_MONGODB=On \ +%else + -DENABLE_EXPORTER_MONGODB=Off \ +%endif + -DENABLE_ACLK=On \ + -DENABLE_CLOUD=On \ + -DENABLE_DBENGINE=On \ + -DENABLE_H2O=On \ + -DENABLE_PLUGIN_APPS=On \ + -DENABLE_PLUGIN_CGROUP_NETWORK=On \ + -DENABLE_PLUGIN_DEBUGFS=On \ +%if %{with plugin_go} + -DENABLE_PLUGIN_GO=On \ +%else + -DENABLE_PLUGIN_GO=Off \ +%endif + -DENABLE_PLUGIN_LOCAL_LISTENERS=On \ + -DENABLE_PLUGIN_PERF=On \ + -DENABLE_PLUGIN_SLABINFO=On \ + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=On \ + -DENABLE_PLUGIN_LOGS_MANAGEMENT=On \ + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=On \ + -DENABLE_BUNDLED_JSONC=Off \ + -DENABLE_BUNDLED_YAML=Off
-%make_build - -# Integrate go plugins -mkdir conf.d -tar -xf %{SOURCE20} -C conf.d/ +%{cmake_build}
%install -%make_install +%{cmake_install} find %{buildroot} -name '.keep' -delete # Unit file mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d %if 0%{?rhel} && 0%{?rhel} <= 7 -install -Dp -m 0644 system/systemd/netdata.service.v235 %{buildroot}%{_unitdir}/%{name}.service +install -Dp -m 0644 %{_vpath_builddir}/system/systemd/netdata.service.v235 %{buildroot}%{_unitdir}/%{name}.service %else -install -Dp -m 0644 system/systemd/netdata.service %{buildroot}%{_unitdir}/%{name}.service +install -Dp -m 0644 %{_vpath_builddir}/system/systemd/netdata.service %{buildroot}%{_unitdir}/%{name}.service %endif install -p -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -Dp -m 0644 system/logrotate/netdata %{buildroot}%{_sysconfdir}/logrotate.d/netdata +install -Dp -m 0644 %{_vpath_builddir}/system/logrotate/netdata %{buildroot}%{_sysconfdir}/logrotate.d/netdata
mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}%{_localstatedir}/log/%{name} @@ -300,11 +337,11 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ # it's better to put stock config file in a noarch pkg (like systemd) -%ifnarch i686 -mkdir -p %{buildroot}%{netdata_conf_stock}/conf.d -mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{netdata_conf_stock}/conf.d/ -sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_sysconfdir}/%{name}/edit-config -%endif +# %%ifnarch i686 +# mkdir -p %{buildroot}%{netdata_conf_stock}/conf.d +# mv %{buildroot}%{_libdir}/%{name}/conf.d/* %{buildroot}%{netdata_conf_stock}/conf.d/ +# sed -i -e '/NETDATA_STOCK_CONFIG_DIR/ s/lib64/lib/' %{buildroot}%{_sysconfdir}/%{name}/edit-config +# %endif sed -i -e '/^script_dir/s;=.*;="${NETDATA_USER_CONFIG_DIR:-%{_sysconfdir}/netdata}";' \ %{buildroot}%{_sysconfdir}/%{name}/edit-config
@@ -326,23 +363,12 @@ done mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/netdata.sh sed -i -e '/NETDATA_STOCK_CONFIG_DIR/s;@STOCK_CONFIG_DIR@;%{netdata_conf_stock};' %{buildroot}%{_sysconfdir}/profile.d/netdata.sh - -# Integrate go plugins -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/go.d -install -p conf.d/go.d.conf %{buildroot}%{netdata_conf_stock}/conf.d/go.d.conf -cp -rp conf.d/go.d %{buildroot}%{netdata_conf_stock}/conf.d/go.d -install -p -m 0644 packaging/go.d.checksums %{buildroot}%{_datadir}/%{name}/go.d.checksums -install -p -m 0750 %{SOURCE21} %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh -sed -i \ - -e 's;@PLUGIN_GO_VERSION@;%{plugin_go_ver};' \ - -e 's;@DATADIR@;%{_datadir};' \ - -e 's;@LIBEXEC@;%{_libexecdir};' \ - %{buildroot}%{_sbindir}/netdata-install-go-plugins.sh
rm -f %{buildroot}%{_sysconfdir}/%{name}/netdata-updater.conf +rm -rf %{buildroot}%{_prefix}/lib/netdata/system
%check -make tests +%ctest
%pre data getent group netdata > /dev/null || groupadd -r netdata @@ -354,7 +380,7 @@ sed -i -e '/stock config directory/ s;/etc/netdata/conf.d;/usr/lib/netdata/conf. sed -i -e '/stock health configuration directory/ s;/etc/netdata/conf.d/health.d;/usr/lib/netdata/conf.d/health.d;' /etc/netdata/netdata.conf ||: %systemd_post %{name}.service echo "Netdata config should be edited with %{_libexecdir}/%{name}/edit-config" -echo "Netdata go plugin can be easily installed with %{_sbindir}/netdata-install-go-plugins.sh script" +echo "Netdata go plugin is now embedded"
%preun %systemd_preun %{name}.service @@ -389,7 +415,6 @@ echo "Netdata go plugin can be easily installed with %{_sbindir}/netdata-install %attr(0755, netdata, netdata) %dir %{_localstatedir}/cache/%{name} %attr(0755, netdata, netdata) %dir %{_localstatedir}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%attr(0750,root,netdata)%{_sbindir}/netdata-install-go-plugins.sh
%files conf %doc README.md @@ -414,7 +439,6 @@ echo "Netdata go plugin can be easily installed with %{_sbindir}/netdata-install %license LICENSE REDISTRIBUTED.md %dir %{_datadir}/%{name} %attr(-, root, netdata) %{_datadir}/%{name}/web -%{_datadir}/%{name}/go.d.checksums
%files freeipmi %doc README.md @@ -422,6 +446,9 @@ echo "Netdata go plugin can be easily installed with %{_sbindir}/netdata-install %caps(cap_setuid=ep) %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
%changelog +* Thu Mar 21 2024 Didier Fabert didier.fabert@gmail.com 1.45.0-1 +- Update from upstream + * Mon Feb 12 2024 Didier Fabert didier.fabert@gmail.com 1.44.3-1 - Update from upstream
diff --git a/sources b/sources index a30aa96..47a5848 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (netdata-v1.44.3.tar.gz) = cbc0698b33d27d78b13fe0a915288a22fc4bb3246c37cf48037650ef9465553a6a92f1702ca273c05cdd9385eecc0713f230939a8341dfe174403d8623388922 +SHA512 (netdata-v1.45.0.tar.gz) = d6e3b3def40995fb25afc5cb6e6ce83b7f6a33e095351f16bf8a5279196638b62a2b4175cb513a262eb2b6981952c129c58302ecf6b9d0d720fb7e0f27d43d29 SHA512 (protobuf-cpp-3.17.3.tar.gz) = efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8 SHA512 (libjudy-1.0.5-netdata2.tar.gz) = dc689e6d198aafb4409217fd5fc24abca799aeca8369779e2c0742d3a5723fa9584c1710b04951c1a9948d33045e6437662b519c3e52f9f4cbfd6a512c900b0d -SHA512 (go.d.plugin-config-v0.58.0.tar.gz) = f971d3a3ce52750efdcf165b1125779264c031a896409d4494672481aef28c76789fa5495199e96c9e68032cba5386f73ccc8c2f659a919272de1c2d60414d8a +SHA512 (go.d.plugin-vendor-1.45.0.tar.xz) = 549f0f45aeb1cb4c4559adf6eea5b4f875c1f5af03988acc5c3e8c036d8b7d0085b235a7cf4158d7c5c2fcea97d82484b1a6aa6429b1c9c9d1aa3bd2b460ce72
arch-excludes@lists.fedoraproject.org