From 7a3f09ca8bf8ec8e544753f1caf4579f50f594e6 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 27 Apr 2020 23:07:02 +0000 Subject: [PATCH] net-mgmt/netdata: Update to 1.21.1 Update netdata to 1.21.1 Move cloud related changes to extra-patch Additional patch for cloud added Remove "Nodes" button when cloud support is disabled Source: https://git.progress-linux.org/distributions/engywuck-backports/packages/netdata/tree/debian/patches/debian/0011-remove-login.patch to extra-patch Tested on FreeBSD 13.0-CURRENT #0 r358620 (AMD64) Poudriere OK 12.1-RELEASE ---------------- Reset maintainer to ports@ after repeated maintainer timeout from mmokhi@. Over Daniel's submission, make libuv an unconditional requisite, and also json-c because netdata's configure.ac cannot disable it and might pick it up, leading to unregistered dependencies if json-c is available at compile time (in, for instance, portmaster or live systems). Remove the JSON option. PR: 245603 Submitted by: Daniel Engberg Approved by: maintainer timeout (mmokhi@, 15 days, resetting) --- net-mgmt/netdata/Makefile | 29 ++++++++++--------- net-mgmt/netdata/distinfo | 6 ++-- .../files/extra-patch-web_gui_index.html | 28 ++++++++++++++++++ .../netdata/files/extra-patch-web_gui_main.js | 13 +++++++++ .../netdata/files/patch-web_gui_index.html | 18 +----------- net-mgmt/netdata/pkg-plist | 5 +++- 6 files changed, 64 insertions(+), 35 deletions(-) create mode 100644 net-mgmt/netdata/files/extra-patch-web_gui_index.html create mode 100644 net-mgmt/netdata/files/extra-patch-web_gui_main.js diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 957a72d4584f..221d705bce21 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -2,17 +2,18 @@ # $FreeBSD$ PORTNAME= netdata -PORTVERSION= 1.20.0 -PORTREVISION= 3 +PORTVERSION= 1.21.1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt -MAINTAINER= mmokhi@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Scalable distributed realtime performance and health monitoring LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libuuid.so:misc/e2fsprogs-libuuid \ + libuv.so:devel/libuv RUN_DEPENDS= bash:shells/bash \ curl:ftp/curl \ @@ -48,13 +49,18 @@ SUB_FILES= ${PORTNAME}.conf.sample USERS= netdata GROUPS= netdata -OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI GOPLUGIN JSON LTO +OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO OPTIONS_SUB= YES -OPTIONS_DEFAULT= DBENGINE JSON +OPTIONS_DEFAULT= DBENGINE OPTIONS_DEFAULT_FreeBSD_12= LTO OPTIONS_DEFAULT_FreeBSD_13= LTO OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +CLOUD_DESC= Enable cloud functionality +CLOUD_CONFIGURE_OFF= --disable-cloud +CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \ + ${FILESDIR}/extra-patch-web_gui_main.js + CUPS_DESC= Enable support for cups CUPS_CONFIGURE_ENABLE= plugin-cups CUPS_LIB_DEPENDS= libcups.so:print/cups @@ -62,8 +68,7 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups DBENGINE_DESC= Enable support for database engine DBENGINE_CONFIGURE_ENABLE= dbengine DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \ - liblz4.so:archivers/liblz4 \ - libuv.so:devel/libuv + liblz4.so:archivers/liblz4 FREEIPMI_DESC= Enable support for freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi @@ -72,10 +77,6 @@ FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi GOPLUGIN_DESC= Enable the go collector plugin GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go -JSON_DESC= Enable support for json -JSON_CONFIGURE_ENABLE= jsonc -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c - LTO_DESC= Use Link-Time Optimization LTO_CONFIGURE_ENABLE= lto LTO_USES= compiler:c11 @@ -103,9 +104,9 @@ post-install: ${MKDIR} ${STAGEDIR}${NETDATA_CACHE} ${MKDIR} ${STAGEDIR}${NETDATA_LOG} ${MKDIR} ${STAGEDIR}${NETDATA_PERST} - (for file in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ + (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf; do \ - ${MV} $$file $$file".sample"; \ + ${MV} $$fi $$fi".sample"; \ done) .include diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo index 64a7495a8958..d1c058283bad 100644 --- a/net-mgmt/netdata/distinfo +++ b/net-mgmt/netdata/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1583350154 -SHA256 (netdata-netdata-v1.20.0_GH0.tar.gz) = c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90 -SIZE (netdata-netdata-v1.20.0_GH0.tar.gz) = 3598521 +TIMESTAMP = 1587324548 +SHA256 (netdata-netdata-v1.21.1_GH0.tar.gz) = 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 +SIZE (netdata-netdata-v1.21.1_GH0.tar.gz) = 3748090 diff --git a/net-mgmt/netdata/files/extra-patch-web_gui_index.html b/net-mgmt/netdata/files/extra-patch-web_gui_index.html new file mode 100644 index 000000000000..18aa0dbb61ff --- /dev/null +++ b/net-mgmt/netdata/files/extra-patch-web_gui_index.html @@ -0,0 +1,28 @@ +--- web/gui/index.html.orig 2020-04-13 16:02:25 UTC ++++ web/gui/index.html +@@ -90,7 +90,9 @@ + +