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

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/
Date: Wed, 30 Jun 2021 10:14:24
Message-Id: 1625048055.c95edf1f15ed912075324ecb74a2f2c3483889ce.fordfrog@gentoo
1 commit: c95edf1f15ed912075324ecb74a2f2c3483889ce
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 10:14:05 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 10:14:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95edf1f
7
8 net-analyzer/zabbix: added support for additional tls backends
9
10 thanks to Timo Gurr <tgurr <AT> gentoo.org> for the initial patch
11
12 Closes: https://bugs.gentoo.org/586456
13 Package-Manager: Portage-3.0.20, Repoman-3.0.3
14 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
15
16 net-analyzer/zabbix/metadata.xml | 10 ++++++----
17 net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild | 13 ++++++++++---
18 net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild | 13 ++++++++++---
19 net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild | 13 +++++++++----
20 net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild | 13 +++++++++----
21 net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild | 13 +++++++++----
22 net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild | 13 +++++++++----
23 net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild | 13 +++++++++----
24 8 files changed, 71 insertions(+), 30 deletions(-)
25
26 diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
27 index 3bb2164c1a5..40e6f474daf 100644
28 --- a/net-analyzer/zabbix/metadata.xml
29 +++ b/net-analyzer/zabbix/metadata.xml
30 @@ -16,13 +16,15 @@ configure different types of notifications for pre-defined events.
31 <flag name="agent2">Enable go-based zabbix agent 2 (for to-be-monitored machines)</flag>
32 <flag name="frontend">Enable zabbix web frontend</flag>
33 <flag name="ipv6">Turn on support of IPv6</flag>
34 - <flag name="proxy">Enable proxy support</flag>
35 + <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
36 + <flag name="libxml2">Use libxml2 client library</flag>
37 + <flag name="mbedtls">Use net-libs/mbedtls as TLS backend</flag>
38 + <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
39 <flag name="openipmi">Enable openipmi things</flag>
40 + <flag name="openssl">Use dev-libs/openssl as TLS backend</flag>
41 + <flag name="proxy">Enable proxy support</flag>
42 <flag name="server">Enable zabbix server</flag>
43 <flag name="ssh">SSH v2 based checks</flag>
44 - <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
45 <flag name="static">Build statically linked binaries</flag>
46 - <flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
47 - <flag name="libxml2">Use libxml2 client library</flag>
48 </use>
49 </pkgmetadata>
50
51 diff --git a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
52 index 6be99de828f..cfc7eafddcc 100644
53 --- a/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
54 +++ b/net-analyzer/zabbix/zabbix-4.0.30-r1.ebuild
55 @@ -16,10 +16,11 @@ LICENSE="GPL-2"
56 SLOT="0/$(ver_cut 1-2)"
57 WEBAPP_MANUAL_SLOT="yes"
58 KEYWORDS="amd64 x86"
59 -IUSE="+agent curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
60 +IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
61 REQUIRED_USE="|| ( agent frontend proxy server )
62 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
63 server? ( ^^ ( mysql oracle postgres ) )
64 + ssl? ( ^^ ( gnutls mbedtls openssl ) )
65 static? ( !oracle !snmp )"
66
67 COMMON_DEPEND="
68 @@ -44,7 +45,11 @@ COMMON_DEPEND="
69 snmp? ( net-analyzer/net-snmp )
70 sqlite? ( dev-db/sqlite )
71 ssh? ( net-libs/libssh2 )
72 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
73 + ssl? (
74 + gnutls? ( net-libs/gnutls:0= )
75 + mbedtls? ( net-libs/mbedtls:0= )
76 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
77 + )
78 xmpp? ( dev-libs/iksemel )
79 "
80
81 @@ -139,17 +144,19 @@ src_configure() {
82 $(use_enable server) \
83 $(use_enable static) \
84 $(use_with curl libcurl) \
85 + $(use_with gnutls) \
86 $(use_with ldap) \
87 $(use_with libxml2) \
88 + $(use_with mbedtls) \
89 $(use_with mysql) \
90 $(use_with odbc unixodbc) \
91 $(use_with openipmi openipmi) \
92 + $(use_with openssl) \
93 $(use_with oracle) \
94 $(use_with postgres postgresql) \
95 $(use_with snmp net-snmp) \
96 $(use_with sqlite sqlite3) \
97 $(use_with ssh ssh2) \
98 - $(use_with ssl openssl) \
99 $(use_with xmpp jabber)
100 }
101
102
103 diff --git a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
104 index 4d7efb9ec0b..d1235337a34 100644
105 --- a/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
106 +++ b/net-analyzer/zabbix/zabbix-4.0.31-r1.ebuild
107 @@ -16,8 +16,9 @@ LICENSE="GPL-2"
108 SLOT="0/$(ver_cut 1-2)"
109 WEBAPP_MANUAL_SLOT="yes"
110 KEYWORDS="~amd64 ~x86"
111 -IUSE="+agent curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
112 +IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static xmpp"
113 REQUIRED_USE="|| ( agent frontend proxy server )
114 + ssl? ( ^^ ( gnutls mbedtls openssl ) )
115 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
116 server? ( ^^ ( mysql oracle postgres ) )
117 static? ( !oracle !snmp )"
118 @@ -44,7 +45,11 @@ COMMON_DEPEND="
119 snmp? ( net-analyzer/net-snmp )
120 sqlite? ( dev-db/sqlite )
121 ssh? ( net-libs/libssh2 )
122 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
123 + ssl? (
124 + gnutls? ( net-libs/gnutls:0= )
125 + mbedtls? ( net-libs/mbedtls:0= )
126 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
127 + )
128 xmpp? ( dev-libs/iksemel )
129 "
130
131 @@ -139,17 +144,19 @@ src_configure() {
132 $(use_enable server) \
133 $(use_enable static) \
134 $(use_with curl libcurl) \
135 + $(use_with gnutls) \
136 $(use_with ldap) \
137 $(use_with libxml2) \
138 + $(use_with mbedtls) \
139 $(use_with mysql) \
140 $(use_with odbc unixodbc) \
141 $(use_with openipmi openipmi) \
142 + $(use_with openssl) \
143 $(use_with oracle) \
144 $(use_with postgres postgresql) \
145 $(use_with snmp net-snmp) \
146 $(use_with sqlite sqlite3) \
147 $(use_with ssh ssh2) \
148 - $(use_with ssl openssl) \
149 $(use_with xmpp jabber)
150 }
151
152
153 diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
154 index 1ca944df369..cff0c42d44b 100644
155 --- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
156 +++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
157 @@ -247,10 +247,11 @@ LICENSE="GPL-2"
158 SLOT="0/$(ver_cut 1-2)"
159 WEBAPP_MANUAL_SLOT="yes"
160 KEYWORDS="~amd64 ~x86"
161 -IUSE="+agent +agent2 curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static"
162 +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
163 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
164 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
165 server? ( ^^ ( mysql oracle postgres ) )
166 + ssl? ( ^^ ( gnutls openssl ) )
167 static? ( !oracle !snmp )"
168
169 COMMON_DEPEND="
170 @@ -275,7 +276,10 @@ COMMON_DEPEND="
171 snmp? ( net-analyzer/net-snmp )
172 sqlite? ( dev-db/sqlite )
173 ssh? ( net-libs/libssh2 )
174 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
175 + ssl? (
176 + gnutls? ( net-libs/gnutls:0= )
177 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
178 + )
179 "
180
181 RDEPEND="${COMMON_DEPEND}
182 @@ -370,17 +374,18 @@ src_configure() {
183 $(use_enable server) \
184 $(use_enable static) \
185 $(use_with curl libcurl) \
186 + $(use_with gnutls) \
187 $(use_with ldap) \
188 $(use_with libxml2) \
189 $(use_with mysql) \
190 $(use_with odbc unixodbc) \
191 $(use_with openipmi openipmi) \
192 + $(use_with openssl) \
193 $(use_with oracle) \
194 $(use_with postgres postgresql) \
195 $(use_with snmp net-snmp) \
196 $(use_with sqlite sqlite3) \
197 - $(use_with ssh ssh2) \
198 - $(use_with ssl openssl)
199 + $(use_with ssh ssh2)
200 }
201
202 src_compile() {
203
204 diff --git a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
205 index ec4ebfeb437..76c918cf464 100644
206 --- a/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
207 +++ b/net-analyzer/zabbix/zabbix-5.0.8-r1.ebuild
208 @@ -16,10 +16,11 @@ LICENSE="GPL-2"
209 SLOT="0/$(ver_cut 1-2)"
210 WEBAPP_MANUAL_SLOT="yes"
211 KEYWORDS="amd64 x86"
212 -IUSE="+agent curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static"
213 +IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
214 REQUIRED_USE="|| ( agent frontend proxy server )
215 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
216 server? ( ^^ ( mysql oracle postgres ) )
217 + ssl? ( ^^ ( gnutls openssl ) )
218 static? ( !oracle !snmp )"
219
220 COMMON_DEPEND="
221 @@ -44,7 +45,10 @@ COMMON_DEPEND="
222 snmp? ( net-analyzer/net-snmp )
223 sqlite? ( dev-db/sqlite )
224 ssh? ( net-libs/libssh2 )
225 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
226 + ssl? (
227 + gnutls? ( net-libs/gnutls:0= )
228 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
229 + )
230 "
231
232 RDEPEND="${COMMON_DEPEND}
233 @@ -138,17 +142,18 @@ src_configure() {
234 $(use_enable server) \
235 $(use_enable static) \
236 $(use_with curl libcurl) \
237 + $(use_with gnutls) \
238 $(use_with ldap) \
239 $(use_with libxml2) \
240 $(use_with mysql) \
241 $(use_with odbc unixodbc) \
242 $(use_with openipmi openipmi) \
243 + $(use_with openssl) \
244 $(use_with oracle) \
245 $(use_with postgres postgresql) \
246 $(use_with snmp net-snmp) \
247 $(use_with sqlite sqlite3) \
248 - $(use_with ssh ssh2) \
249 - $(use_with ssl openssl)
250 + $(use_with ssh ssh2)
251 }
252
253 src_compile() {
254
255 diff --git a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
256 index ec4ebfeb437..76c918cf464 100644
257 --- a/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
258 +++ b/net-analyzer/zabbix/zabbix-5.2.4-r1.ebuild
259 @@ -16,10 +16,11 @@ LICENSE="GPL-2"
260 SLOT="0/$(ver_cut 1-2)"
261 WEBAPP_MANUAL_SLOT="yes"
262 KEYWORDS="amd64 x86"
263 -IUSE="+agent curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static"
264 +IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
265 REQUIRED_USE="|| ( agent frontend proxy server )
266 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
267 server? ( ^^ ( mysql oracle postgres ) )
268 + ssl? ( ^^ ( gnutls openssl ) )
269 static? ( !oracle !snmp )"
270
271 COMMON_DEPEND="
272 @@ -44,7 +45,10 @@ COMMON_DEPEND="
273 snmp? ( net-analyzer/net-snmp )
274 sqlite? ( dev-db/sqlite )
275 ssh? ( net-libs/libssh2 )
276 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
277 + ssl? (
278 + gnutls? ( net-libs/gnutls:0= )
279 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
280 + )
281 "
282
283 RDEPEND="${COMMON_DEPEND}
284 @@ -138,17 +142,18 @@ src_configure() {
285 $(use_enable server) \
286 $(use_enable static) \
287 $(use_with curl libcurl) \
288 + $(use_with gnutls) \
289 $(use_with ldap) \
290 $(use_with libxml2) \
291 $(use_with mysql) \
292 $(use_with odbc unixodbc) \
293 $(use_with openipmi openipmi) \
294 + $(use_with openssl) \
295 $(use_with oracle) \
296 $(use_with postgres postgresql) \
297 $(use_with snmp net-snmp) \
298 $(use_with sqlite sqlite3) \
299 - $(use_with ssh ssh2) \
300 - $(use_with ssl openssl)
301 + $(use_with ssh ssh2)
302 }
303
304 src_compile() {
305
306 diff --git a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
307 index 1e6a115bef7..2b2efbe976a 100644
308 --- a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
309 +++ b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
310 @@ -256,11 +256,12 @@ LICENSE="GPL-2"
311 SLOT="0/$(ver_cut 1-2)"
312 WEBAPP_MANUAL_SLOT="yes"
313 KEYWORDS="~amd64 ~x86"
314 -IUSE="+agent +agent2 curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static"
315 +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
316
317 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
318 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
319 server? ( ^^ ( mysql oracle postgres ) )
320 + ssl? ( ^^ ( gnutls openssl ) )
321 static? ( !oracle !snmp )"
322
323 COMMON_DEPEND="
324 @@ -285,7 +286,10 @@ COMMON_DEPEND="
325 snmp? ( net-analyzer/net-snmp )
326 sqlite? ( dev-db/sqlite )
327 ssh? ( net-libs/libssh2 )
328 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
329 + ssl? (
330 + gnutls? ( net-libs/gnutls:0= )
331 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
332 + )
333 "
334
335 RDEPEND="${COMMON_DEPEND}
336 @@ -380,17 +384,18 @@ src_configure() {
337 "$(use_enable server)" \
338 "$(use_enable static)" \
339 "$(use_with curl libcurl)" \
340 + "$(use_with gnutls)" \
341 "$(use_with ldap)" \
342 "$(use_with libxml2)" \
343 "$(use_with mysql)" \
344 "$(use_with odbc unixodbc)" \
345 "$(use_with openipmi openipmi)" \
346 + "$(use_with openssl)" \
347 "$(use_with oracle)" \
348 "$(use_with postgres postgresql)" \
349 "$(use_with snmp net-snmp)" \
350 "$(use_with sqlite sqlite3)" \
351 - "$(use_with ssh ssh2)" \
352 - "$(use_with ssl openssl)"
353 + "$(use_with ssh ssh2)"
354 }
355
356 src_compile() {
357
358 diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
359 index e3e427e7f2a..03f172c30f5 100644
360 --- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
361 +++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
362 @@ -272,10 +272,11 @@ LICENSE="GPL-2"
363 SLOT="0/$(ver_cut 1-2)"
364 WEBAPP_MANUAL_SLOT="yes"
365 KEYWORDS="~amd64 ~x86"
366 -IUSE="+agent +agent2 curl frontend ipv6 java ldap libxml2 mysql odbc openipmi oracle +postgres proxy server snmp sqlite ssh ssl static"
367 +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh ssl static"
368 REQUIRED_USE="|| ( agent agent2 frontend proxy server )
369 proxy? ( ^^ ( mysql oracle postgres sqlite ) )
370 server? ( ^^ ( mysql oracle postgres ) )
371 + ssl? ( ^^ ( gnutls openssl ) )
372 static? ( !oracle !snmp )"
373
374 COMMON_DEPEND="
375 @@ -300,7 +301,10 @@ COMMON_DEPEND="
376 snmp? ( net-analyzer/net-snmp )
377 sqlite? ( dev-db/sqlite )
378 ssh? ( net-libs/libssh2 )
379 - ssl? ( dev-libs/openssl:=[-bindist(-)] )
380 + ssl? (
381 + gnutls? ( net-libs/gnutls:0= )
382 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
383 + )
384 "
385
386 RDEPEND="${COMMON_DEPEND}
387 @@ -395,17 +399,18 @@ src_configure() {
388 "$(use_enable server)" \
389 "$(use_enable static)" \
390 "$(use_with curl libcurl)" \
391 + "$(use_with gnutls)" \
392 "$(use_with ldap)" \
393 "$(use_with libxml2)" \
394 "$(use_with mysql)" \
395 "$(use_with odbc unixodbc)" \
396 "$(use_with openipmi openipmi)" \
397 + "$(use_with openssl)" \
398 "$(use_with oracle)" \
399 "$(use_with postgres postgresql)" \
400 "$(use_with snmp net-snmp)" \
401 "$(use_with sqlite sqlite3)" \
402 - "$(use_with ssh ssh2)" \
403 - "$(use_with ssl openssl)"
404 + "$(use_with ssh ssh2)"
405 }
406
407 src_compile() {
Report Message
Find on MARC Find on Google Groups