commit:     fed48c66a98ec56458dc29a7467dc9bd22c77c47
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 17:59:15 2025 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 17:59:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed48c66

net-analyzer/zabbix: bump to 6.0.39

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-analyzer/zabbix/Manifest             |   2 +
 net-analyzer/zabbix/zabbix-6.0.39.ebuild | 389 +++++++++++++++++++++++++++++++
 2 files changed, 391 insertions(+)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 4935fd2863ba..05bad590d2cd 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -6,6 +6,8 @@ DIST zabbix-6.0.37-go-deps.tar.xz 31334504 BLAKE2B 
3060bba678bcf2cc926ecc992b89c
 DIST zabbix-6.0.37.tar.gz 40479472 BLAKE2B 
6bf65efe59963294699d8fc6b6456167ae035c075f057c6ca85c612cc41f3f812b14189ed7e03ab2446e751720f8908f8e098fc0fd7335f95251b221b66b674a
 SHA512 
c7f638bc391cc4afa70d3322da6f0889ac846911559b544d18d61b2c1a5277a7c8cf4e86e5a63a8b6f5d94ac69a0cf11739cc2a22e251ed8ba76ee0edd8b151d
 DIST zabbix-6.0.38-go-deps.tar.xz 31357300 BLAKE2B 
e80dcfebb684ad36b1867e19f9bd228e3362a3236a32627503898b5d2238afc851dc41c0074559dec4d101e237e9b6aa3bd59d03149760d2f7273b6cf70e6196
 SHA512 
7d290b173e679390b1f239eb5688686be5d347fbb9cc4aefecc13d2f15ba4a02d629b3d20dc00026ec2a91be610eb503b3e53deffd7fcfe7adab4bc238316c3f
 DIST zabbix-6.0.38.tar.gz 40754933 BLAKE2B 
071f2c355d6c9703260592c1dd9cfc125edbb01dfb2e3a39e512d579ec217877f682c460791dfd3957b9fa9e212e24b91330722b0afcd5c540cb6bfdf9b12c6b
 SHA512 
c013c6cf7e10259b9ea500495546522cee7aeb8df63f40efa6cf2bbce3fa4bf3594a8cf83852f04dbf0a53d573a990fc2df87a0010d4c63f7054616e5158d5f4
+DIST zabbix-6.0.39-go-deps.tar.xz 31696792 BLAKE2B 
c8aa135f04bed5a4167dd07e06a6b458eca66839d4fcfab024811c1312b583509f7259612c03b1745eefb65cd7ee7e9405af510056c1ca96efbef98548ea623d
 SHA512 
39fb3fed09138deb84d25cf17eecf5b0826526ef4080350060388e67b0aed7401d4a72dad020af4117d4bfa5e28f91549701b74d5a0cd94c7659a81f4d5d7167
+DIST zabbix-6.0.39.tar.gz 41030406 BLAKE2B 
375313d121e1c00c04d42a04693d39c900fd005caa67d3e41dc8b93486d8f6d271473c7d340444dba9b0a80c94b9f45f94e5506fe8d0af2f1ac8956f1f750a5b
 SHA512 
046494cd24880d83c7a174482f1c1a29b5bf0cd6b39d1a0909ca628faf9d2a134a7fed728c8776dce877d4dcaf474ff20683ce95e8884b830d99b32e2962b7c1
 DIST zabbix-6.4.20-go-deps.tar.xz 34456784 BLAKE2B 
d703a985d578580af16810dd7c030976e15fb7695311581069a6b6f5050d30848bb0abdae987ca73e9d283d56b8fe7265e418ff973072eaa7f9297f576122939
 SHA512 
710d7ddc479f9b1c59af6c9345d0ca0d6dc1d81c3ae7c872c81d09a37cf394abd67e9c48650d913d661497728ad405f7c415667f34185c0f1bd1115e0779b2f2
 DIST zabbix-6.4.20.tar.gz 47050234 BLAKE2B 
06e523d51e49625285bd6cfbed4ba790218f69eeddbb57e6b635ff7ed6f710dce5b3c9fd5b9333bfb1e582187b5a6c3b3400763eb129fe6c03f52b55c4521499
 SHA512 
cde89b8bf4b5e6c39a8a7e661e7c229da9f189bf6ffd9960505daf3d63627d7bc12d420a9262244d789b30ceda34b7668e49ec9d52b8eea7144b9897871d1ae0
 DIST zabbix-6.4.21-go-deps.tar.xz 34149168 BLAKE2B 
4951c347027f1b251befa0f5119547192c769cee56194789732cdaf30de8ec6325d4f1e5ad914008b14b461e2fce585925fcf8c217ac2f23c4233de472e19de0
 SHA512 
cf7aab100c64a954dbbd4b733abdbe52051e75546867a5d5f5d623b1f34d39c87477f703622a849f85e113dd9c87ecb794cddfb23772ef3d7c3d7b223f7386e1

diff --git a/net-analyzer/zabbix/zabbix-6.0.39.ebuild 
b/net-analyzer/zabbix/zabbix-6.0.39.ebuild
new file mode 100644
index 000000000000..cfbde6d11dca
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.39.ebuild
@@ -0,0 +1,389 @@
+# 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 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="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc 
openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+       ?? ( gnutls openssl )
+       agent2? ( !gnutls )
+       proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+       server? ( ^^ ( mysql oracle postgres ) !sqlite )
+       static? ( !oracle !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(-)] )
+       oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+       postgres? ( dev-db/postgresql:* )
+       proxy?  (
+               dev-libs/libevent:=
+               sys-libs/zlib
+       )
+       server? (
+               dev-libs/libevent:=
+               sys-libs/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,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+               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.0.3-system.sw.packages.patch"
+)
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+       if use oracle; then
+               if [ -z "${ORACLE_HOME}" ]; then
+                       eerror
+                       eerror "The environment variable ORACLE_HOME must be 
set"
+                       eerror "and point to the correct location."
+                       eerror "It looks like you don't have Oracle installed."
+                       eerror
+                       die "Environment variable ORACLE_HOME is not set"
+               fi
+       fi
+
+       if use frontend; then
+               webapp_pkg_setup
+       fi
+
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       default
+}
+
+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 oracle)"
+               "$(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 oracle; then
+               ewarn
+               ewarn "Support for Oracle database has been dropped from PHP"
+               ewarn "so to make the web frontend work, you need to install"
+               ewarn "PECL extension for Oracle database."
+               ewarn "For details see https://bugs.gentoo.org/928386";
+       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
+}

Reply via email to