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