--- zabbix-2.2.5.ebuild 2016-05-19 11:17:08.431383517 +0200 +++ zabbix-2.2.13.ebuild 2016-05-19 11:32:11.674257305 +0200 @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" # needed to make webapp-config dep optional WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp autotools java-pkg-opt-2 user systemd toolchain-funcs +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="http://www.zabbix.com/" @@ -16,8 +16,12 @@ LICENSE="GPL-2" SLOT="0" WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" +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? ( @@ -38,72 +42,59 @@ odbc? ( dev-db/unixODBC )" RDEPEND="${COMMON_DEPEND} - proxy? ( <=net-analyzer/fping-2.9 ) - server? ( <=net-analyzer/fping-2.9 + proxy? ( net-analyzer/fping ) + server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api - dev-java/json-simple ) 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[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" -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api - java-pkg_jar-from json-simple -} - -src_prepare() { - eautoreconf -} - pkg_setup() { - if use server || use proxy ; then - local dbnum dbtypes="mysql oracle postgres sqlite" dbtype - declare -i dbnum=0 - for dbtype in ${dbtypes}; do - use ${dbtype} && let dbnum++ - done - if [ ${dbnum} -gt 1 ]; then - eerror - eerror "You can't use more than one database type in Zabbix." - eerror "Select exactly one database type out of these: ${dbtypes}" - eerror - die "Multiple database types selected." - elif [ ${dbnum} -lt 1 ]; then + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then eerror - eerror "Select exactly one database type out of these: ${dbtypes}" + 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 "No database type selected." + die "Environment variable ORACLE_HOME is not set" fi - 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 + 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 @@ -115,98 +106,18 @@ enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix } -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 " - 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 - - elog "Feel free to download or contribute gentoo specific zabbix templates" - elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)." - - # repeat fowners/fperms functionality from src_install() - # here to catch wrong permissions on existing files in - # the live filesystem (yeah, that sucks). - chown -R zabbix:zabbix \ - "${ROOT}"/etc/zabbix \ - "${ROOT}"/var/lib/zabbix \ - "${ROOT}"/var/lib/zabbix/home \ - "${ROOT}"/var/lib/zabbix/scripts \ - "${ROOT}"/var/log/zabbix - chmod 0750 \ - "${ROOT}"/etc/zabbix \ - "${ROOT}"/var/lib/zabbix \ - "${ROOT}"/var/lib/zabbix/home \ - "${ROOT}"/var/lib/zabbix/scripts \ - "${ROOT}"/var/log/zabbix +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die - chmod 0640 \ - "${ROOT}"/etc/zabbix/zabbix_* + java-pkg_jar-from slf4j-api +} - 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 +src_prepare() { + default } src_configure() { - econf \ $(use_enable server) \ $(use_enable proxy) \ @@ -229,6 +140,12 @@ || 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 \ @@ -345,7 +262,7 @@ 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/org-json-2010-12-28.jar \ + 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 \ @@ -354,11 +271,72 @@ src/zabbix_java/shutdown.sh fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} fi - } -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" +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 " + 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 }