Attachment #234585 for bug #264557




# Created by: Mahdi Mokhtari <mokhi63@gmail.com>

PORTNAME=	netdata
DISTVERSIONPREFIX=	v
DISTVERSION=	1.35.0
CATEGORIES=	net-mgmt
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
		https://github.com/forkbomb9/netdata/commit/:dashboard
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
		13310caf81048cc71aa315cddbbdce1ee4351903.patch:dashboard
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
WRKSRC=		${WRKDIR}/${PORTNAME}-v1.33.1-345-g89fb721f6

MAINTAINER=	nc@FreeBSD.org
COMMENT=	Scalable distributed realtime performance and health monitoring

	    ${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in

post-patch-CLOUD-off:
	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/13310caf81048cc71aa315cddbbdce1ee4351903.patch

post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}

Lines 1-5 Link Here

(-)b/net-mgmt/netdata/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1650127297	1	TIMESTAMP = 1654717731
2	SHA256 (netdata-v1.34.1.tar.gz) = cc27a73d5e92eb7a89b85516594bf1c4f52d4f5cc2104772588d7b7ce093f179	2	SHA256 (netdata-v1.35.0.tar.gz) = 7981103c4ddd452de3a4565fb6c304454dc4c9adcc1954d716102f14df8ad4bb
3	SIZE (netdata-v1.34.1.tar.gz) = 22529694	3	SIZE (netdata-v1.35.0.tar.gz) = 22335392
4	SHA256 (4f2ed3f01aee7a4fb8c4eaff26025ecc33d8d84a.patch) = a7a0133bce10e776a1ff57305ccf096bb8fb24946a6c9af3e8c3eae5ff8bc13b	4	SHA256 (13310caf81048cc71aa315cddbbdce1ee4351903.patch) = 45f4a1670d404cd68c6fa68307a0ef7b62277b1601b5a8382dac2c4c011f0fda
5	SIZE (4f2ed3f01aee7a4fb8c4eaff26025ecc33d8d84a.patch) = 37940584	5	SIZE (13310caf81048cc71aa315cddbbdce1ee4351903.patch) = 37994548

Lines 1-6 Link Here

(-)b/net-mgmt/netdata/files/patch-collectors_python.d.plugin_Makefile.am (-2 / +2 lines)
1	--- collectors/python.d.plugin/Makefile.am.orig 2020-08-12 20:04:44 UTC	1	--- collectors/python.d.plugin/Makefile.am.orig 2022-06-08 15:49:44 UTC
2	+++ collectors/python.d.plugin/Makefile.am	2	+++ collectors/python.d.plugin/Makefile.am
3	@@ -144,108 +144,3 @@ dist_third_party_DATA = \	3	@@ -125,108 +125,3 @@ dist_third_party_DATA = \
4	python_modules/third_party/filelock.py \	4	python_modules/third_party/filelock.py \
5	$(NULL)	5	$(NULL)
6		6

Lines 1-4 Link Here

(-)b/net-mgmt/netdata/files/patch-configure.ac (-2 / +1 lines)
1	--- configure.ac.orig 2021-05-19 11:38:53 UTC	1	--- configure.ac.orig 2022-06-08 15:50:20 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -5,11 +5,11 @@	3	@@ -5,11 +5,11 @@
4	AC_PREREQ(2.60)	4	AC_PREREQ(2.60)
Lines 27-33 Link Here
27	+registrydir="%%NETDATA_PERST%%/registry"	27	+registrydir="%%NETDATA_PERST%%/registry"
28	+cachedir="%%NETDATA_CACHE%%"	28	+cachedir="%%NETDATA_CACHE%%"
29	chartsdir="${libexecdir}/netdata/charts.d"	29	chartsdir="${libexecdir}/netdata/charts.d"
30	nodedir="${libexecdir}/netdata/node.d"
31	pythondir="${libexecdir}/netdata/python.d"	30	pythondir="${libexecdir}/netdata/python.d"
32	-configdir="${sysconfdir}/netdata"	31	-configdir="${sysconfdir}/netdata"
33	+configdir="%%ETCDIR%%"	32	+configdir="%%ETCDIR%%"




@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/ioping.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/node.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/alarms.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/am2320.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/anomalies.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
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/bind_rndc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/boinc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ceph.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/changefinder.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/chrony.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/couchdb.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dns_query_time.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dnsdist.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dockerd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dovecot.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/elasticsearch.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/energid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/exim.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/fail2ban.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/freeradius.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/gearman.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/go_expvar.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/haproxy.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hddtemp.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hpssa.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/httpcheck.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/icecast.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ipfs.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/isc_dhcpd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/litespeed.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/logind.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/megacli.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/memcached.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/mongodb.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/monit.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/mysql.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nginx.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nginx_plus.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nsd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ntpd.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/openldap.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/oracledb.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ovpn_status_log.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/phpfpm.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/portcheck.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/postfix.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/postgres.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/powerdns.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/proxysql.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/puppet.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/rabbitmq.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/redis.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/rethinkdbs.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/retroshare.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/riakkv.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/uwsgi.conf.sample
@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
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/zscores.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/asterisk.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample

libexec/netdata/charts.d/nut.chart.sh
libexec/netdata/charts.d/opensips.chart.sh
libexec/netdata/charts.d/sensors.chart.sh
libexec/netdata/node.d/node_modules/asn1-ber.js
libexec/netdata/node.d/node_modules/extend.js
libexec/netdata/node.d/node_modules/lib/ber/errors.js
libexec/netdata/node.d/node_modules/lib/ber/index.js
libexec/netdata/node.d/node_modules/lib/ber/reader.js
libexec/netdata/node.d/node_modules/lib/ber/types.js
libexec/netdata/node.d/node_modules/lib/ber/writer.js
libexec/netdata/node.d/node_modules/net-snmp.js
libexec/netdata/node.d/node_modules/netdata.js
libexec/netdata/node.d/node_modules/pixl-xml.js
libexec/netdata/node.d/snmp.node.js
libexec/netdata/plugins.d/acl.sh
libexec/netdata/plugins.d/alarm-email.sh
libexec/netdata/plugins.d/alarm-notify.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/get-kubernetes-labels.sh
libexec/netdata/plugins.d/health-cmdapi-test.sh
libexec/netdata/plugins.d/ioping.plugin
libexec/netdata/plugins.d/loopsleepms.sh.inc
libexec/netdata/plugins.d/node.d.plugin
libexec/netdata/plugins.d/python.d.plugin
libexec/netdata/plugins.d/request.sh
libexec/netdata/plugins.d/system-info.sh

libexec/netdata/python.d/alarms.chart.py
libexec/netdata/python.d/am2320.chart.py
libexec/netdata/python.d/anomalies.chart.py
libexec/netdata/python.d/apache.chart.py
libexec/netdata/python.d/beanstalk.chart.py
libexec/netdata/python.d/bind_rndc.chart.py
libexec/netdata/python.d/boinc.chart.py
libexec/netdata/python.d/ceph.chart.py
libexec/netdata/python.d/changefinder.chart.py
libexec/netdata/python.d/chrony.chart.py
libexec/netdata/python.d/couchdb.chart.py
libexec/netdata/python.d/dns_query_time.chart.py
libexec/netdata/python.d/dnsdist.chart.py
libexec/netdata/python.d/dockerd.chart.py
libexec/netdata/python.d/dovecot.chart.py
libexec/netdata/python.d/elasticsearch.chart.py
libexec/netdata/python.d/energid.chart.py
libexec/netdata/python.d/example.chart.py
libexec/netdata/python.d/exim.chart.py
libexec/netdata/python.d/fail2ban.chart.py
libexec/netdata/python.d/freeradius.chart.py
libexec/netdata/python.d/gearman.chart.py
libexec/netdata/python.d/go_expvar.chart.py
libexec/netdata/python.d/haproxy.chart.py
libexec/netdata/python.d/hddtemp.chart.py
libexec/netdata/python.d/hpssa.chart.py
libexec/netdata/python.d/httpcheck.chart.py
libexec/netdata/python.d/icecast.chart.py
libexec/netdata/python.d/ipfs.chart.py
libexec/netdata/python.d/isc_dhcpd.chart.py
libexec/netdata/python.d/litespeed.chart.py
libexec/netdata/python.d/logind.chart.py
libexec/netdata/python.d/megacli.chart.py
libexec/netdata/python.d/memcached.chart.py
libexec/netdata/python.d/mongodb.chart.py
libexec/netdata/python.d/monit.chart.py
libexec/netdata/python.d/mysql.chart.py
libexec/netdata/python.d/nginx.chart.py
libexec/netdata/python.d/nginx_plus.chart.py
libexec/netdata/python.d/nsd.chart.py
libexec/netdata/python.d/ntpd.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
libexec/netdata/python.d/postfix.chart.py
libexec/netdata/python.d/postgres.chart.py
libexec/netdata/python.d/powerdns.chart.py
libexec/netdata/python.d/proxysql.chart.py
libexec/netdata/python.d/puppet.chart.py
libexec/netdata/python.d/python_modules/__init__.py

libexec/netdata/python.d/python_modules/third_party/monotonic.py
libexec/netdata/python.d/python_modules/third_party/ordereddict.py
libexec/netdata/python.d/rabbitmq.chart.py
libexec/netdata/python.d/redis.chart.py
libexec/netdata/python.d/rethinkdbs.chart.py
libexec/netdata/python.d/retroshare.chart.py
libexec/netdata/python.d/riakkv.chart.py

libexec/netdata/python.d/uwsgi.chart.py
libexec/netdata/python.d/varnish.chart.py
libexec/netdata/python.d/w1sensor.chart.py
libexec/netdata/python.d/web_log.chart.py
libexec/netdata/python.d/zscores.chart.py
sbin/netdata
%%CLOUD%%sbin/netdata-claim.sh
sbin/netdatacli
@mode 4640
@owner netdata
@group netdata
%%DATADIR%%/web/.well-known/dnt/cookies
%%DATADIR%%/web/asset-manifest.json
%%DATADIR%%/web/console.html

%%DATADIR%%/web/netdata-swagger.json
%%DATADIR%%/web/netdata-swagger.yaml
%%DATADIR%%/web/old/index.html
%%NO_CLOUD%%%%DATADIR%%/web/precache-manifest.1ee9317b408bc6d29e7eeea7b82c627e.js
%%CLOUD%%%%DATADIR%%/web/precache-manifest.b443acc162e1adddca46165b647e9f4b.js
%%DATADIR%%/web/refresh-badges.js
%%DATADIR%%/web/robots.txt
%%DATADIR%%/web/service-worker.js

%%DATADIR%%/web/static/img/netdata-logomark.svg
%%NO_CLOUD%%%%DATADIR%%/web/static/js/10.891b1f66.chunk.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/10.891b1f66.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.bdaf5797.chunk.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.bdaf5797.chunk.js.LICENSE
%%NO_CLOUD%%%%DATADIR%%/web/static/js/2.bdaf5797.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/3.5ba29950.chunk.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/3.5ba29950.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/4.eb022d3f.chunk.js

%%NO_CLOUD%%%%DATADIR%%/web/static/js/8.fa6b99b9.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/9.da02b76a.chunk.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/9.da02b76a.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.b60c8890.chunk.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.b60c8890.chunk.js.LICENSE
%%NO_CLOUD%%%%DATADIR%%/web/static/js/main.b60c8890.chunk.js.map
%%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.a2f5edbb.js
%%NO_CLOUD%%%%DATADIR%%/web/static/js/runtime-main.a2f5edbb.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/10.44d9d40b.chunk.js
%%CLOUD%%%%DATADIR%%/web/static/js/10.44d9d40b.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/2.97b8fd9b.chunk.js
%%CLOUD%%%%DATADIR%%/web/static/js/2.97b8fd9b.chunk.js.LICENSE
%%CLOUD%%%%DATADIR%%/web/static/js/2.97b8fd9b.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/3.d49f0857.chunk.js
%%CLOUD%%%%DATADIR%%/web/static/js/3.d49f0857.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/4.8b70c754.chunk.js

%%CLOUD%%%%DATADIR%%/web/static/js/8.b1a4b595.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/9.50358509.chunk.js
%%CLOUD%%%%DATADIR%%/web/static/js/9.50358509.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/main.2d23101e.chunk.js
%%CLOUD%%%%DATADIR%%/web/static/js/main.2d23101e.chunk.js.LICENSE
%%CLOUD%%%%DATADIR%%/web/static/js/main.2d23101e.chunk.js.map
%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.b352aa47.js
%%CLOUD%%%%DATADIR%%/web/static/js/runtime-main.b352aa47.js.map
%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.245539db.woff2

@dir(netdata,netdata,0750) %%ETCDIR%%/ebpf.d
@dir(netdata,netdata,0750) %%ETCDIR%%/go.d
@dir(netdata,netdata,0750) %%ETCDIR%%/health.d
@dir(netdata,netdata,0750) %%ETCDIR%%/node.d
@dir(netdata,netdata,0750) %%ETCDIR%%/python.d
@dir(netdata,netdata,0750) %%ETCDIR%%/ssl
@dir(netdata,netdata,0750) %%ETCDIR%%/statsd.d
@dir(netdata,netdata,0750) %%ETCDIR%%
@dir(netdata,netdata,0750) %%DATADIR%%/web
@dir(netdata,netdata,0750) %%DATADIR%%
@dir(netdata,netdata,0750) %%NETDATA_CACHE%%
@dir(netdata,netdata,0750) %%NETDATA_PERST%%
@dir(netdata,netdata,0750) %%NETDATA_LOG%%
- 

Return to bug 264557

Lines 1-15 Link Here

(-)b/net-mgmt/netdata/Makefile (-5 / +4 lines)
1	# Created by: Mahdi Mokhtari <mokhi64@gmail.com>	1	# Created by: Mahdi Mokhtari <mokhi63@gmail.com>
2		2
3	PORTNAME= netdata	3	PORTNAME= netdata
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.34.1	5	DISTVERSION= 1.35.0
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \	7	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ \
8	https://github.com/forkbomb9/netdata/commit/:dashboard	8	https://github.com/forkbomb9/netdata/commit/:dashboard
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
10	4f2ed3f01aee7a4fb8c4eaff26025ecc33d8d84a.patch:dashboard	10	13310caf81048cc71aa315cddbbdce1ee4351903.patch:dashboard
11	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	11	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
12	WRKSRC= ${WRKDIR}/${PORTNAME}-v1.33.1-345-g89fb721f6
13		12
14	MAINTAINER= nc@FreeBSD.org	13	MAINTAINER= nc@FreeBSD.org
15	COMMENT= Scalable distributed realtime performance and health monitoring	14	COMMENT= Scalable distributed realtime performance and health monitoring
Lines 101-107 post-patch: Link Here
101	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in	100	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
102		101
103	post-patch-CLOUD-off:	102	post-patch-CLOUD-off:
104	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/4f2ed3f01aee7a4fb8c4eaff26025ecc33d8d84a.patch	103	cd ${WRKSRC} && gpatch -p1 < ${_DISTDIR}/13310caf81048cc71aa315cddbbdce1ee4351903.patch
105		104
106	post-install:	105	post-install:
107	${MKDIR} ${STAGEDIR}${ETCDIR}	106	${MKDIR} ${STAGEDIR}${ETCDIR}