1 |
commit: 7308261fd9413cf2fcd60b636f223ad68d7b6f77 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 11 12:06:42 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 11 12:07:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7308261f |
7 |
|
8 |
www-apps/grafana-bin: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/719306 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
www-apps/grafana-bin/Manifest | 2 - |
15 |
www-apps/grafana-bin/grafana-bin-6.5.3.ebuild | 71 --------------------------- |
16 |
www-apps/grafana-bin/grafana-bin-6.7.2.ebuild | 71 --------------------------- |
17 |
3 files changed, 144 deletions(-) |
18 |
|
19 |
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest |
20 |
index 89a657d80a4..024a0edaaa6 100644 |
21 |
--- a/www-apps/grafana-bin/Manifest |
22 |
+++ b/www-apps/grafana-bin/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST grafana-bin-6.5.3.tar.gz 61041681 BLAKE2B 624abf5fa31271eb81182bd36377eef0e643a4fda2c6ecc00545d941318ecf4b526fa4753ab6e3cc820fb22b1bf3768cdec946fd13483ef7137f1672aa7b63b6 SHA512 4f672c0fc4a74fff904bd3b297e40c06c616157bb9d3e2783950339d20c551f580dea7a59fb0ff58480010047d34088c51c3ec3175039b9510acb0a18ef52546 |
25 |
-DIST grafana-bin-6.7.2.tar.gz 65075053 BLAKE2B 80a92ec55820363dfd56048db81a5be448ccdba6e0396e22b7b68dff3eb11d4d0c11c35d540c607eef7ef7ddba74a9ac147b6e7edce5fc34894b090a3042a5cd SHA512 ec46a5f9ce39c807f50ee93eda0ddb19bf58d5fb3d3dc188250dfe09323bf10108088cd79ee7787c77e88244b239b5dbb6e50f5e4c69c6d099d5f20dc6bafa7c |
26 |
DIST grafana-bin-6.7.3.tar.gz 65083849 BLAKE2B b567885d58f4e28d2873feb4bdbfd364697d3c742039441d12df0f7a76ed8703ef2a08450125feeb576c539e7e2a84d193da92436cbd82601b65a5d42862a7a3 SHA512 15d02ed101088d845ed94fb88c629428f2a899a23dff509ec82cb148689bda07b56883765be145d5a5769ed0e3d3b9d98e50fc940c95a1074f5b5e3adac19f30 |
27 |
|
28 |
diff --git a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild b/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 58b22b14471..00000000000 |
31 |
--- a/www-apps/grafana-bin/grafana-bin-6.5.3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,71 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit user systemd |
40 |
- |
41 |
-MY_PN=${PN/-bin/} |
42 |
-MY_PV=${PV/_beta/-beta} |
43 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
44 |
- |
45 |
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" |
46 |
-HOMEPAGE="https://grafana.org" |
47 |
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" |
48 |
- |
49 |
-LICENSE="Apache-2.0" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~amd64" |
52 |
- |
53 |
-DEPEND="" |
54 |
-RDEPEND="${DEPEND} |
55 |
- media-libs/fontconfig" |
56 |
- |
57 |
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs" |
58 |
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}" |
59 |
-QA_PRESTRIPPED=${QA_PREBUILT} |
60 |
- |
61 |
-pkg_setup() { |
62 |
- enewgroup grafana |
63 |
- enewuser grafana -1 -1 /usr/share/grafana grafana |
64 |
-} |
65 |
- |
66 |
-src_install() { |
67 |
- keepdir /etc/grafana |
68 |
- insinto /etc/grafana |
69 |
- newins "${S}"/conf/sample.ini grafana.ini |
70 |
- rm "${S}"/conf/sample.ini || die |
71 |
- |
72 |
- # Frontend assets |
73 |
- insinto /usr/share/${MY_PN} |
74 |
- doins -r public conf |
75 |
- |
76 |
- dobin bin/grafana-cli |
77 |
- dobin bin/grafana-server |
78 |
- |
79 |
- exeinto /usr/share/grafana/tools/phantomjs |
80 |
- doexe tools/phantomjs/phantomjs |
81 |
- |
82 |
- insinto /usr/share/grafana/tools/phantomjs |
83 |
- doins tools/phantomjs/render.js |
84 |
- |
85 |
- newconfd "${FILESDIR}"/grafana.confd grafana |
86 |
- newinitd "${FILESDIR}"/grafana.initd.3 grafana |
87 |
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service |
88 |
- |
89 |
- keepdir /var/{lib,log}/grafana |
90 |
- keepdir /var/lib/grafana/{dashboards,plugins} |
91 |
- fowners grafana:grafana /var/{lib,log}/grafana |
92 |
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins} |
93 |
- fperms 0750 /var/{lib,log}/grafana |
94 |
- fperms 0750 /var/lib/grafana/{dashboards,plugins} |
95 |
-} |
96 |
- |
97 |
-postinst() { |
98 |
- elog "${PN} has built-in log rotation. Please see [log.file] section of" |
99 |
- elog "/etc/grafana/grafana.ini for related settings." |
100 |
- elog |
101 |
- elog "You may add your own custom configuration for app-admin/logrotate if you" |
102 |
- elog "wish to use external rotation of logs. In this case, you also need to make" |
103 |
- elog "sure the built-in rotation is turned off." |
104 |
-} |
105 |
|
106 |
diff --git a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild b/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild |
107 |
deleted file mode 100644 |
108 |
index 58b22b14471..00000000000 |
109 |
--- a/www-apps/grafana-bin/grafana-bin-6.7.2.ebuild |
110 |
+++ /dev/null |
111 |
@@ -1,71 +0,0 @@ |
112 |
-# Copyright 1999-2020 Gentoo Authors |
113 |
-# Distributed under the terms of the GNU General Public License v2 |
114 |
- |
115 |
-EAPI=7 |
116 |
- |
117 |
-inherit user systemd |
118 |
- |
119 |
-MY_PN=${PN/-bin/} |
120 |
-MY_PV=${PV/_beta/-beta} |
121 |
-S=${WORKDIR}/${MY_PN}-${MY_PV} |
122 |
- |
123 |
-DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB" |
124 |
-HOMEPAGE="https://grafana.org" |
125 |
-SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz" |
126 |
- |
127 |
-LICENSE="Apache-2.0" |
128 |
-SLOT="0" |
129 |
-KEYWORDS="~amd64" |
130 |
- |
131 |
-DEPEND="" |
132 |
-RDEPEND="${DEPEND} |
133 |
- media-libs/fontconfig" |
134 |
- |
135 |
-QA_EXECSTACK="usr/share/grafana/tools/phantomjs/phantomjs" |
136 |
-QA_PREBUILT="usr/bin/grafana-* ${QA_EXECSTACK}" |
137 |
-QA_PRESTRIPPED=${QA_PREBUILT} |
138 |
- |
139 |
-pkg_setup() { |
140 |
- enewgroup grafana |
141 |
- enewuser grafana -1 -1 /usr/share/grafana grafana |
142 |
-} |
143 |
- |
144 |
-src_install() { |
145 |
- keepdir /etc/grafana |
146 |
- insinto /etc/grafana |
147 |
- newins "${S}"/conf/sample.ini grafana.ini |
148 |
- rm "${S}"/conf/sample.ini || die |
149 |
- |
150 |
- # Frontend assets |
151 |
- insinto /usr/share/${MY_PN} |
152 |
- doins -r public conf |
153 |
- |
154 |
- dobin bin/grafana-cli |
155 |
- dobin bin/grafana-server |
156 |
- |
157 |
- exeinto /usr/share/grafana/tools/phantomjs |
158 |
- doexe tools/phantomjs/phantomjs |
159 |
- |
160 |
- insinto /usr/share/grafana/tools/phantomjs |
161 |
- doins tools/phantomjs/render.js |
162 |
- |
163 |
- newconfd "${FILESDIR}"/grafana.confd grafana |
164 |
- newinitd "${FILESDIR}"/grafana.initd.3 grafana |
165 |
- systemd_newunit "${FILESDIR}"/grafana.service grafana.service |
166 |
- |
167 |
- keepdir /var/{lib,log}/grafana |
168 |
- keepdir /var/lib/grafana/{dashboards,plugins} |
169 |
- fowners grafana:grafana /var/{lib,log}/grafana |
170 |
- fowners grafana:grafana /var/lib/grafana/{dashboards,plugins} |
171 |
- fperms 0750 /var/{lib,log}/grafana |
172 |
- fperms 0750 /var/lib/grafana/{dashboards,plugins} |
173 |
-} |
174 |
- |
175 |
-postinst() { |
176 |
- elog "${PN} has built-in log rotation. Please see [log.file] section of" |
177 |
- elog "/etc/grafana/grafana.ini for related settings." |
178 |
- elog |
179 |
- elog "You may add your own custom configuration for app-admin/logrotate if you" |
180 |
- elog "wish to use external rotation of logs. In this case, you also need to make" |
181 |
- elog "sure the built-in rotation is turned off." |
182 |
-} |