Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2020 12:38:19 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548885 - head/net-mgmt/netdata
Message-ID:  <202009181238.08ICcJ1C075371@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Fri Sep 18 12:38:19 2020
New Revision: 548885
URL: https://svnweb.freebsd.org/changeset/ports/548885

Log:
  net-mgmt/netdata: fix pkg-plist @sample for ebpf_kernel_reject_list.txt.
  
  A @sample line with one file name argument that does not end in .sample
  would compare the file against itself and remove the configuration
  file even if modified in the pre-deinstall phase. Fix that.
  
  Bump PORTREVISION.

Modified:
  head/net-mgmt/netdata/Makefile
  head/net-mgmt/netdata/pkg-plist

Modified: head/net-mgmt/netdata/Makefile
==============================================================================
--- head/net-mgmt/netdata/Makefile	Fri Sep 18 12:14:30 2020	(r548884)
+++ head/net-mgmt/netdata/Makefile	Fri Sep 18 12:38:19 2020	(r548885)
@@ -4,6 +4,7 @@
 PORTNAME=	netdata
 PORTVERSION=	1.24.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -109,8 +110,9 @@ post-install:
 	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
 	${MKDIR} ${STAGEDIR}${NETDATA_LOG}
 	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
-	(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \
-			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf; do \
+	(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 \
 		${MV} $$fi $$fi".sample"; \
 	done)
 

Modified: head/net-mgmt/netdata/pkg-plist
==============================================================================
--- head/net-mgmt/netdata/pkg-plist	Fri Sep 18 12:14:30 2020	(r548884)
+++ head/net-mgmt/netdata/pkg-plist	Fri Sep 18 12:38:19 2020	(r548885)
@@ -11,7 +11,7 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009181238.08ICcJ1C075371>