commit:     da9b462dbe24d729e71e164f7ab18b24e3df2508
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 17:44:05 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 17:44:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9b462d

net-analyzer/zabbix: bump to 6.2.2

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

 net-analyzer/zabbix/Manifest            |   2 +
 net-analyzer/zabbix/zabbix-6.2.2.ebuild | 411 ++++++++++++++++++++++++++++++++
 2 files changed, 413 insertions(+)

diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index be731de361d9..c45a55c5d9eb 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -5,3 +5,5 @@ DIST zabbix-6.0.7-go-deps.tar.xz 35327308 BLAKE2B 
eb95964650a58bd300218888e9207f
 DIST zabbix-6.0.7.tar.gz 34190093 BLAKE2B 
781edbeaf5452f8e54b6fe91b77ad9dfc8ffcf4716e97f39f5ff8160f084d551cdee9bc34d67141ebcfc5eb0cb074a03c55e0dce36d06c6d589ee021c1c6dba6
 SHA512 
36e8e26edd104cfdd2510dd201b8020a41d7af3006ad04d6659083ebcc14574b3360c01f70c86a1e008f719c1078512c891ac525ffe7480816973b515f0dcc8f
 DIST zabbix-6.2.1-go-deps.tar.xz 35335980 BLAKE2B 
07af6563a9349aa70bf5c258c949ebea520e191088e41e546e0f0cf139fd8f3d47d1d64c6135ed36851269fd0e5cd7b7e52d0d25ccd6fd1ed0108f60daf7cde0
 SHA512 
146a3a4dc2d49b4d1f48f2f3e38f1d123860d4854c5b4a696c07649141cf6de4b076751cb99582688518b060100a0b740357921177b5340ea4b9426480051360
 DIST zabbix-6.2.1.tar.gz 34776549 BLAKE2B 
4952f81936e999c03b8aa71cc370ddc7fcea7f3951bc403501c3617748ecd81a10c5bfe9f80ff55a2521e6b874c50463aa61151ea30ddd6a7b46b20b5e24b645
 SHA512 
cfdca2a34fecd31ff6f58257abc695e9aba3eaeefebd66f8653b5999e3b650e5ba94d036fc5b9d8e03a1cf532d5f76b1d36a3a9759831707d88ebbe37dc20fc5
+DIST zabbix-6.2.2-go-deps.tar.xz 35354668 BLAKE2B 
2fba7e9ee2c04f74d0fe041489136ac30e27ef5869799e0eef720baf0c1f3e4426fc43a8abbb5295b5dec7a5a3ddaf2399096858e47d2d594a23b726599994aa
 SHA512 
92d88ad0d398238cafc29a7d76b4105b8af690694a121aeb9068c5939231933ef9fb319287def02d6248dded6e6e4a6b77152be0bc3925327a4baa8974b1e76c
+DIST zabbix-6.2.2.tar.gz 34995538 BLAKE2B 
749e43f23e06f9ad84bea2bae82fc1b8a499df3b873d26fd4fbfefd28288a3f17c1f05207d143516787cb1417107dd8594c704ea79b1a3d745affc787e723ff9
 SHA512 
b9ea0fb8fbfba6ecba54ad3abb68b10a005098cbbdf7130c6f9321cabcfe60a3b3094214a84e1c9d18fc4a0c959cf238eea43b400af027b9f200fb99c088658a

diff --git a/net-analyzer/zabbix/zabbix-6.2.2.ebuild 
b/net-analyzer/zabbix/zabbix-6.2.2.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.2.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2022 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 zabbix-${PV}-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 )
+"
+
+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 +pcre2 +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+       ?? ( gnutls openssl )
+       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? (
+               !pcre2? ( dev-libs/libpcre )
+               pcre2? ( dev-libs/libpcre2:= )
+               net-analyzer/fping[suid]
+       )
+       server? (
+               app-admin/webapp-config
+               !pcre2? ( dev-libs/libpcre )
+               pcre2? ( 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] )
+               oracle? ( dev-lang/php[oci8-instant-client] )
+               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"
+)
+
+S=${WORKDIR}/${MY_P}
+
+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_configure() {
+       local econf_args=(
+               "$(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)"
+       )
+
+       if use pcre2; then
+               econf_args+=( --with-libpcre2 )
+       else
+               # If pcre2 is not enabled, then use the old pcre library.
+               econf_args+=( --with-libpcre )
+       fi
+
+       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.2.9.jar \
+                       src/zabbix_java/lib/logback-console.xml \
+                       src/zabbix_java/lib/logback-core-1.2.9.jar \
+                       src/zabbix_java/lib/logback.xml \
+                       src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+                       src/zabbix_java/lib/slf4j-api-1.7.32.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
+
+               if ! use pcre2; then
+                       ewarn "You are using zabbix with dev-libs/libpcre which 
is deprecated."
+                       ewarn "Consider switching to dev-libs/libpcre2 
(USE=pcre2) as soon as possible."
+                       ewarn "See 
https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support";
+               fi
+       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
+
+       if use server || use proxy ; then
+               # check for fping
+               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+               case "${fping_perms}" in
+                       4[157][157][157])
+                               ;;
+                       *)
+                               ewarn
+                               ewarn "If you want to use the checks 'icmpping' 
and 'icmppingsec',"
+                               ewarn "you have to make /usr/sbin/fping setuid 
root and executable"
+                               ewarn "by everyone. Run the following command 
to fix it:"
+                               ewarn
+                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+                               ewarn
+                               ewarn "Please be aware that this might impose a 
security risk,"
+                               ewarn "depending on the code quality of fping."
+                               ewarn
+                               ;;
+               esac
+       fi
+}
+
+pkg_prerm() {
+       (use frontend || use server) && webapp_pkg_prerm
+}

Reply via email to