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: Thu, 16 Mar 2023 07:49:26
Message-Id: 1678952958.84cead349f161cbc3ca4c6f8d9b78cbdcf7f4e9d.fordfrog@gentoo
1 commit: 84cead349f161cbc3ca4c6f8d9b78cbdcf7f4e9d
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 16 07:49:05 2023 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 16 07:49:18 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cead34
7
8 net-analyzer/zabbix: bump to 6.0.14
9
10 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
11
12 net-analyzer/zabbix/Manifest | 2 +
13 net-analyzer/zabbix/zabbix-6.0.14.ebuild | 397 +++++++++++++++++++++++++++++++
14 2 files changed, 399 insertions(+)
15
16 diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
17 index e3837fb3646c..b8b7f8a92d3f 100644
18 --- a/net-analyzer/zabbix/Manifest
19 +++ b/net-analyzer/zabbix/Manifest
20 @@ -9,6 +9,8 @@ DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e02
21 DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
22 DIST zabbix-6.0.13-go-deps.tar.xz 17974536 BLAKE2B 296ae034ccf0f6cd1d83379c46ad87d80faf3d897d807d948312989e044dc4d159aabab27999730ed255be3c7d5aa6b70927bcfb888f9969b36994c68246c14b SHA512 279aeed128e00dab8f1824ed7186ddc914615f7756a96c049bff0321997c9e412007c56701a036a1a25029aa7c4f878ad4566e95abbf766ee353666a6a588370
23 DIST zabbix-6.0.13.tar.gz 41075557 BLAKE2B 41db999c52d3ca596861d8850d594e639159b8c7090b47dd824be5b2695a6f1ebc0399643de8fb25af4081ab294c6fefe7ec9c0025ba4e4d17d44aa16d8b233a SHA512 188622c0c04029eac376ebf60c96ed9d67923bc1f40eff75666a241bb534cb744aca8c51ff4b79d508dfadb9e758f80d9dc46016217bcb5a67e8ede7e645788e
24 +DIST zabbix-6.0.14-go-deps.tar.xz 17976336 BLAKE2B e4e29c6730f10e95c84d4f517130e79b44f82ddcfbe1465f7c419356158eba0354b0b3c18b45c8813be218337e354bb4f0be45633716b36a2272dabfa86a025f SHA512 2ae41852f7a84916b27e92e2661c9ff0beb56b3f54f83314a0ccddb55293c5c2a5bbbd090efba3c99f93a1722e0dedd94e4051d63d4dd9c8ff4cd9e084a4b39e
25 +DIST zabbix-6.0.14.tar.gz 41242602 BLAKE2B 2639e9b210df72f51de1ef2e610e5e1e936a147c8fb892dc15b7dc44008e3535c6df867d314c153283588e8a1a3b63dad65604877ea7471bb2d207a4dbc913c8 SHA512 9750dc6bfdc3966a6be098297744fed507272776212ce2143c70b035c2a0662e6c1fb1a1f423babbd9b69ad6231e6cbe397d5def069192a0c21189ca96670c89
26 DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01 SHA512 eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
27 DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21 SHA512 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
28 DIST zabbix-6.2.7-go-deps.tar.xz 17973952 BLAKE2B f7e155040a60ac48236084b404d469bc5c34ab0dd986d3d647960bb6313f8080298f359680d6be23d2cb4c5f7d30bbab773c7fe81e4bde3873215f5e4072bed7 SHA512 e83dcd5cd6a07febf9c6380d311c84a319e3c45314266217837f6b35e540a6c9d4c980ceb7bb995ca8366247ea67d7d3c1b10beab677e4c24c69d83ba9977862
29
30 diff --git a/net-analyzer/zabbix/zabbix-6.0.14.ebuild b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
31 new file mode 100644
32 index 000000000000..f3edadcff0ce
33 --- /dev/null
34 +++ b/net-analyzer/zabbix/zabbix-6.0.14.ebuild
35 @@ -0,0 +1,397 @@
36 +# Copyright 1999-2023 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +# To create the go modules tarball:
40 +# cd src/go
41 +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
42 +# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
43 +
44 +EAPI=8
45 +
46 +GO_OPTIONAL="yes"
47 +# needed to make webapp-config dep optional
48 +WEBAPP_OPTIONAL="yes"
49 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
50 +
51 +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
52 +HOMEPAGE="https://www.zabbix.com/"
53 +MY_P=${P/_/}
54 +MY_PV=${PV/_/}
55 +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
56 + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
57 +"
58 +
59 +LICENSE="GPL-2"
60 +SLOT="0/$(ver_cut 1-2)"
61 +WEBAPP_MANUAL_SLOT="yes"
62 +KEYWORDS="~amd64 ~x86"
63 +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
64 +REQUIRED_USE="|| ( agent agent2 frontend proxy server )
65 + ?? ( gnutls openssl )
66 + proxy? ( ^^ ( mysql oracle postgres sqlite ) )
67 + server? ( ^^ ( mysql oracle postgres ) !sqlite )
68 + static? ( !oracle !snmp )"
69 +
70 +COMMON_DEPEND="
71 + curl? ( net-misc/curl )
72 + gnutls? ( net-libs/gnutls:0= )
73 + java? ( >=virtual/jdk-1.8:* )
74 + ldap? (
75 + =dev-libs/cyrus-sasl-2*
76 + net-libs/gnutls:=
77 + net-nds/openldap:=
78 + )
79 + libxml2? ( dev-libs/libxml2 )
80 + mysql? ( dev-db/mysql-connector-c:= )
81 + odbc? ( dev-db/unixODBC )
82 + openipmi? ( sys-libs/openipmi )
83 + openssl? ( dev-libs/openssl:=[-bindist(-)] )
84 + oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
85 + postgres? ( dev-db/postgresql:* )
86 + proxy? (
87 + dev-libs/libevent:=
88 + sys-libs/zlib
89 + )
90 + server? (
91 + dev-libs/libevent:=
92 + sys-libs/zlib
93 + )
94 + snmp? ( net-analyzer/net-snmp:= )
95 + sqlite? ( dev-db/sqlite )
96 + ssh? ( net-libs/libssh2 )
97 +"
98 +
99 +RDEPEND="${COMMON_DEPEND}
100 + acct-group/zabbix
101 + acct-user/zabbix
102 + java? ( >=virtual/jre-1.8:* )
103 + mysql? ( virtual/mysql )
104 + proxy? (
105 + dev-libs/libpcre2:=
106 + net-analyzer/fping[suid]
107 + )
108 + server? (
109 + app-admin/webapp-config
110 + dev-libs/libpcre2:=
111 + net-analyzer/fping[suid]
112 + )
113 + frontend? (
114 + app-admin/webapp-config
115 + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
116 + media-libs/gd[png]
117 + virtual/httpd-php:*
118 + mysql? ( dev-lang/php[mysqli] )
119 + odbc? ( dev-lang/php[odbc] )
120 + oracle? ( dev-lang/php[oci8-instant-client] )
121 + postgres? ( dev-lang/php[postgres] )
122 + sqlite? ( dev-lang/php[sqlite] )
123 + )
124 +"
125 +DEPEND="${COMMON_DEPEND}
126 + static? (
127 + curl? ( net-misc/curl[static-libs] )
128 + ldap? (
129 + =dev-libs/cyrus-sasl-2*[static-libs]
130 + net-libs/gnutls[static-libs]
131 + net-nds/openldap[static-libs]
132 + )
133 + libxml2? ( dev-libs/libxml2[static-libs] )
134 + mysql? ( dev-db/mysql-connector-c[static-libs] )
135 + odbc? ( dev-db/unixODBC[static-libs] )
136 + postgres? ( dev-db/postgresql:*[static-libs] )
137 + sqlite? ( dev-db/sqlite[static-libs] )
138 + ssh? ( net-libs/libssh2 )
139 + )
140 +"
141 +BDEPEND="
142 + virtual/pkgconfig
143 + agent2? (
144 + >=dev-lang/go-1.12
145 + app-arch/unzip
146 + )
147 +"
148 +
149 +# upstream tests fail for agent2
150 +RESTRICT="test"
151 +
152 +PATCHES=(
153 + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
154 + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
155 + "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
156 +)
157 +
158 +S=${WORKDIR}/${MY_P}
159 +
160 +ZABBIXJAVA_BASE="opt/zabbix_java"
161 +
162 +pkg_setup() {
163 + if use oracle; then
164 + if [ -z "${ORACLE_HOME}" ]; then
165 + eerror
166 + eerror "The environment variable ORACLE_HOME must be set"
167 + eerror "and point to the correct location."
168 + eerror "It looks like you don't have Oracle installed."
169 + eerror
170 + die "Environment variable ORACLE_HOME is not set"
171 + fi
172 + fi
173 +
174 + if use frontend; then
175 + webapp_pkg_setup
176 + fi
177 +
178 + java-pkg-opt-2_pkg_setup
179 +}
180 +
181 +src_configure() {
182 + local econf_args=(
183 + --with-libpcre2
184 + "$(use_enable agent)"
185 + "$(use_enable agent2)"
186 + "$(use_enable ipv6)"
187 + "$(use_enable java)"
188 + "$(use_enable proxy)"
189 + "$(use_enable server)"
190 + "$(use_enable static)"
191 + "$(use_with curl libcurl)"
192 + "$(use_with gnutls)"
193 + "$(use_with ldap)"
194 + "$(use_with libxml2)"
195 + "$(use_with mysql)"
196 + "$(use_with odbc unixodbc)"
197 + "$(use_with openipmi openipmi)"
198 + "$(use_with openssl)"
199 + "$(use_with oracle)"
200 + "$(use_with postgres postgresql)"
201 + "$(use_with snmp net-snmp)"
202 + "$(use_with sqlite sqlite3)"
203 + "$(use_with ssh ssh2)"
204 + )
205 +
206 + econf ${econf_args[@]}
207 +}
208 +
209 +src_compile() {
210 + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
211 + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
212 + fi
213 +}
214 +
215 +src_install() {
216 + local dirs=(
217 + /etc/zabbix
218 + /var/lib/zabbix
219 + /var/lib/zabbix/home
220 + /var/lib/zabbix/scripts
221 + /var/lib/zabbix/alertscripts
222 + /var/lib/zabbix/externalscripts
223 + /var/log/zabbix
224 + )
225 +
226 + for dir in "${dirs[@]}"; do
227 + keepdir "${dir}"
228 + done
229 +
230 + if use server; then
231 + insinto /etc/zabbix
232 + doins "${S}"/conf/zabbix_server.conf
233 + fperms 0640 /etc/zabbix/zabbix_server.conf
234 + fowners root:zabbix /etc/zabbix/zabbix_server.conf
235 +
236 + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
237 +
238 + dosbin src/zabbix_server/zabbix_server
239 +
240 + insinto /usr/share/zabbix
241 + doins -r "${S}"/database/
242 +
243 + systemd_dounit "${FILESDIR}"/zabbix-server.service
244 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
245 + fi
246 +
247 + if use proxy; then
248 + insinto /etc/zabbix
249 + doins "${S}"/conf/zabbix_proxy.conf
250 + fperms 0640 /etc/zabbix/zabbix_proxy.conf
251 + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
252 +
253 + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
254 +
255 + dosbin src/zabbix_proxy/zabbix_proxy
256 +
257 + insinto /usr/share/zabbix
258 + doins -r "${S}"/database/
259 +
260 + systemd_dounit "${FILESDIR}"/zabbix-proxy.service
261 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
262 + fi
263 +
264 + if use agent; then
265 + insinto /etc/zabbix
266 + doins "${S}"/conf/zabbix_agentd.conf
267 + fperms 0640 /etc/zabbix/zabbix_agentd.conf
268 + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
269 +
270 + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
271 +
272 + dosbin src/zabbix_agent/zabbix_agentd
273 + dobin \
274 + src/zabbix_sender/zabbix_sender \
275 + src/zabbix_get/zabbix_get
276 +
277 + systemd_dounit "${FILESDIR}"/zabbix-agentd.service
278 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
279 + fi
280 + if use agent2; then
281 + insinto /etc/zabbix
282 + doins "${S}"/src/go/conf/zabbix_agent2.conf
283 + fperms 0640 /etc/zabbix/zabbix_agent2.conf
284 + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
285 + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
286 +
287 + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
288 +
289 + dosbin src/go/bin/zabbix_agent2
290 +
291 + systemd_dounit "${FILESDIR}"/zabbix-agent2.service
292 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
293 + fi
294 +
295 + fowners root:zabbix /etc/zabbix
296 + fowners zabbix:zabbix \
297 + /var/lib/zabbix \
298 + /var/lib/zabbix/home \
299 + /var/lib/zabbix/scripts \
300 + /var/lib/zabbix/alertscripts \
301 + /var/lib/zabbix/externalscripts \
302 + /var/log/zabbix
303 + fperms 0750 \
304 + /etc/zabbix \
305 + /var/lib/zabbix \
306 + /var/lib/zabbix/home \
307 + /var/lib/zabbix/scripts \
308 + /var/lib/zabbix/alertscripts \
309 + /var/lib/zabbix/externalscripts \
310 + /var/log/zabbix
311 +
312 + dodoc README INSTALL NEWS ChangeLog \
313 + conf/zabbix_agentd.conf \
314 + conf/zabbix_proxy.conf \
315 + conf/zabbix_agentd/userparameter_examples.conf \
316 + conf/zabbix_agentd/userparameter_mysql.conf \
317 + conf/zabbix_server.conf
318 +
319 + if use frontend; then
320 + webapp_src_preinst
321 + cp -R ui/* "${D}/${MY_HTDOCSDIR}"
322 + webapp_configfile \
323 + "${MY_HTDOCSDIR}"/include/db.inc.php \
324 + "${MY_HTDOCSDIR}"/include/config.inc.php
325 + webapp_src_install
326 + fi
327 +
328 + if use java; then
329 + dodir \
330 + /${ZABBIXJAVA_BASE} \
331 + /${ZABBIXJAVA_BASE}/bin \
332 + /${ZABBIXJAVA_BASE}/lib
333 + keepdir /${ZABBIXJAVA_BASE}
334 + exeinto /${ZABBIXJAVA_BASE}/bin
335 + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
336 + exeinto /${ZABBIXJAVA_BASE}/lib
337 + doexe \
338 + src/zabbix_java/lib/logback-classic-1.2.9.jar \
339 + src/zabbix_java/lib/logback-console.xml \
340 + src/zabbix_java/lib/logback-core-1.2.9.jar \
341 + src/zabbix_java/lib/logback.xml \
342 + src/zabbix_java/lib/android-json-4.3_r3.1.jar \
343 + src/zabbix_java/lib/slf4j-api-1.7.32.jar
344 + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
345 + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
346 + fi
347 +}
348 +
349 +pkg_postinst() {
350 + if use server || use proxy ; then
351 + elog
352 + elog "You may need to configure your database for Zabbix"
353 + elog "if you have not already done so."
354 + elog
355 +
356 + zabbix_homedir=$(egethome zabbix)
357 + if [ -n "${zabbix_homedir}" ] && \
358 + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
359 + ewarn
360 + ewarn "The user 'zabbix' should have his homedir changed"
361 + ewarn "to /var/lib/zabbix/home if you want to use"
362 + ewarn "custom alert scripts."
363 + ewarn
364 + ewarn "A real homedir might be needed for configfiles"
365 + ewarn "for custom alert scripts."
366 + ewarn
367 + ewarn "To change the homedir use:"
368 + ewarn " usermod -d /var/lib/zabbix/home zabbix"
369 + ewarn
370 + fi
371 + fi
372 +
373 + if use server; then
374 + tmpfiles_process zabbix-server.conf
375 +
376 + elog
377 + elog "For distributed monitoring you have to run:"
378 + elog
379 + elog "zabbix_server -n <nodeid>"
380 + elog
381 + elog "This will convert database data for use with Node ID"
382 + elog "and also adds a local node."
383 + elog
384 + fi
385 +
386 + if use proxy; then
387 + tmpfiles_process zabbix-proxy.conf
388 + fi
389 +
390 + if use agent; then
391 + tmpfiles_process zabbix-agentd.conf
392 + fi
393 +
394 + if use agent2; then
395 + tmpfiles_process zabbix-agent2.conf
396 + fi
397 +
398 + elog "--"
399 + elog
400 + elog "You may need to add these lines to /etc/services:"
401 + elog
402 + elog "zabbix-agent 10050/tcp Zabbix Agent"
403 + elog "zabbix-agent 10050/udp Zabbix Agent"
404 + elog "zabbix-trapper 10051/tcp Zabbix Trapper"
405 + elog "zabbix-trapper 10051/udp Zabbix Trapper"
406 + elog
407 +
408 + if use server || use proxy ; then
409 + # check for fping
410 + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
411 + case "${fping_perms}" in
412 + 4[157][157][157])
413 + ;;
414 + *)
415 + ewarn
416 + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
417 + ewarn "you have to make /usr/sbin/fping setuid root and executable"
418 + ewarn "by everyone. Run the following command to fix it:"
419 + ewarn
420 + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
421 + ewarn
422 + ewarn "Please be aware that this might impose a security risk,"
423 + ewarn "depending on the code quality of fping."
424 + ewarn
425 + ;;
426 + esac
427 + fi
428 +}
429 +
430 +pkg_prerm() {
431 + (use frontend || use server) && webapp_pkg_prerm
432 +}