Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/netdata/files/, net-analyzer/netdata/
Date: Wed, 01 Aug 2018 16:38:18
Message-Id: 1533141474.0cd7399f84f76e46cbbe514b12d584221e8725e1.candrews@gentoo
1 commit: 0cd7399f84f76e46cbbe514b12d584221e8725e1
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 1 16:30:55 2018 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 1 16:37:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd7399f
7
8 net-analyzer/netdata: Drop old versions
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 net-analyzer/netdata/Manifest | 2 -
13 .../netdata/files/netdata-1.8.0-openrc-fixes.patch | 105 --------------------
14 net-analyzer/netdata/netdata-1.8.0-r1.ebuild | 108 ---------------------
15 net-analyzer/netdata/netdata-1.9.0.ebuild | 107 --------------------
16 4 files changed, 322 deletions(-)
17
18 diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
19 index 63eefb3104e..8705cb492bd 100644
20 --- a/net-analyzer/netdata/Manifest
21 +++ b/net-analyzer/netdata/Manifest
22 @@ -1,3 +1 @@
23 DIST netdata-1.10.0.tar.gz 2611773 BLAKE2B ffc4bfa593e4a36785c7e09709f1063598bd337016ad858e435049c5821f44fd5f048e4e7874e06d67c7e59234f6ec67a8a50fc7573f6b2f0cd768770ee2a612 SHA512 2358db818ad7d1ef6298c25d3f9d6c5a5a850f5bbe033b82cca1f3bc154055523637691417b6f2c2d4b7273b575afa0ec13e203ea7c2dd6321088a078ef05017
24 -DIST netdata-1.8.0.tar.gz 2779648 BLAKE2B 537d39c3f24ec53fbc7156663cf842143c560b8f8b40647d68e3ad0772bea441a70c7550da213bb0c5d75e0a0d685f32388f95f36e1e1101a0d619f44523c9f4 SHA512 8bb21f49ce1fcf3d199eabd18f65d5005ef784b227f08cd8efe91e5cab2ae980cf0aea4bcaa3aca1dc666c10845684deca48257510ad574bd948ecd019afcdaf
25 -DIST netdata-1.9.0.tar.gz 2483847 BLAKE2B 7f1bcc9cc5768a91b39c39cac04f877472d008630dfa3da97c0893c3cceeed721fb2982fce1f377267cf76e2a9ea70cca650d53bdd442e944820b0356f2700ea SHA512 d17112e2222e48a7d06704d03598e6020b6172f93a6f19e5577657fc5ffe902b8a0472f53b880552eb653e855da3e743a863db446520af008d3b75fb1b438e90
26
27 diff --git a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch b/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
28 deleted file mode 100644
29 index 517eaec51fa..00000000000
30 --- a/net-analyzer/netdata/files/netdata-1.8.0-openrc-fixes.patch
31 +++ /dev/null
32 @@ -1,105 +0,0 @@
33 -From 3f4db620484e777265a7e5f0cfe10ba840f7eefd Mon Sep 17 00:00:00 2001
34 -From: Craig Andrews <candrews@××××××××××××.com>
35 -Date: Tue, 3 Oct 2017 10:52:02 -0400
36 -Subject: [PATCH 1/3] Eliminate bashisms in openrc script
37 -
38 ----
39 - system/netdata-openrc.in | 14 +++++++-------
40 - 1 file changed, 7 insertions(+), 7 deletions(-)
41 -
42 -diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
43 -index 465e1232c..5c4eafa57 100644
44 ---- a/system/netdata-openrc.in
45 -+++ b/system/netdata-openrc.in
46 -@@ -38,13 +38,13 @@ depend() {
47 - }
48 -
49 - start_post() {
50 -- if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
51 -+ if [ ! -f @sysconfdir_POST@/netdata/netdata.conf ]; then
52 - ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
53 - sleep 2
54 - curl -s -o @sysconfdir_POST@/netdata/netdata.conf.new "${NETDATA_CONFIG_URL}"
55 - ret=$?
56 -- if [[ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]]; then
57 -- mv @sysconfdir_POST@/netdata/netdata.conf{.new,}
58 -+ if [ $ret -eq 0 && -s @sysconfdir_POST@/netdata/netdata.conf.new ]; then
59 -+ mv @sysconfdir_POST@/netdata/netdata.conf.new @sysconfdir_POST@/netdata/netdata.conf
60 - else
61 - ret=1
62 - rm @sysconfdir_POST@/netdata/netdata.conf.new 2>/dev/null
63 -@@ -57,20 +57,20 @@ stop_post() {
64 - local result ret=0 count=0 sigkill=0
65 -
66 - ebegin "Waiting for netdata to save its database"
67 -- while [[ -f "${pidfile}" ]]; do
68 -- if [[ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]]; then
69 -+ while [ -f "${pidfile}" ]; do
70 -+ if [ $count -gt ${NETDATA_WAIT_EXIT_TIMEOUT} ]; then
71 - sigkill=1
72 - break
73 - fi
74 -
75 -- count=$[count + 1]
76 -+ count=$((count + 1))
77 - kill -0 $(cat ${pidfile}) 2>/dev/null
78 - ret=$?
79 - test $ret -eq 0 && sleep 1
80 - done
81 - eend $sigkill
82 -
83 -- if [[ $sigkill -eq 1 && -f "${pidfile}" ]]; then
84 -+ if [ $sigkill -eq 1 && -f "${pidfile}" ]; then
85 - ebegin "Netdata is taking too long to exit, forcing it to quit"
86 - kill -SIGKILL $(cat ${pidfile}) 2>/dev/null
87 - eend $?
88 -
89 -From b6d80fb3a3ae60077cbbc1e8dd0d01e1eb3ff67d Mon Sep 17 00:00:00 2001
90 -From: Craig Andrews <candrews@××××××××××××.com>
91 -Date: Tue, 3 Oct 2017 14:56:53 -0400
92 -Subject: [PATCH 2/3] Fix the path to the netdata executable in the openrc
93 - script
94 -
95 -Fixes #2826
96 ----
97 - system/netdata-openrc.in | 2 +-
98 - 1 file changed, 1 insertion(+), 1 deletion(-)
99 -
100 -diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
101 -index 5c4eafa57..512d48278 100644
102 ---- a/system/netdata-openrc.in
103 -+++ b/system/netdata-openrc.in
104 -@@ -23,7 +23,7 @@
105 -
106 - extra_started_commands="getconf"
107 - pidfile="/run/netdata.pid"
108 --command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
109 -+command="@sbindir_POST@/netdata"
110 - command_background="yes"
111 - command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
112 - # start_stop_daemon_args="-u ${NETDATA_OWNER}"
113 -
114 -From b5823e7865851c3cc2381c4fb45716f269a4e85f Mon Sep 17 00:00:00 2001
115 -From: Craig Andrews <candrews@××××××××××××.com>
116 -Date: Tue, 3 Oct 2017 15:56:39 -0400
117 -Subject: [PATCH 3/3] Create the var/cache/netdata directory if it doesn't
118 - already exist in the systemd script
119 -
120 ----
121 - system/netdata.service.in | 3 +++
122 - 1 file changed, 3 insertions(+)
123 -
124 -diff --git a/system/netdata.service.in b/system/netdata.service.in
125 -index 1d4af988a..58cdff225 100644
126 ---- a/system/netdata.service.in
127 -+++ b/system/netdata.service.in
128 -@@ -9,6 +9,9 @@ Group=netdata
129 - RuntimeDirectory=netdata
130 - RuntimeDirectoryMode=0775
131 - ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
132 -+ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
133 -+ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
134 -+PermissionsStartOnly=true
135 -
136 - # saving a big db on slow disks may need some time
137 - TimeoutStopSec=60
138
139 diff --git a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild b/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
140 deleted file mode 100644
141 index d23f3237e7b..00000000000
142 --- a/net-analyzer/netdata/netdata-1.8.0-r1.ebuild
143 +++ /dev/null
144 @@ -1,108 +0,0 @@
145 -# Copyright 1999-2017 Gentoo Foundation
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI=6
149 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
150 -
151 -inherit autotools fcaps linux-info python-r1 systemd user
152 -
153 -if [[ ${PV} == *9999 ]] ; then
154 - EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
155 - inherit git-r3
156 -else
157 - SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
158 - KEYWORDS="~amd64 ~x86"
159 -fi
160 -
161 -DESCRIPTION="Linux real time system monitoring, done right!"
162 -HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
163 -PATCHES=( "${FILESDIR}/${P}-openrc-fixes.patch" )
164 -
165 -LICENSE="GPL-3+ MIT BSD"
166 -SLOT="0"
167 -IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
168 -REQUIRED_USE="
169 - mysql? ( python )
170 - python? ( ${PYTHON_REQUIRED_USE} )"
171 -# most unconditional dependencies are for plugins.d/charts.d.plugin:
172 -RDEPEND="
173 - >=app-shells/bash-4:0
174 - || (
175 - net-analyzer/netcat6
176 - net-analyzer/netcat
177 - )
178 - net-analyzer/tcpdump
179 - net-analyzer/traceroute
180 - net-misc/curl
181 - net-misc/wget
182 - sys-apps/util-linux
183 - virtual/awk
184 - caps? ( sys-libs/libcap )
185 - compression? ( sys-libs/zlib )
186 - ipmi? ( sys-libs/freeipmi )
187 - nfacct? (
188 - net-firewall/nfacct
189 - net-libs/libmnl
190 - )
191 - nodejs? ( net-libs/nodejs )
192 - python? (
193 - ${PYTHON_DEPS}
194 - dev-python/pyyaml[${PYTHON_USEDEP}]
195 - mysql? (
196 - || (
197 - dev-python/mysqlclient[${PYTHON_USEDEP}]
198 - dev-python/mysql-python[${PYTHON_USEDEP}]
199 - )
200 - )
201 - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
202 - )"
203 -DEPEND="${RDEPEND}
204 - virtual/pkgconfig"
205 -
206 -: ${NETDATA_USER:=netdata}
207 -: ${NETDATA_GROUP:=netdata}
208 -
209 -FILECAPS=(
210 - 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
211 -)
212 -
213 -pkg_setup() {
214 - linux-info_pkg_setup
215 -
216 - enewgroup ${PN}
217 - enewuser ${PN} -1 -1 / ${PN}
218 -}
219 -
220 -src_prepare() {
221 - default
222 - eautoreconf
223 -}
224 -
225 -src_configure() {
226 - econf \
227 - --localstatedir="${EPREFIX}"/var \
228 - --with-user=${NETDATA_USER} \
229 - $(use_enable nfacct plugin-nfacct) \
230 - $(use_enable ipmi plugin-freeipmi) \
231 - $(use_enable cpu_flags_x86_sse2 x86-sse) \
232 - $(use_with compression zlib)
233 -}
234 -
235 -src_install() {
236 - default
237 -
238 - rm -rf "${D}/var/cache/netdata" || die
239 -
240 - # Remove unneeded .keep files
241 - find "${ED}" -name ".keep" -delete || die
242 -
243 - fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
244 - fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
245 -
246 - fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
247 -
248 - newinitd system/netdata-openrc ${PN}
249 - systemd_dounit system/netdata.service
250 - insinto /etc/netdata
251 - doins system/netdata.conf
252 -}
253
254 diff --git a/net-analyzer/netdata/netdata-1.9.0.ebuild b/net-analyzer/netdata/netdata-1.9.0.ebuild
255 deleted file mode 100644
256 index 7c343955b89..00000000000
257 --- a/net-analyzer/netdata/netdata-1.9.0.ebuild
258 +++ /dev/null
259 @@ -1,107 +0,0 @@
260 -# Copyright 1999-2017 Gentoo Foundation
261 -# Distributed under the terms of the GNU General Public License v2
262 -
263 -EAPI=6
264 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
265 -
266 -inherit autotools fcaps linux-info python-r1 systemd user
267 -
268 -if [[ ${PV} == *9999 ]] ; then
269 - EGIT_REPO_URI="https://github.com/firehol/${PN}.git"
270 - inherit git-r3
271 -else
272 - SRC_URI="https://github.com/firehol/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
273 - KEYWORDS="~amd64 ~x86"
274 -fi
275 -
276 -DESCRIPTION="Linux real time system monitoring, done right!"
277 -HOMEPAGE="https://github.com/firehol/netdata https://my-netdata.io/"
278 -
279 -LICENSE="GPL-3+ MIT BSD"
280 -SLOT="0"
281 -IUSE="caps +compression cpu_flags_x86_sse2 ipmi mysql nfacct nodejs postgres +python"
282 -REQUIRED_USE="
283 - mysql? ( python )
284 - python? ( ${PYTHON_REQUIRED_USE} )"
285 -# most unconditional dependencies are for plugins.d/charts.d.plugin:
286 -RDEPEND="
287 - >=app-shells/bash-4:0
288 - || (
289 - net-analyzer/netcat6
290 - net-analyzer/netcat
291 - )
292 - net-analyzer/tcpdump
293 - net-analyzer/traceroute
294 - net-misc/curl
295 - net-misc/wget
296 - sys-apps/util-linux
297 - virtual/awk
298 - caps? ( sys-libs/libcap )
299 - compression? ( sys-libs/zlib )
300 - ipmi? ( sys-libs/freeipmi )
301 - nfacct? (
302 - net-firewall/nfacct
303 - net-libs/libmnl
304 - )
305 - nodejs? ( net-libs/nodejs )
306 - python? (
307 - ${PYTHON_DEPS}
308 - dev-python/pyyaml[${PYTHON_USEDEP}]
309 - mysql? (
310 - || (
311 - dev-python/mysqlclient[${PYTHON_USEDEP}]
312 - dev-python/mysql-python[${PYTHON_USEDEP}]
313 - )
314 - )
315 - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
316 - )"
317 -DEPEND="${RDEPEND}
318 - virtual/pkgconfig"
319 -
320 -: ${NETDATA_USER:=netdata}
321 -: ${NETDATA_GROUP:=netdata}
322 -
323 -FILECAPS=(
324 - 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
325 -)
326 -
327 -pkg_setup() {
328 - linux-info_pkg_setup
329 -
330 - enewgroup ${PN}
331 - enewuser ${PN} -1 -1 / ${PN}
332 -}
333 -
334 -src_prepare() {
335 - default
336 - eautoreconf
337 -}
338 -
339 -src_configure() {
340 - econf \
341 - --localstatedir="${EPREFIX}"/var \
342 - --with-user=${NETDATA_USER} \
343 - $(use_enable nfacct plugin-nfacct) \
344 - $(use_enable ipmi plugin-freeipmi) \
345 - $(use_enable cpu_flags_x86_sse2 x86-sse) \
346 - $(use_with compression zlib)
347 -}
348 -
349 -src_install() {
350 - default
351 -
352 - rm -rf "${D}/var/cache/netdata" || die
353 -
354 - # Remove unneeded .keep files
355 - find "${ED}" -name ".keep" -delete || die
356 -
357 - fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
358 - fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
359 -
360 - fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
361 -
362 - newinitd system/netdata-openrc ${PN}
363 - systemd_dounit system/netdata.service
364 - insinto /etc/netdata
365 - doins system/netdata.conf
366 -}
Report Message
Find on MARC Find on Google Groups