commit: 2fae5747fa21cc0bb43c5ef2ff1cdc4befdb5dd8
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 25 18:24:23 2026 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 18:24:23 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fae5747
net-analyzer/zabbix: bump to 7.0.22, dropped 7.0.19 & 7.0.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
net-analyzer/zabbix/Manifest | 6 +-
net-analyzer/zabbix/zabbix-7.0.20.ebuild | 371 ---------------------
.../{zabbix-7.0.19.ebuild => zabbix-7.0.22.ebuild} | 2 +-
3 files changed, 3 insertions(+), 376 deletions(-)
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 771462d67e23..c6b31864778c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -4,10 +4,8 @@ DIST zabbix-6.0.42-go-deps.tar.xz 32222332 BLAKE2B
5918b907db9b8fe848e675eef7796
DIST zabbix-6.0.42.tar.gz 41389270 BLAKE2B
3a4d1079ddf64cb301f982617cd31c114641692716d389fa5c70e8be244879668d26b115d937d8b11ab0c596fd2bbfc5b04a46374c699b755d7b700decc7d61e
SHA512
3c1d945285bd7914567cbc65c986666ca0f71b112ee7755833b5926ea62b48a43fbb760a17874f8b8cb9ee40921441c188223db5ec7c54dcb7366ac3cae44143
DIST zabbix-7.0.18-go-deps.tar.xz 36261808 BLAKE2B
ef625c9a3a2eb13af088bec0466e18273314365bbf8231d453e48a66d6d20983afce6b162596a2785387f772035d09e593d6d44643e71a7ff9be5fb5f6136523
SHA512
a26f939c9d4e08fa1c39203201a46c869ebdb133c942aa76181eeb4b07104cb3deea6899f2b88d1f98a17586a59358b63ba468ff0ef10072aea24072b0f68568
DIST zabbix-7.0.18.tar.gz 46113850 BLAKE2B
8a88e359a6aa411ca5eb010fe24352edc3fb9dfba64d86e4e609ac3537c46cb45d470ba2f8bc196e62359459fd695d94d8be5a18afa5d1fe933fcb6f7de80cf7
SHA512
cb3530ee122aac0df1d969192bff6721b00560acabbc97877f1323e717def04f8111a42109289d881ca059364b33bcf1b5a7e5549ee33b3375a9a8956d5b354d
-DIST zabbix-7.0.19-go-deps.tar.xz 36771844 BLAKE2B
210081be5c1307f6b9e4db5ca298a26885a506a8d51e8d919229d7f025d1257dd71428322fd2d3918c6abd65eb21441e027114f0f48a86828abfcc2974fedd12
SHA512
211649ec7e8fa1a0d2618da8a6764ead8c4aa633f7cea25969a75283207dda987aacf3c25afeb7f883fc88e2d2e244ab0b21c6d8934b055218782e686951f9c9
-DIST zabbix-7.0.19.tar.gz 46506321 BLAKE2B
6a3881026fea31115903e252b2352aff771ef8d96077fc2b1100df2dd2fd14d5e3fdaee2c55a2c9e676fa813c24014277573d4cec0b958f49cb2d393f94c8ec1
SHA512
44541f13ddc816f67e8e601255e7c21faa18b395eb5a77daf09bb9d59fc252d41ebf77c0e264749570f0edb697590832e618b007887e740f320b3a848aff6df1
-DIST zabbix-7.0.20-go-deps.tar.xz 36953336 BLAKE2B
92f5a9457448412add4ab93e571ac3dc9f3ff7e33387896911bc6b5e7c0427674e7d103f07edb2bfad8c7b23ff8132b2b35f8b379d742f9d41f9ab5094bae041
SHA512
723ba8cbbfb502a4c66d6047ba2076a6682c200e28dd8333c463a41e70e2da21632a219576ff1864e4ed80e72ce79805e9e8f6827720c700ae25752a52dd1339
-DIST zabbix-7.0.20.tar.gz 46596572 BLAKE2B
d330cbcc00a19529ef2ac4b0621ec6190d133e001ce81d89d17976c715ef056255f85f7a4c4f350ceadb01c7b1960e8368c6277d61e2ea34af3d9bd4540787bc
SHA512
ef83bfc80f33b3cae73de4c8076f2d41e09915b8e6fd29b945586cd6ec1b097007e14a26ff154c0435c299200b347ad938b75466bd824a9f9e83f8798fd871eb
+DIST zabbix-7.0.22-go-deps.tar.xz 36939532 BLAKE2B
065194bdad677854f91f42f7497d07078f75b847775b79afa646db7e55f4a1671737b5e2f72d70b58ec9170d9a2131fbf500379be5de8fec55335b7e9056933d
SHA512
bb4879f42bc38412a71689ad9d3377956de5a2485d3de52300cbe23ced1160209c7981cd22f97aa8121b9a3d83c2f874d4f974b3f1248a5bc783a7e1425a1b57
+DIST zabbix-7.0.22.tar.gz 46755855 BLAKE2B
c8e9edebd8af65f5fdbf93865909e0db10dc592d48edbe0e8abc4670141d16fc89088aa9d622af4891cda809bd260fa0d817283f3c159fead8bb2181de8cb865
SHA512
476016cfef14c960a688594033956d380e9effbfabd96b31f24d558c83c36c98af64f747af7711c832c13b203536824838242e6d7dbe0e2ba3bb7fbcf4e5ed11
DIST zabbix-7.2.12-go-deps.tar.xz 35431848 BLAKE2B
070b2ecd463e2fdd52acabe59cc8690a0d528b52f269a4e79d314624d615f80bc44310c647b5a4bd6897fa500a1ed4b7ab5439932887dcd7a7005f49c0128e09
SHA512
f68dd2267e8d05ba0c841f59a6a984e10db376bda5066ebcf0dd8eaa7ee1f9bff258132b4bb5fb5eed5b0621d9f4a660c6676f050b6ef701f8184acd4f1f4fb5
DIST zabbix-7.2.12.tar.gz 41859546 BLAKE2B
47570c82cd9c88826ea3535975d70e86f5f4f406fdf9ddccfa169a2e8329c48af01111f76d51c552849eae5b879870fef7b1079aac4904bfeef8b81fbd32e18f
SHA512
c3a765326c5307644d217d293a356188538e42d332b422fbe9d33732641b64e47f39dc2f98b3e46b1d9a960f5bcada5f8c1cdc6f9ea59af6bfea0bf0a624206a
DIST zabbix-7.2.15-go-deps.tar.xz 35435476 BLAKE2B
2a8b6ea202e2959cad833b0a8f478d7f44a5524ffe289eca4e1bb740bb7d1585870c71b2dba0bd2cca61ca2d157658fd49251ba36cb402bae4f1985790e80f89
SHA512
b456dafae446166cafd76edb872ab0c9b20b7f8d37db6f54f3a8457036e76518dcf31d1286f1cca2b84ab6f02d8ac0c4a810d8632067ea94331810ca7057d5a7
diff --git a/net-analyzer/zabbix/zabbix-7.0.20.ebuild
b/net-analyzer/zabbix/zabbix-7.0.20.ebuild
deleted file mode 100644
index a3bda12e419e..000000000000
--- a/net-analyzer/zabbix/zabbix-7.0.20.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# To create the go modules tarball:
-# cd src/go
-# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
-# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod
-
-EAPI=8
-
-GO_OPTIONAL="yes"
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs
go-module user-info
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network
and servers"
-HOMEPAGE="https://www.zabbix.com/";
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
- agent2? (
https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
-"
-
-S=${WORKDIR}/${MY_P}
-
-LICENSE="AGPL-3"
-SLOT="0/$(ver_cut 1-2)"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc
openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static"
-REQUIRED_USE="|| ( agent agent2 frontend proxy server )
- ?? ( gnutls openssl )
- agent2? ( !gnutls )
- proxy? ( ^^ ( mysql postgres sqlite ) )
- server? ( ^^ ( mysql postgres ) !sqlite )
- static? ( !snmp )"
-
-COMMON_DEPEND="
- curl? ( net-misc/curl )
- gnutls? ( net-libs/gnutls:0= )
- java? ( >=virtual/jdk-1.8:* )
- ldap? (
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls:=
- net-nds/openldap:=
- )
- libxml2? ( dev-libs/libxml2:= )
- mysql? ( dev-db/mysql-connector-c:= )
- odbc? ( dev-db/unixODBC )
- openipmi? ( sys-libs/openipmi )
- openssl? ( dev-libs/openssl:=[-bindist(-)] )
- postgres? ( dev-db/postgresql:* )
- proxy? (
- dev-libs/libevent:=
- virtual/zlib:=
- )
- server? (
- dev-libs/libevent:=
- virtual/zlib:=
- )
- snmp? ( net-analyzer/net-snmp:= )
- sqlite? ( dev-db/sqlite )
- ssh? ( net-libs/libssh2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
- acct-group/zabbix
- acct-user/zabbix
- java? ( >=virtual/jre-1.8:* )
- mysql? ( virtual/mysql )
- proxy? (
- dev-libs/libpcre2:=
- net-analyzer/fping[suid]
- )
- selinux? ( sec-policy/selinux-zabbix )
- server? (
- app-admin/webapp-config
- dev-libs/libpcre2:=
- net-analyzer/fping[suid]
- )
- frontend? (
- app-admin/webapp-config
-
dev-lang/php:*[bcmath,ctype,gd,jpeg(+),nls,png(+),session,sockets,sysvipc,truetype,unicode,xml,xmlreader,xmlwriter]
- media-libs/gd[png]
- virtual/httpd-php:*
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- static? (
- curl? ( net-misc/curl[static-libs] )
- ldap? (
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- net-nds/openldap[static-libs]
- )
- libxml2? ( dev-libs/libxml2[static-libs] )
- mysql? ( dev-db/mysql-connector-c[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- sqlite? ( dev-db/sqlite[static-libs] )
- ssh? ( net-libs/libssh2 )
- )
-"
-BDEPEND="
- virtual/pkgconfig
- agent2? (
- >=dev-lang/go-1.12
- app-arch/unzip
- )
-"
-
-# upstream tests fail for agent2
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
- "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
- "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
-)
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use frontend; then
- webapp_pkg_setup
- fi
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # Since we patch configure.ac with e.g.,
${PN}-6.4.0-configure-sscanf.patch".
- eautoreconf
-}
-
-src_configure() {
- local econf_args=(
- --with-libpcre2
- "$(use_enable agent)"
- "$(use_enable agent2)"
- "$(use_enable ipv6)"
- "$(use_enable java)"
- "$(use_enable proxy)"
- "$(use_enable server)"
- "$(use_enable static)"
- "$(use_with curl libcurl)"
- "$(use_with gnutls)"
- "$(use_with ldap)"
- "$(use_with libxml2)"
- "$(use_with mysql)"
- "$(use_with odbc unixodbc)"
- "$(use_with openipmi openipmi)"
- "$(use_with openssl)"
- "$(use_with postgres postgresql)"
- "$(use_with snmp net-snmp)"
- "$(use_with sqlite sqlite3)"
- "$(use_with ssh ssh2)"
- )
-
- econf ${econf_args[@]}
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
- fi
-}
-
-src_install() {
- local dirs=(
- /etc/zabbix
- /var/lib/zabbix
- /var/lib/zabbix/home
- /var/lib/zabbix/scripts
- /var/lib/zabbix/alertscripts
- /var/lib/zabbix/externalscripts
- /var/log/zabbix
- )
-
- for dir in "${dirs[@]}"; do
- keepdir "${dir}"
- done
-
- if use server; then
- insinto /etc/zabbix
- doins "${S}"/conf/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
-
- newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
-
- dosbin src/zabbix_server/zabbix_server
-
- insinto /usr/share/zabbix
- doins -r "${S}"/database/
-
- systemd_dounit "${FILESDIR}"/zabbix-server.service
- newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles
zabbix-server.conf
- fi
-
- if use proxy; then
- insinto /etc/zabbix
- doins "${S}"/conf/zabbix_proxy.conf
- fperms 0640 /etc/zabbix/zabbix_proxy.conf
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
-
- newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
-
- dosbin src/zabbix_proxy/zabbix_proxy
-
- insinto /usr/share/zabbix
- doins -r "${S}"/database/
-
- systemd_dounit "${FILESDIR}"/zabbix-proxy.service
- newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles
zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${S}"/conf/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
-
- newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
-
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
-
- systemd_dounit "${FILESDIR}"/zabbix-agentd.service
- newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles
zabbix-agentd.conf
- fi
- if use agent2; then
- insinto /etc/zabbix
- doins "${S}"/src/go/conf/zabbix_agent2.conf
- fperms 0640 /etc/zabbix/zabbix_agent2.conf
- fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
- keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
-
- newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
-
- dosbin src/go/bin/zabbix_agent2
-
- systemd_dounit "${FILESDIR}"/zabbix-agent2.service
- newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles
zabbix-agent2.conf
- fi
-
- fowners root:zabbix /etc/zabbix
- fowners zabbix:zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R ui/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-1.5.16.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-1.5.16.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-2.0.16.jar
- newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
- newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix"
- elog "if you have not already done so."
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir
changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- tmpfiles_process zabbix-server.conf
-
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n <nodeid>"
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- if use proxy; then
- tmpfiles_process zabbix-proxy.conf
- fi
-
- if use agent; then
- tmpfiles_process zabbix-agentd.conf
- fi
-
- if use agent2; then
- tmpfiles_process zabbix-agent2.conf
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-}
-
-pkg_prerm() {
- (use frontend || use server) && webapp_pkg_prerm
-}
diff --git a/net-analyzer/zabbix/zabbix-7.0.19.ebuild
b/net-analyzer/zabbix/zabbix-7.0.22.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-7.0.19.ebuild
rename to net-analyzer/zabbix/zabbix-7.0.22.ebuild
index a3bda12e419e..f34a62c18282 100644
--- a/net-analyzer/zabbix/zabbix-7.0.19.ebuild
+++ b/net-analyzer/zabbix/zabbix-7.0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# To create the go modules tarball:
