From b9838060d48ee7ab976b3d77460f1651469ea82f Mon Sep 17 00:00:00 2001 From: Matthew Marlowe Date: Mon, 16 Apr 2012 19:12:47 +0000 Subject: Initial zabbix 2.0rc support, bug 410183 and bug 412247 Package-Manager: portage-2.1.10.56/cvs/Linux x86_64 --- net-analyzer/zabbix/ChangeLog | 12 +- net-analyzer/zabbix/Manifest | 20 +- net-analyzer/zabbix/metadata.xml | 1 + net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild | 367 ++++++++++++++++++++++++++++ 4 files changed, 390 insertions(+), 10 deletions(-) create mode 100644 net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index 1ac69a111acf..2307cda88031 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.82 2012/04/09 05:51:43 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.83 2012/04/16 19:12:47 mattm Exp $ + + 16 Apr 2012; Matthew Marlowe +zabbix-2.0.0_rc2.ebuild, + metadata.xml: + Initial work towards resolving bug 412247 and bug 410183 + +*zabbix-2.0.0_rc2 (16 Apr 2012) + + 16 Apr 2012; Matthew Marlowe +zabbix-2.0.0_rc2.ebuild, + metadata.xml: + Testing initial support for Zabbix 2.0 release candidates 09 Apr 2012; Matthew Marlowe +zabbix-1.8.11-r1.ebuild, metadata.xml: diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 9b0b8bca67ad..f669de4327ee 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -27,20 +27,22 @@ AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fe AUX zabbix-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 DIST zabbix-1.8.10.tar.gz 4217417 RMD160 96e776956d7055f99458314dbb931be5d1f9a973 SHA1 3d36413b9bd04da66775e9255243242d205a7e9c SHA256 d965d23f2ce8c7ddee7a1532863a208fae28958e3fc0871e0229ffa06f88a54b DIST zabbix-1.8.11.tar.gz 4224738 RMD160 d2e8749a43b0846a7bc93a21c6546dad0d66b678 SHA1 2efb94e0b57f1ddbb38ef3f8da225d88effb0689 SHA256 c45819b97082799bb253e4c6a3937affd07a2cd2744d860d657107aa4a3e772b +DIST zabbix-2.0.0rc2.tar.gz 12255453 RMD160 366651b9fec6da043d36db9bf6c6100bf9181a87 SHA1 31a599756f219b1ef2fc323ba0a7cfbb3b42e2a4 SHA256 926a13500d53f4f1eaecaa1b5837e404a726f667ed23f0fdd710b7511abe10a7 EBUILD zabbix-1.8.10-r1.ebuild 8161 RMD160 b62ec935694c559d4fd1a02c270e1957e6f027b7 SHA1 90e518d4be861758870103553184e4bb6c6f1ec4 SHA256 79a8f426499fb9e0d131e7ec78d4f2da56ea3fc22a45c330e23cf568c18148d5 EBUILD zabbix-1.8.10-r2.ebuild 8167 RMD160 43e67575801ed253ac3858c1ae066acfedbb8aa8 SHA1 96525b3b9b0fa9c44877480f47e21453eb95a929 SHA256 facc46552511754d96281c502988cf147708fb7cb1ad66f9d37f86bc8792784c EBUILD zabbix-1.8.11-r1.ebuild 8506 RMD160 0d717f3add5a2f73287b63334042cce627e794a6 SHA1 0ec2bbcee8a2f703fc33eefe2d4d33cbd0f1c508 SHA256 0300d0ee707a7a50f9b027a4b9f3bab81c695b2b767759bec834bb5cbc628ce8 EBUILD zabbix-1.8.11.ebuild 8114 RMD160 2d80d2e73501096a5774c03968c6e086aef698aa SHA1 57770f513980bae90ce4c8f147f29549b8504eda SHA256 fb0c86e6369b249945df479e2c0feb78cb50d9672212de9e842c5ff64ad77956 -MISC ChangeLog 18492 RMD160 43a72734dc27e201af18af3c191df3d2006adba0 SHA1 6ae445246381123ca16b1d7ace38cba4c008430a SHA256 1f5ef11271750e718f2a0c779c557ea58d19791019c18200b5792f4c67a69a0b -MISC metadata.xml 1124 RMD160 2a35a1a699b77bee194104b41f00ed0fa012c73f SHA1 4a9412e13311be49d508547cd8dabd21e9d9739f SHA256 1b571c8c32c799251116c7ece845e97afd48a4bfa99b01410a580e83175aa521 +EBUILD zabbix-2.0.0_rc2.ebuild 9532 RMD160 da3263a21312267fad9152e6e54c6cf629440a9d SHA1 9b9c434215b094347cdc51ef552a1a7f71247094 SHA256 1e2b86130e658778eb58ed47fad66a440fcb7992a565b622d1a280397da7e2b0 +MISC ChangeLog 18830 RMD160 2d9200123a54573bcf5cdeb185370c0e63285059 SHA1 2e94a5bbf0c085383cc586e80f9a31dc87856546 SHA256 9f173f8aec38cf72d4682650e8765e2e6d6348a81117d0e6e71fcf87005ad666 +MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJPgnj8AAoJEC1LWXx4YDenaqIH/154Rb6PI0fYpUP29nbY56c2 -MuMDNmVkwOaGkmZ9r56B+3rQPSOxSXvMxTC/bj8m4bCHdnEcqBxUvRV8AJdpfP5u -vt7ijDLhMqQwnLzXxFbC7u5MPoXxH2FixSU1XQRw/b0l5Eauwd7HDMDjRYfeu3Q7 -o6lJAXu6yFn1OlxaG5qpKH2I8+uV00MjGEaAzIlJ9D28B//Hzhj7eJs/qyRfPzk1 -4SY6Jhwpw8OgTQ8dTIugtQuG/ksAW2N+xeQfTUk7INP0Cb1g+jb+HtugrfRJEulT -fSWp4WjHJvQOWPjYxzeKkCxE4u5VvOsA4eTrz2uvx2XX0+26wffwjeTRtoxCRTM= -=s87A +iQEcBAEBAgAGBQJPjG89AAoJEC1LWXx4YDenMAgH/1d6d+auLVOD1uZ7BqOjNEVR +VXKtIu1vujHBlWjClNCbTf0pgG9lMtXwxU8aJZNR65q7T3P6N2NFePFyw8VcPQq8 +97k1RtMbfoyisQotUuyhfu5XMyAzzK0WArb/rrtXaupsr9Aex96u22zrEC68dSta +/AV2XbejNOH+NtMxVk/HtMDtfWW9qqzc5ID6zfGvOX3CzHBbPdEhBk/k94ZlZihi +W3w1XbNq+Dv8xRieIJFn05hKNKtqR5yfrvNiaRLHGAV43Bwz7655EyCGJvd3Uz6+ +i5TghC9UdVzWKstoRhMK2OLZW+uiRNzvdoGSvLOJhIDeEysCmQIw/7X7jyd8pGg= +=32Dg -----END PGP SIGNATURE----- diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml index 629f28a58fff..17fe0fb0b461 100644 --- a/net-analyzer/zabbix/metadata.xml +++ b/net-analyzer/zabbix/metadata.xml @@ -21,5 +21,6 @@ configure different types of notifications for pre-defined events. Enable Database Monitor and use UnixODBC Library by default Use iodbc rather than unixodbc for ODBC functions Build statically linked binaries + Enable Zabbix Java JMX Management Gateway diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild new file mode 100644 index 000000000000..cf6fef4ac138 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild @@ -0,0 +1,367 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild,v 1.1 2012/04/16 19:12:47 mattm Exp $ + +EAPI="2" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit eutils flag-o-matic webapp depend.php autotools java-pkg-opt-2 + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." +HOMEPAGE="http://www.zabbix.com/" +MY_P=${P/_/} +SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="" +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 ) + sqlite? ( =dev-db/sqlite-3* ) + postgres? ( dev-db/postgresql-base ) + oracle? ( dev-db/oracle-instantclient-basic ) + 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 ) + 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[bcmath,ctype,sockets,gd,truetype,xml,session] + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +use frontend && need_php_httpd + +S=${WORKDIR}/${MY_P} + +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. 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/database for" + elog "database creation and upgrades." + elog + elog "For more info read the Zabbix manual at" + elog "http://www.zabbix.com/documentation.php" + 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 + elog "Zabbix will be officially supporting database upgrades from" + elog "2.0.0rc3 to the final 2.0.0 release when it is available." + elog + elog "At some point, there should be some support for upgrading from 1.8.x" + elog "to a 2.0.x release." + elog + elog "Upgrading from all previous 1.9.x or 2.0rc releases is not unsupported." + elog + elog "Note that this is the first gentoo ebuild for 2.0.x and likely" + elog "will need further tuning with bumps/revisions as bugs are closed." + elog + elog "The java use flag is new to 2.0." + elog + + # 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 \ + "${ROOT}"/var/run/zabbix + chmod 0750 \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix \ + "${ROOT}"/var/run/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 + ebeep 3 + epause 5 + ;; + 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 pgsql) \ + $(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 \ + /var/run/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/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}/1.6.6"/init.d/zabbix-server + dosbin \ + src/zabbix_server/zabbix_server + dodir \ + /usr/share/zabbix/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + create + 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}/1.6.6"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_proxy.conf + dodir \ + /usr/share/zabbix/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + create + 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}/1.6.6"/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 \ + /var/run/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + dodoc README INSTALL NEWS ChangeLog + + 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 +} -- cgit v1.2.3-65-gdbad