From 08331f8230de826358bdcb7df4690f36f69040e8 Mon Sep 17 00:00:00 2001 From: Matthew Marlowe Date: Wed, 25 Jun 2014 20:44:16 +0000 Subject: Upstream version bump with patch for Security bug 513814, Cleanup for prior security bug 509898 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 786037A7) --- net-analyzer/zabbix/ChangeLog | 11 +- .../zabbix/files/2.2/patches/zbx8151.patch | 53 +++ net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild | 394 -------------------- net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild | 395 +++++++++++++++++++++ net-analyzer/zabbix/zabbix-2.2.3.ebuild | 365 ------------------- net-analyzer/zabbix/zabbix-2.2.4.ebuild | 366 +++++++++++++++++++ 6 files changed, 824 insertions(+), 760 deletions(-) create mode 100644 net-analyzer/zabbix/files/2.2/patches/zbx8151.patch delete mode 100644 net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild create mode 100644 net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild delete mode 100644 net-analyzer/zabbix/zabbix-2.2.3.ebuild create mode 100644 net-analyzer/zabbix/zabbix-2.2.4.ebuild (limited to 'net-analyzer/zabbix') diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index e80de79d8a77..e6001dee1e96 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.162 2014/06/08 10:59:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.163 2014/06/25 20:44:16 mattm Exp $ + +*zabbix-2.0.12-r1 (25 Jun 2014) +*zabbix-2.2.4 (25 Jun 2014) + + 25 Jun 2014; Matthew Marlowe + +files/2.2/patches/zbx8151.patch, +zabbix-2.0.12-r1.ebuild, + +zabbix-2.2.4.ebuild, -zabbix-2.0.11_rc1-r1.ebuild, -zabbix-2.2.3.ebuild: + Upstream version bump with patch for Security bug 513814, Cleanup for prior + security bug 509898 08 Jun 2014; Agostino Sarubbo zabbix-2.0.12.ebuild: Stable for x86, wrt bug #509898 diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch new file mode 100644 index 000000000000..076e10ab75a4 --- /dev/null +++ b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch @@ -0,0 +1,53 @@ +Index: frontends/php/include/defines.inc.php +=================================================================== +--- frontends/php/include/defines.inc.php (revision 46596) ++++ frontends/php/include/defines.inc.php (revision 46655) +@@ -835,6 +835,14 @@ + + define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts'); + ++// XML import flags ++// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed ++// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml ++// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND ++// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name - ++// so this flag is not needed here. ++define('LIBXML_IMPORT_FLAGS', LIBXML_NONET); ++ + // API errors + define('ZBX_API_ERROR_INTERNAL', 111); + define('ZBX_API_ERROR_PARAMETERS', 100); +Index: frontends/php/include/classes/import/readers/CXmlImportReader.php +=================================================================== +--- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596) ++++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655) +@@ -32,7 +32,8 @@ + */ + public function read($string) { + libxml_use_internal_errors(true); +- $result = simplexml_load_string($string); ++ libxml_disable_entity_loader(true); ++ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS); + if (!$result) { + $errors = libxml_get_errors(); + libxml_clear_errors(); +Index: frontends/php/include/classes/import/CXmlImport18.php +=================================================================== +--- frontends/php/include/classes/import/CXmlImport18.php (revision 46596) ++++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655) +@@ -390,12 +390,13 @@ + return $array; + } + +- public static function import($file) { ++ public static function import($source) { + + libxml_use_internal_errors(true); ++ libxml_disable_entity_loader(true); + + $xml = new DOMDocument(); +- if (!$xml->loadXML($file)) { ++ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) { + $text = ''; + foreach (libxml_get_errors() as $error) { + switch ($error->level) { diff --git a/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild deleted file mode 100644 index 35a9735a3cd3..000000000000 --- a/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild +++ /dev/null @@ -1,394 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.11_rc1-r1.ebuild,v 1.3 2014/02/16 07:08:51 ago Exp $ - -EAPI="5" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." -HOMEPAGE="http://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="http://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 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-base-8.3.0 ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - jabber? ( dev-libs/iksemel ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( >=virtual/jdk-1.4 ) - odbc? ( - iodbc? ( dev-db/libiodbc ) - !iodbc? ( dev-db/unixODBC ) - )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( <=net-analyzer/fping-2.9 ) - server? ( <=net-analyzer/fping-2.9 - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - dev-java/json-simple - ) - frontend? ( - dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - 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() { - epatch "${FILESDIR}/2.0/patches/zbx282.patch" - 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 - eerror - eerror "Select exactly one database type out of these: ${dbtypes}" - eerror - die "No database type selected." - 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 - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - 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. Most minor version" - elog "zabbix updates do not require db changes. However, " - elog "you should read the release notes to be sure." - elog - elog "Have a look at /usr/share/zabbix for" - elog "database creation and upgrades." - elog - elog "Execute schema, images, and data sql files in that order." - elog - elog "For more info read the Zabbix manual at" - elog "http://www.zabbix.com/documentation.php" - elog - elog "New use flags: java, odbc, iodbc" - 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 - - chmod 0640 \ - "${ROOT}"/etc/zabbix/zabbix_* - - 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_configure() { - - local myconf - - if use odbc && use iodbc ; then - myconf="${myconf} --with-iodbc --without-unixodbc" - elif use odbc && ! use iodbc; then - myconf="${myconf} --with-unixodbc --without-iodbc" - else - myconf="${myconf} --without-unixodbc --without-iodbc" - fi - - econf \ - $myconf \ - $(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 jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - || die "econf failed" -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/1.6.6"/zabbix_server.conf \ - "${FILESDIR}/1.6.6"/zabbix_trapper.conf - doinitd \ - "${FILESDIR}/2.0"/init.d/zabbix-server - dosbin \ - src/zabbix_server/zabbix_server - dodir \ - /usr/share/zabbix - insinto /usr/share/zabbix - doins -r \ - database \ - upgrades - #remove unneeded files left over from wholesale copy (bug #433708) - rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am} - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_server.conf \ - /etc/zabbix/zabbix_trapper.conf - fperms 0640 \ - /etc/zabbix/zabbix_server.conf \ - /etc/zabbix/zabbix_trapper.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.0"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.0"/zabbix_proxy.conf - dodir \ - /usr/share/zabbix - insinto /usr/share/zabbix - doins -r \ - database \ - upgrades - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/1.6.6"/zabbix_agent.conf \ - "${FILESDIR}/1.6.6"/zabbix_agentd.conf - doinitd \ - "${FILESDIR}/2.0"/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 - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /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_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt - 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/org-json-2010-12-28.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 - -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} diff --git a/net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild new file mode 100644 index 000000000000..51a2260ac6ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild @@ -0,0 +1,395 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.12-r1.ebuild,v 1.1 2014/06/25 20:44:16 mattm Exp $ + +EAPI="5" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." +HOMEPAGE="http://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="http://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 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( >=dev-db/postgresql-base-8.3.0 ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + jabber? ( dev-libs/iksemel ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( >=virtual/jdk-1.4 ) + odbc? ( + iodbc? ( dev-db/libiodbc ) + !iodbc? ( dev-db/unixODBC ) + )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( <=net-analyzer/fping-2.9 ) + server? ( <=net-analyzer/fping-2.9 + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + dev-java/json-simple + ) + frontend? ( + dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + 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() { + epatch "${FILESDIR}/2.0/patches/zbx282.patch" + epatch "${FILESDIR}/2.2/patches/zbx8151.patch" + 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 + eerror + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "No database type selected." + 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 + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + 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. Most minor version" + elog "zabbix updates do not require db changes. However, " + elog "you should read the release notes to be sure." + elog + elog "Have a look at /usr/share/zabbix for" + elog "database creation and upgrades." + elog + elog "Execute schema, images, and data sql files in that order." + elog + elog "For more info read the Zabbix manual at" + elog "http://www.zabbix.com/documentation.php" + elog + elog "New use flags: java, odbc, iodbc" + 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 + + chmod 0640 \ + "${ROOT}"/etc/zabbix/zabbix_* + + 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_configure() { + + local myconf + + if use odbc && use iodbc ; then + myconf="${myconf} --with-iodbc --without-unixodbc" + elif use odbc && ! use iodbc; then + myconf="${myconf} --with-unixodbc --without-iodbc" + else + myconf="${myconf} --without-unixodbc --without-iodbc" + fi + + econf \ + $myconf \ + $(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 jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + || die "econf failed" +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_server.conf \ + "${FILESDIR}/1.6.6"/zabbix_trapper.conf + doinitd \ + "${FILESDIR}/2.0"/init.d/zabbix-server + dosbin \ + src/zabbix_server/zabbix_server + dodir \ + /usr/share/zabbix + insinto /usr/share/zabbix + doins -r \ + database \ + upgrades + #remove unneeded files left over from wholesale copy (bug #433708) + rm "${ED}"/usr/share/zabbix/{database,upgrades}/Makefile{,.in,.am} + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_server.conf \ + /etc/zabbix/zabbix_trapper.conf + fperms 0640 \ + /etc/zabbix/zabbix_server.conf \ + /etc/zabbix/zabbix_trapper.conf + fi + + if use proxy; then + doinitd \ + "${FILESDIR}/2.0"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/2.0"/zabbix_proxy.conf + dodir \ + /usr/share/zabbix + insinto /usr/share/zabbix + doins -r \ + database \ + upgrades + fi + + if use agent; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_agent.conf \ + "${FILESDIR}/1.6.6"/zabbix_agentd.conf + doinitd \ + "${FILESDIR}/2.0"/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 + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /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_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt + 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/org-json-2010-12-28.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 + +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} diff --git a/net-analyzer/zabbix/zabbix-2.2.3.ebuild b/net-analyzer/zabbix/zabbix-2.2.3.ebuild deleted file mode 100644 index 93e8207c4e85..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.3.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.3.ebuild,v 1.1 2014/05/14 05:58:48 mattm Exp $ - -EAPI="5" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp depend.php autotools 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/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="http://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 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" - -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-base-8.3.0 ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - jabber? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( >=virtual/jdk-1.4 ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( <=net-analyzer/fping-2.9 ) - server? ( <=net-analyzer/fping-2.9 - 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] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - 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 - eerror - eerror "Select exactly one database type out of these: ${dbtypes}" - eerror - die "No database type selected." - 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 - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - 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 - - chmod 0640 \ - "${ROOT}"/etc/zabbix/zabbix_* - - 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_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 jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" -} - -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_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt - 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/org-json-2010-12-28.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 - -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" - fi -} diff --git a/net-analyzer/zabbix/zabbix-2.2.4.ebuild b/net-analyzer/zabbix/zabbix-2.2.4.ebuild new file mode 100644 index 000000000000..941a24f1b788 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.2.4.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.4.ebuild,v 1.1 2014/06/25 20:44:16 mattm Exp $ + +EAPI="5" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp depend.php autotools 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/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="http://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 jabber ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" + +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-base-8.3.0 ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + jabber? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( >=virtual/jdk-1.4 ) + odbc? ( dev-db/unixODBC )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( <=net-analyzer/fping-2.9 ) + server? ( <=net-analyzer/fping-2.9 + 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] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + 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() { + epatch "${FILESDIR}/2.2/patches/zbx8151.patch" + 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 + eerror + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "No database type selected." + 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 + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + 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 + + chmod 0640 \ + "${ROOT}"/etc/zabbix/zabbix_* + + 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_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 jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + || die "econf failed" +} + +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_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt + 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/org-json-2010-12-28.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 + +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} -- cgit v1.2.3-65-gdbad