Attachment 202588 Details for Bug 236258 – Proper diff

[patch] Proper diff

patch.diff (text/plain), 5.50 KB, created by geraud on 2019-03-05 15:52:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geraud

Created: 2019-03-05 15:52:52 UTC

Size: 5.50 KB

patch

obsolete

>--- Makefile.orig	2019-01-03 00:06:25.000000000 +1100
>+++ Makefile	2019-03-05 16:19:13.032662000 +1100
>@@ -2,9 +2,8 @@
> # $FreeBSD: head/net-mgmt/netdata/Makefile 489079 2019-01-02 13:06:25Z mmokhi $
> 
> PORTNAME=	netdata
>-PORTVERSION=	1.11.1
>+PORTVERSION=	1.12.2
> DISTVERSIONPREFIX=v
>-PORTREVISION=	2
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	mmokhi@FreeBSD.org
>@@ -46,10 +45,15 @@
> USERS=		netdata
> GROUPS=		netdata
> 
>-OPTIONS_DEFINE=	FREEIPMI
>+OPTIONS_DEFINE=	CUPS FREEIPMI
> OPTIONS_SUB=	YES
>-FREEIPMI_DESC=	Enable support for freeipmi
> 
>+CUPS_DESC=	Enable support for cups
>+CUPS_CONFIGURE_ENABLE=	plugin-cups
>+CUPS_LIB_DEPENDS=	libcups.so:print/cups
>+
>+FREEIPMI_DESC=	Enable support for freeipmi
>+FREEIPMI_CONFIGURE_ENABLE=	plugin-freeipmi
> FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
> 
> post-patch:
>--- distinfo.orig	2018-12-24 07:12:13.000000000 +1100
>+++ distinfo	2019-03-05 15:35:21.691387000 +1100
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1545574796
>-SHA256 (firehol-netdata-v1.11.1_GH0.tar.gz) = 909388511729d1e3b064d33fcf7ba65e27439787b449303ba8458c300ec46500
>-SIZE (firehol-netdata-v1.11.1_GH0.tar.gz) = 3050309
>+SHA256 (firehol-netdata-v1.12.2_GH0.tar.gz) = 99f0d5fe9506dba7b7ca2cd5dc30b47a97d35a53518cd1dd2ee27b079d749109
>+SIZE (firehol-netdata-v1.12.2_GH0.tar.gz) = 3085210
>--- pkg-plist.orig	2018-12-24 07:12:13.000000000 +1100
>+++ pkg-plist	2019-03-05 16:18:49.817148000 +1100
>@@ -6,7 +6,6 @@
> %%ETCDIR%%/statsd.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/apps_groups.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d.conf.sample
>-lib/netdata/conf.d/charts.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/ap.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/apache.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/apcupsd.conf.sample
>@@ -28,7 +27,6 @@
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/squid.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/tomcat.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample
>-lib/netdata/conf.d/health.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apache.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample
>@@ -89,9 +87,7 @@
> @sample(netdata,netdata,0640) lib/netdata/conf.d/health_alarm_notify.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/health_email_recipients.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/node.d.conf.sample
>-lib/netdata/conf.d/node.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample
>-lib/netdata/conf.d/python.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/apache.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/beanstalk.conf.sample
>@@ -159,7 +155,6 @@
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample
>-lib/netdata/conf.d/statsd.d/.keep
> @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample
> @sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
> libexec/netdata/charts.d/ap.chart.sh
>@@ -200,13 +195,16 @@
> libexec/netdata/plugins.d/alarm-email.sh
> libexec/netdata/plugins.d/alarm-notify.sh
> libexec/netdata/plugins.d/alarm-test.sh
>+libexec/netdata/plugins.d/anonymous-statistics.sh
> libexec/netdata/plugins.d/apps.plugin
> libexec/netdata/plugins.d/cgroup-name.sh
> libexec/netdata/plugins.d/cgroup-network-helper.sh
> libexec/netdata/plugins.d/charts.d.dryrun-helper.sh
> libexec/netdata/plugins.d/charts.d.plugin
>+%%CUPS%%libexec/netdata/plugins.d/cups.plugin
> libexec/netdata/plugins.d/fping.plugin
> %%FREEIPMI%%libexec/netdata/plugins.d/freeipmi.plugin
>+libexec/netdata/plugins.d/health-cmdapi-test.sh
> libexec/netdata/plugins.d/loopsleepms.sh.inc
> libexec/netdata/plugins.d/node.d.plugin
> libexec/netdata/plugins.d/python.d.plugin
>@@ -252,6 +250,7 @@
> libexec/netdata/python.d/ntpd.chart.py
> libexec/netdata/python.d/nvidia_smi.chart.py
> libexec/netdata/python.d/openldap.chart.py
>+libexec/netdata/python.d/oracledb.chart.py
> libexec/netdata/python.d/ovpn_status_log.chart.py
> libexec/netdata/python.d/phpfpm.chart.py
> libexec/netdata/python.d/portcheck.chart.py
>@@ -429,6 +428,7 @@
> %%DATADIR%%/web/images/ms-icon-150x150.png
> %%DATADIR%%/web/images/ms-icon-310x310.png
> %%DATADIR%%/web/images/ms-icon-70x70.png
>+%%DATADIR%%/web/images/netdata-logomark.svg
> %%DATADIR%%/web/images/netdata.svg
> %%DATADIR%%/web/images/post.png
> %%DATADIR%%/web/index.html
>@@ -438,7 +438,6 @@
> %%DATADIR%%/web/lib/bootstrap-table-1.11.0.min.js
> %%DATADIR%%/web/lib/bootstrap-table-export-1.11.0.min.js
> %%DATADIR%%/web/lib/bootstrap-toggle-2.2.2.min.js
>-%%DATADIR%%/web/lib/c3-0.4.18.min.js
> %%DATADIR%%/web/lib/clipboard-polyfill-be05dad.js
> %%DATADIR%%/web/lib/d3-4.12.2.min.js
> %%DATADIR%%/web/lib/d3pie-0.2.1-netdata-3.js
>@@ -451,10 +450,8 @@
> %%DATADIR%%/web/lib/jquery.peity-3.2.0.min.js
> %%DATADIR%%/web/lib/jquery.sparkline-2.1.2.min.js
> %%DATADIR%%/web/lib/lz-string-1.4.4.min.js
>-%%DATADIR%%/web/lib/morris-0.5.1.min.js
> %%DATADIR%%/web/lib/pako-1.0.6.min.js
> %%DATADIR%%/web/lib/perfect-scrollbar-0.6.15.min.js
>-%%DATADIR%%/web/lib/raphael-2.2.4-min.js
> %%DATADIR%%/web/lib/tableExport-1.6.0.min.js
> %%DATADIR%%/web/main.css
> %%DATADIR%%/web/main.js

Actions: View | Diff

Attachments on bug 236258: 202587 | 202588