diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 712ccd6..97a9e04 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1 +1 @@ -DIST zabbix-4.4.3.tar.gz 20306084 BLAKE2B 23d428d3fdcc9be49bb82a5eed6c9b94eedd4a3b5020bdcfd6be6e768c355a4d4b2413d12fd94529b7c8e8219b4f23b6e3031dba85d4fc86bf63003070e72dd8 SHA512 51f65e2196812e121431db6c8efbc8e48f9920455b60a6f54bb1ce1f20f9e1db5a2b78f369ebc5113f2e1faef61f01d1aa7f99e413e24eff07cd497f4a53cd90 +DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114 diff --git a/net-analyzer/zabbix/zabbix-4.4.3.ebuild b/net-analyzer/zabbix/zabbix-4.4.5.ebuild similarity index 94% rename from net-analyzer/zabbix/zabbix-4.4.3.ebuild rename to net-analyzer/zabbix/zabbix-4.4.5.ebuild index 63cd706..622bec7 100644 --- a/net-analyzer/zabbix/zabbix-4.4.3.ebuild +++ b/net-analyzer/zabbix/zabbix-4.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -40,6 +40,7 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) odbc? ( dev-db/unixODBC ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) + server? ( dev-libs/libevent ) ssl? ( dev-libs/openssl:=[-bindist] ) agent2? ( dev-lang/go )" @@ -47,8 +48,7 @@ RDEPEND="${COMMON_DEPEND} proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config - dev-libs/libpcre - dev-libs/libevent ) + dev-libs/libpcre ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api @@ -70,12 +70,12 @@ DEPEND="${COMMON_DEPEND} =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) + mysql? ( >=virtual/mysql-5.0.3[static] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2[static-libs] ) + ssh? ( net-libs/libssh2 ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig" @@ -142,14 +142,13 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { # export GOPATH="${WORKDIR}/${P}" if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } @@ -190,6 +189,8 @@ src_install() { dosbin src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix doins "${FILESDIR}/3.0"/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf dodir /usr/share/zabbix /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ systemd_dounit "${FILESDIR}/zabbix-proxy.service" @@ -206,6 +207,7 @@ src_install() { dobin \ src/zabbix_sender/zabbix_sender \ src/zabbix_get/zabbix_get + fperms 0640 /etc/zabbix/zabbix_agentd.conf systemd_dounit "${FILESDIR}/zabbix-agentd.service" systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf fi @@ -281,7 +283,8 @@ pkg_postinst() { ewarn "custom alert scripts." ewarn ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." ewarn ewarn "To change the homedir use:" ewarn " usermod -d /var/lib/zabbix/home zabbix"