net-mgmt/netdata: Update to v1.33.0

PR:	261704

5 files changed, 41 insertions, 66 deletions

diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index c0217a2545ef..28fdec9084a5 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -2,12 +2,12 @@
 
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.32.1
+DISTVERSION=	1.33.0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/ \
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
 		https://github.com/forkbomb9/netdata/commit/:dashboard
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		91757292561eba170fe363b1f1023583216ca26f.patch:dashboard
+		55c08c1cdbc5dea9687bdda5d7ba15c0161a9c13.patch:dashboard
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -99,7 +99,7 @@ post-patch:
 	    ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
 
 post-patch-CLOUD-off:
-	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/91757292561eba170fe363b1f1023583216ca26f.patch
+	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/55c08c1cdbc5dea9687bdda5d7ba15c0161a9c13.patch
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo
index 5af4a2b54865..8cd49eb1ed7e 100644
--- a/net-mgmt/netdata/distinfo
+++ b/net-mgmt/netdata/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1639499731
-SHA256 (netdata-v1.32.1.tar.gz) = ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e
-SIZE (netdata-v1.32.1.tar.gz) = 22472431
-SHA256 (91757292561eba170fe363b1f1023583216ca26f.patch) = 0432180db54acdf5d58a3080f29d263f64bd43f1dce167399c83a3f260cc3c2a
-SIZE (91757292561eba170fe363b1f1023583216ca26f.patch) = 36689971
+TIMESTAMP = 1643927557
+SHA256 (netdata-v1.33.0.tar.gz) = d167d4b2d8529119fa4047ae40d22833dac9d360a6ed07c314ba313807c027eb
+SIZE (netdata-v1.33.0.tar.gz) = 22470692
+SHA256 (55c08c1cdbc5dea9687bdda5d7ba15c0161a9c13.patch) = 351080aae7fdbf7576cbda659e901981ee51177dd6a5905cc20c22584f3d8a9b
+SIZE (55c08c1cdbc5dea9687bdda5d7ba15c0161a9c13.patch) = 34887003
diff --git a/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4 b/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4
deleted file mode 100644
index 1f64fe887f35..000000000000
--- a/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4
+++ /dev/null
@@ -1,25 +0,0 @@
---- build/m4/ax_c___atomic.m4.orig	2019-05-27 21:39:46 UTC
-+++ build/m4/ax_c___atomic.m4
-@@ -6,7 +6,12 @@ AC_DEFUN([AC_C___ATOMIC],
- [AC_CACHE_CHECK([for __atomic], ac_cv_c___atomic,
- [AC_LINK_IFELSE(
-    [AC_LANG_SOURCE(
--      [[int
-+      [[typedef struct test {
-+        volatile uint16_t a;
-+        volatile uint64_t b;
-+        volatile uint64_t c;
-+        } test_t;
-+        int
-         main (int argc, char **argv)
-         {
-           volatile unsigned long ul1 = 1, ul2 = 0, ul3 = 2;
-@@ -16,6 +21,8 @@ AC_DEFUN([AC_C___ATOMIC],
-           __atomic_fetch_sub(&ul3, 1, __ATOMIC_SEQ_CST);
-           __atomic_or_fetch(&ul1, ul2, __ATOMIC_SEQ_CST);
-           __atomic_and_fetch(&ul1, ul2, __ATOMIC_SEQ_CST);
-+          volatile test_t test = {.a = 0, .b = 0, .c = 1};
-+          __atomic_fetch_add(&test.b, 1, __ATOMIC_SEQ_CST);
-           volatile unsigned long long ull1 = 1, ull2 = 0, ull3 = 2;
-           __atomic_load_n(&ull1, __ATOMIC_SEQ_CST);
-           __atomic_compare_exchange(&ull1, &ull2, &ull3, 1, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
diff --git a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
index 0ac0a095638a..913a1ffd5312 100644
--- a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
+++ b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in
@@ -1,9 +1,9 @@
---- collectors/python.d.plugin/python.d.plugin.in.orig	2020-01-30 23:22:27 UTC
+--- collectors/python.d.plugin/python.d.plugin.in.orig	2022-02-03 22:42:27 UTC
 +++ collectors/python.d.plugin/python.d.plugin.in
 @@ -1,6 +1,6 @@
  #!/usr/bin/env bash
  '''':;
--pybinary=$(which python || which python3 || which python2)
+-pybinary=$(which python3 || which python || which python2)
 +pybinary=%%PYTHON%%
  filtered=()
  for arg in "$@"
diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist
index 3a9f433b1d1f..6be45bbef904 100644
--- a/net-mgmt/netdata/pkg-plist
+++ b/net-mgmt/netdata/pkg-plist
@@ -432,8 +432,8 @@ sbin/netdatacli
 %%DATADIR%%/web/netdata-swagger.json
 %%DATADIR%%/web/netdata-swagger.yaml
 %%DATADIR%%/web/old/index.html
-%%NO_CLOUD%%%%DATADIR%%/web/precache-manifest.7433fa35e3fc18d20fb23beaba34d1ba.js
-%%CLOUD%%%%DATADIR%%/web/precache-manifest.14a1e41ead8f8b6e26e356372042ef5a.js
+%%NO_CLOUD%%%%DATADIR%%/web/precache-manifest.3da4ae5974354129180313c0a36ce946.js
+%%CLOUD%%%%DATADIR%%/web/precache-manifest.defc120efbf19d0eaabf8dbed8985e40.js
 %%DATADIR%%/web/refresh-badges.js
 %%DATADIR%%/web/robots.txt
 %%DATADIR%%/web/service-worker.js
@@ -465,36 +465,36 @@ sbin/netdatacli
 %%NO_CLOUD%%%%DATADIR%%/web/static/js/8.f438a1b5.chunk.js.map
 %%NO_CLOUD%%%%DATADIR%%/web/static/js/9.de55da4d.chunk.js
 %%NO_CLOUD%%%%DATADIR%%/web/static/js/9.de55da4d.chunk.js.map
-%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.26b9b249.chunk.js
-%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.26b9b249.chunk.js.LICENSE
-%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.26b9b249.chunk.js.map
+%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.403311a9.chunk.js
+%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.403311a9.chunk.js.LICENSE
+%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.403311a9.chunk.js.map
 %%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.14b48fe3.js
 %%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.14b48fe3.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/10.a23c74b9.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/10.a23c74b9.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/2.3456bb26.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/2.3456bb26.chunk.js.LICENSE
-%%CLOUD%%%%DATADIR%%/web/static/js/2.3456bb26.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/3.5ef4adcd.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/3.5ef4adcd.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/4.1621c1ad.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/4.1621c1ad.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/5.05b274a5.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/5.05b274a5.chunk.js.LICENSE
-%%CLOUD%%%%DATADIR%%/web/static/js/5.05b274a5.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/6.299c0acd.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/6.299c0acd.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/7.850d6c32.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/7.850d6c32.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/8.fb328a3a.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/8.fb328a3a.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/9.f8eb4edd.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/9.f8eb4edd.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/main.fa83a16e.chunk.js
-%%CLOUD%%%%DATADIR%%/web/static/js/main.fa83a16e.chunk.js.LICENSE
-%%CLOUD%%%%DATADIR%%/web/static/js/main.fa83a16e.chunk.js.map
-%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.ea592e2f.js
-%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.ea592e2f.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/10.0ab42002.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/10.0ab42002.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/2.806d12e9.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/2.806d12e9.chunk.js.LICENSE
+%%CLOUD%%%%DATADIR%%/web/static/js/2.806d12e9.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/3.526d52fa.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/3.526d52fa.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/4.afb76ad5.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/4.afb76ad5.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/5.c76b5fed.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/5.c76b5fed.chunk.js.LICENSE
+%%CLOUD%%%%DATADIR%%/web/static/js/5.c76b5fed.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/6.b58a11c2.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/6.b58a11c2.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/7.6b3eecd4.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/7.6b3eecd4.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/8.f438a1b5.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/8.f438a1b5.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/9.de55da4d.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/9.de55da4d.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/main.e9164e96.chunk.js
+%%CLOUD%%%%DATADIR%%/web/static/js/main.e9164e96.chunk.js.LICENSE
+%%CLOUD%%%%DATADIR%%/web/static/js/main.e9164e96.chunk.js.map
+%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.14b48fe3.js
+%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.14b48fe3.js.map
 %%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.245539db.woff2
 %%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.9a582f3a.woff
 %%DATADIR%%/web/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff