From owner-dev-commits-ports-main@freebsd.org Mon Jun 14 20:59:15 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F204B6532D9; Mon, 14 Jun 2021 20:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G3kMl6QQMz4rQc; Mon, 14 Jun 2021 20:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C453E1B7DA; Mon, 14 Jun 2021 20:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15EKxF7l014000; Mon, 14 Jun 2021 20:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15EKxFvR013999; Mon, 14 Jun 2021 20:59:15 GMT (envelope-from git) Date: Mon, 14 Jun 2021 20:59:15 GMT Message-Id: <202106142059.15EKxFvR013999@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 40501c149e07 - main - net-mgmt/netdata: update to 1.31.0 with... MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40501c149e07527bd1d86292921350bde644ef0b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 20:59:16 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=40501c149e07527bd1d86292921350bde644ef0b commit 40501c149e07527bd1d86292921350bde644ef0b Author: Namkhai B AuthorDate: 2021-06-12 18:57:45 +0000 Commit: Matthias Andree CommitDate: 2021-06-14 20:58:25 +0000 net-mgmt/netdata: update to 1.31.0 with... customized dashboard. Some cleanups by Daniel Engberg . Changelog: https://github.com/netdata/netdata/releases PR: 255980 --- net-mgmt/netdata/Makefile | 54 +++++++--- net-mgmt/netdata/distinfo | 10 +- .../netdata/files/extra-patch-web_gui_index.html | 28 ----- net-mgmt/netdata/files/extra-patch-web_gui_main.js | 15 --- .../patch-bump-mqtt_websockets-to-commit-6a4fba1 | 112 +++++++++++++++++++ net-mgmt/netdata/files/patch-configure.ac | 20 +++- net-mgmt/netdata/files/patch-web_gui_index.html | 17 --- net-mgmt/netdata/pkg-plist | 119 ++++++++++++++++++++- 8 files changed, 294 insertions(+), 81 deletions(-) diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile index 3dcd9ca3b1b8..b8f91d32349a 100644 --- a/net-mgmt/netdata/Makefile +++ b/net-mgmt/netdata/Makefile @@ -2,15 +2,25 @@ PORTNAME= netdata DISTVERSIONPREFIX= v -DISTVERSION= 1.29.2 +DISTVERSION= 1.31.0 CATEGORIES= net-mgmt -MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \ + https://github.com/forkbomb9/netdata/commit/:dashboard +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fd15080f65fde1c484a06cbc5a13a2853639a960.patch:dashboard +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + +# Backport commit to fix interrupt graph +PATCH_SITES= https://github.com/netdata/netdata/commit/ +PATCHFILES= 4b130034f223a5034c241b8a3e905d8f8031747d.patch:-p1 MAINTAINER= ports@FreeBSD.org COMMENT= Scalable distributed realtime performance and health monitoring LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE +# Used to patch the custom dashboard +PATCH_DEPENDS= gpatch:devel/patch LIB_DEPENDS= libjson-c.so:devel/json-c \ libuuid.so:misc/e2fsprogs-libuuid \ libuv.so:devel/libuv @@ -53,23 +63,22 @@ OPTIONS_SUB= YES CLOUD_DESC= Enable cloud functionality CUPS_DESC= Enable support for cups -DBENGINE_DESC= Enable support for database engine -FREEIPMI_DESC= Enable support for freeipmi +DBENGINE_DESC= Enable support for database engine +FREEIPMI_DESC= Enable support for freeipmi GOPLUGIN_DESC= Enable the go collector plugin -CLOUD_CONFIGURE_OFF= --disable-cloud -CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \ - ${FILESDIR}/extra-patch-web_gui_main.js -CUPS_LIB_DEPENDS= libcups.so:print/cups -CUPS_CONFIGURE_ENABLE= plugin-cups +CLOUD_CONFIGURE_ON= --with-aclk-ng +CLOUD_CONFIGURE_OFF= --disable-cloud +CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_ENABLE= plugin-cups DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \ liblz4.so:archivers/liblz4 DBENGINE_CONFIGURE_ENABLE= dbengine FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi -GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go -LTO_USES= compiler:c11 -LTO_CONFIGURE_ENABLE= lto +GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go +LTO_USES= compiler:c11 +LTO_CONFIGURE_ENABLE= lto .include .if ${PORT_OPTIONS:MLTO} && ${OPSYS}_${OSREL:R} == FreeBSD_11 @@ -84,7 +93,11 @@ NETDATA_CACHE= /var/cache/${PORTNAME} NETDATA_LOG= /var/log/${PORTNAME} NETDATA_PERST= /var/db/${PORTNAME} +.if ! ${PORT_OPTIONS:MCLOUD} post-patch: + cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/fd15080f65fde1c484a06cbc5a13a2853639a960.patch + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \ @@ -95,6 +108,21 @@ post-patch: ${PATCH_WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in +.else +post-patch: + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \ + ${PATCH_WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \ + ${PATCH_WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \ + ${PATCH_WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \ + ${PATCH_WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ + ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in +.endif post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} @@ -105,7 +133,7 @@ post-install: ${MKDIR} ${STAGEDIR}${NETDATA_PERST} (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \ - ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.txt ; do \ + ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.txt ; do \ ${MV} $$fi $$fi".sample"; \ done) diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo index c01848f7d642..69a5b9102890 100644 --- a/net-mgmt/netdata/distinfo +++ b/net-mgmt/netdata/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1613694033 -SHA256 (netdata-v1.29.2.tar.gz) = 3419a2b54cd29946900e88fa96f8235b6db50bafa615a35c0035887e8a3f5074 -SIZE (netdata-v1.29.2.tar.gz) = 6736119 +TIMESTAMP = 1621898113 +SHA256 (netdata-v1.31.0.tar.gz) = ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f +SIZE (netdata-v1.31.0.tar.gz) = 12528280 +SHA256 (4b130034f223a5034c241b8a3e905d8f8031747d.patch) = 9a5be823ba673d2490ec7140cc3726569253e5114157c730d7533916194720d7 +SIZE (4b130034f223a5034c241b8a3e905d8f8031747d.patch) = 5207 +SHA256 (fd15080f65fde1c484a06cbc5a13a2853639a960.patch) = b1ed548a1f41984f40d36162dc2325e54381d829210d117dfcba3521e2b9c7ea +SIZE (fd15080f65fde1c484a06cbc5a13a2853639a960.patch) = 32024618 diff --git a/net-mgmt/netdata/files/extra-patch-web_gui_index.html b/net-mgmt/netdata/files/extra-patch-web_gui_index.html deleted file mode 100644 index 18aa0dbb61ff..000000000000 --- a/net-mgmt/netdata/files/extra-patch-web_gui_index.html +++ /dev/null @@ -1,28 +0,0 @@ ---- web/gui/index.html.orig 2020-04-13 16:02:25 UTC -+++ web/gui/index.html -@@ -90,7 +90,9 @@ - -