net-analyzer/zabbix: Bump, remove old
authorPatrick Lauer <patrick@gentoo.org>
Sun, 27 Oct 2019 12:35:21 +0000 (12:35 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Sun, 27 Oct 2019 13:03:29 +0000 (13:03 +0000)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Patrick Lauer <patrick@gentoo.org>
net-analyzer/zabbix/Manifest
net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild [deleted file]
net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild [deleted file]
net-analyzer/zabbix/zabbix-3.0.28.ebuild [moved from net-analyzer/zabbix/zabbix-3.0.26.ebuild with 99% similarity]
net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild [deleted file]
net-analyzer/zabbix/zabbix-3.4.15.ebuild
net-analyzer/zabbix/zabbix-4.0.13.ebuild [moved from net-analyzer/zabbix/zabbix-4.0.6.ebuild with 99% similarity]
net-analyzer/zabbix/zabbix-4.0.9.ebuild [deleted file]
net-analyzer/zabbix/zabbix-4.2.3.ebuild [deleted file]
net-analyzer/zabbix/zabbix-4.2.7.ebuild [moved from net-analyzer/zabbix/zabbix-4.0.7.ebuild with 99% similarity]

index 8ad8b16abba86fb2ea91407d4e6152988e942dd7..8ca2cdf08885559b1b141250df505dff75a5fc21 100644 (file)
@@ -2,9 +2,12 @@ DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1f
 DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
 DIST zabbix-2.2.23.tar.gz 15504361 BLAKE2B c0eec293a92564607ed56c570aca30385481cf028fdee2bb51fbb29b40d7a1908a6065a6ee21c019ed6fb9eee294bc8fb58414669ae8e16e50f614a0650e2dbd SHA512 178e193f83dbaaa8aa0a0b87dd621acf7aa24e0d84d0010532b419139ed02e3cf892e4e772362bb855efb5966a64b9da8d3512eb91e759835039dc8c3529ea56
 DIST zabbix-3.0.26.tar.gz 14724426 BLAKE2B d887f0dd77cf051e2b6ae16221c02c20aa3a7b8bee07eaff5a0837eb25962a4d0b42a9adace4d68d5e141fcd89a0896e3e2f64b6af5e28b2e63109a89791ced3 SHA512 de3ebee12a4be3b81d64fd0ce718866d55c9696da97f54c546c882f0e70656066c825c9383caf80fdf5ea6a6ac4801cb8ae88c1a83d9be051935111a72e31917
+DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46
 DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
 DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
+DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
 DIST zabbix-4.0.6.tar.gz 17162202 BLAKE2B 8f03830d5493719cbabd770527dfc99e1bd2d80a3eaeb691e07cd7d8bfe587317ee045ed13a297494539d3cc2e3a26bafe29cd6eb6126c7fe74ee5de44e98b39 SHA512 43b7ccadfaebc34098a827ef7e27c2c637d4bb74db4d06cdaee7650171b7b5e14787a473a66b638a252c1342e841b546e089bd762de703e99e0a34b0549393ca
 DIST zabbix-4.0.7.tar.gz 17175571 BLAKE2B 3173881e093c58175e014d55c74d09656dbb6e99321f808a3ce6fe61aef56325aa94c4a3ff0b1edd2872734cc970052c63e5db377f8e8d605bf25f2eb8505802 SHA512 67373383ef961426901d8c27e1e51c902d8580b9af1877d4012c934f0ee52c5cf85e3f81fd16b244cd9c8e869cf13dbdd7597d8e2591356efc61570b354961f8
 DIST zabbix-4.0.9.tar.gz 17118478 BLAKE2B 0b3761085c9fac577061ca3a0e5839c3d33f13802ff4e752c575f4428339dfbc7e02e5ae8abbf7870a0286c45777c670aa74cd93b2cdbf9cf62961e4723aa0ae SHA512 4e04d80490f43d2e7833a4e11dbc7ce0ed70dc1f43653eeff923f5bfa16bbeedf37597599d68e0de3194820501d896d785a20d6ae0dce9328c458fd711a6a7bf
 DIST zabbix-4.2.3.tar.gz 18241315 BLAKE2B 38f9e61ccfe68de553e115e35466430b9f8b4211ca72b3c0265a9c9e5494575d8b026cda11cb7ef10644df35b8f168b7e5ca72ace8a412445008299c6c513877 SHA512 2e7d7372d5ce84798743d3c10fea0230aac470b0d9936a722687eefbe818b51e16f5dc64040b8b1b1189f64e8785ceca108914534efecd152473d213b15f7e07
+DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
index 6449f4cd9d509a286ac422646ec11f621420d21d..5af1a7ad360f5158115514b80247e08841043d3a 100644 (file)
@@ -70,7 +70,7 @@ DEPEND="${COMMON_DEPEND}
        postgres? ( dev-db/postgresql:*[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"
diff --git a/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.21-r1.ebuild
deleted file mode 100644 (file)
index 5cf0125..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-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://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               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] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-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
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/2.2"/zabbix_server.conf
-               doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd \
-                       "${FILESDIR}/2.2"/init.d/zabbix-proxy
-               dosbin \
-                       src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/2.2"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/2.2"/zabbix_agent.conf \
-                       "${FILESDIR}/2.2"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-               dosbin \
-                       src/zabbix_agent/zabbix_agent \
-                       src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/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_agent.conf \
-               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 frontends/php/* "${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-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       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 (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"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               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
-
-       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
-}
diff --git a/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.23-r1.ebuild
deleted file mode 100644 (file)
index 5cf0125..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-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://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               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] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-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
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/2.2"/zabbix_server.conf
-               doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd \
-                       "${FILESDIR}/2.2"/init.d/zabbix-proxy
-               dosbin \
-                       src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/2.2"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/2.2"/zabbix_agent.conf \
-                       "${FILESDIR}/2.2"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
-               dosbin \
-                       src/zabbix_agent/zabbix_agent \
-                       src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/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_agent.conf \
-               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 frontends/php/* "${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-0.9.27.jar \
-               src/zabbix_java/lib/logback-console.xml \
-               src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar
-          exeinto /${ZABBIXJAVA_BASE}/
-          doexe \
-               src/zabbix_java/settings.sh \
-               src/zabbix_java/startup.sh \
-               src/zabbix_java/shutdown.sh
-          fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-       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 (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"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               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
-
-       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
-}
similarity index 99%
rename from net-analyzer/zabbix/zabbix-3.0.26.ebuild
rename to net-analyzer/zabbix/zabbix-3.0.28.ebuild
index 4b96b6154b167c851df94d25cfce20d9a1a73001..44d389d4f4ec9aa9b5670185fd483be9abca12f3 100644 (file)
@@ -71,7 +71,7 @@ DEPEND="${COMMON_DEPEND}
        postgres? ( dev-db/postgresql:*[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"
diff --git a/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild b/net-analyzer/zabbix/zabbix-3.2.11-r1.ebuild
deleted file mode 100644 (file)
index 3990295..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-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://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( dev-db/postgresql:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               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] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
-       sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
-       postgres? ( dev-db/postgresql:*[static-libs] )
-       libxml2? ( dev-libs/libxml2[static-libs] )
-       curl? ( net-misc/curl[static-libs] )
-       ssh? ( net-libs/libssh2[static-libs] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-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
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       default
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/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 frontends/php/* "${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-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/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 (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"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               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
-
-       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
-}
index dd57544e3c45aa121c619e78c361cd87ba6a960e..7a28b152327cb43792a6591a96a077faffb37b03 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -72,7 +72,7 @@ DEPEND="${COMMON_DEPEND}
        postgres? ( dev-db/postgresql:*[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"
similarity index 99%
rename from net-analyzer/zabbix/zabbix-4.0.6.ebuild
rename to net-analyzer/zabbix/zabbix-4.0.13.ebuild
index cab89e4b3b1eb7d40da5a559ea1f79259beb1f23..3aea381b56fee522039493fc9edd9e64032d9402 100644 (file)
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
        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"
diff --git a/net-analyzer/zabbix/zabbix-4.0.9.ebuild b/net-analyzer/zabbix/zabbix-4.0.9.ebuild
deleted file mode 100644 (file)
index cab89e4..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-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://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( >=dev-db/postgresql-8.1:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       server? ( sys-libs/zlib )
-       proxy?  ( sys-libs/zlib )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libpcre
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               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] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       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] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-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
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-       eapply_user
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/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 frontends/php/* "${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-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/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 (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"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               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
-
-       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
-}
diff --git a/net-analyzer/zabbix/zabbix-4.2.3.ebuild b/net-analyzer/zabbix/zabbix-4.2.3.ebuild
deleted file mode 100644 (file)
index cab89e4..0000000
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-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://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
-       proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
-       server? ( ^^ ( mysql oracle postgres odbc ) )
-       static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( >=virtual/mysql-5.0.3 )
-       sqlite? ( >=dev-db/sqlite-3.3.5 )
-       postgres? ( >=dev-db/postgresql-8.1:* )
-       oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
-       xmpp? ( dev-libs/iksemel )
-       libxml2? ( dev-libs/libxml2 )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )
-       ssh? ( net-libs/libssh2 )
-       java? ( virtual/jdk:* )
-       odbc? ( dev-db/unixODBC )
-       server? ( sys-libs/zlib )
-       proxy?  ( sys-libs/zlib )
-       ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
-       proxy? ( net-analyzer/fping[suid] )
-       server? ( net-analyzer/fping[suid]
-               app-admin/webapp-config
-               dev-libs/libpcre
-               dev-libs/libevent )
-       java?   (
-               >=virtual/jre-1.4
-               dev-java/slf4j-api
-       )
-       frontend? (
-               >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
-               || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
-               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] )
-               media-libs/gd[png]
-               app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-       static? (
-               ldap? (
-                       net-nds/openldap[static-libs]
-                       =dev-libs/cyrus-sasl-2*[static-libs]
-                       net-libs/gnutls[static-libs]
-               )
-       mysql? ( >=virtual/mysql-5.0.3[static-libs] )
-       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] )
-       odbc? ( dev-db/unixODBC[static-libs] )
-       )
-       virtual/pkgconfig"
-
-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
-               if has_version 'dev-db/oracle-instantclient-basic'; then
-                       ewarn
-                       ewarn "Please ensure you have a full install of the Oracle client."
-                       ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                       ewarn
-               fi
-       fi
-
-       if use frontend; then
-               webapp_pkg_setup
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
-       cd "${S}/src/zabbix_java/lib"
-       rm -v *.jar || die
-
-       java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
-       eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
-       eapply_user
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_enable ipv6) \
-               $(use_enable static) \
-               $(use_enable java) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres postgresql) \
-               $(use_with oracle) \
-               $(use_with sqlite sqlite3) \
-               $(use_with xmpp jabber) \
-               $(use_with curl libcurl) \
-               $(use_with openipmi openipmi) \
-               $(use_with ssh ssh2) \
-               $(use_with libxml2) \
-               $(use_with odbc unixodbc) \
-               $(use_with ssl openssl) \
-               || die "econf failed"
-}
-
-src_compile() {
-       if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-               emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
-       fi
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/lib/zabbix/alertscripts \
-               /var/lib/zabbix/externalscripts \
-               /var/log/zabbix
-
-       if use server; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_server.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
-               dosbin src/zabbix_server/zabbix_server
-               fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
-               fperms 0640 /etc/zabbix/zabbix_server.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-server.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
-       fi
-
-       if use proxy; then
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
-               dosbin src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_proxy.conf
-               dodir /usr/share/zabbix
-               /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
-               systemd_dounit "${FILESDIR}/zabbix-proxy.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
-       fi
-
-       if use agent; then
-               insinto /etc/zabbix
-               doins "${FILESDIR}/3.0"/zabbix_agentd.conf
-               doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
-               dosbin src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 /etc/zabbix/zabbix_agentd.conf
-               systemd_dounit "${FILESDIR}/zabbix-agentd.service"
-               systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/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 frontends/php/* "${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-0.9.27.jar \
-                       src/zabbix_java/lib/logback-console.xml \
-                       src/zabbix_java/lib/logback-core-0.9.27.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.6.1.jar
-               fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-               doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
-               doconfd "${FILESDIR}"/3.0/conf.d/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 (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"
-                       ewarn
-               fi
-       fi
-
-       if use server; then
-               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
-
-       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
-}
similarity index 99%
rename from net-analyzer/zabbix/zabbix-4.0.7.ebuild
rename to net-analyzer/zabbix/zabbix-4.2.7.ebuild
index cab89e4b3b1eb7d40da5a559ea1f79259beb1f23..3aea381b56fee522039493fc9edd9e64032d9402 100644 (file)
@@ -75,7 +75,7 @@ DEPEND="${COMMON_DEPEND}
        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"