diff options
author | Matthew Marlowe <mattm@gentoo.org> | 2012-04-24 23:17:53 +0000 |
---|---|---|
committer | Matthew Marlowe <mattm@gentoo.org> | 2012-04-24 23:17:53 +0000 |
commit | 06f4d47346fad84bda865164370b47ecfae42ad7 (patch) | |
tree | e29ab8c382feebdd1b590f446f6b33c8ec887136 | |
parent | Drop -mfpmath=387 hardcode for x86 systems -- this breaks cross-compiling as ... (diff) | |
download | historical-06f4d47346fad84bda865164370b47ecfae42ad7.tar.gz historical-06f4d47346fad84bda865164370b47ecfae42ad7.tar.bz2 historical-06f4d47346fad84bda865164370b47ecfae42ad7.zip |
Bump for Zabbix 1.8.12 and 2.0rc3.
Package-Manager: portage-2.1.10.56/cvs/Linux x86_64
-rw-r--r-- | net-analyzer/zabbix/ChangeLog | 9 | ||||
-rw-r--r-- | net-analyzer/zabbix/Manifest | 22 | ||||
-rw-r--r-- | net-analyzer/zabbix/zabbix-1.8.12.ebuild | 335 | ||||
-rw-r--r-- | net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild (renamed from net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild) | 2 |
4 files changed, 356 insertions, 12 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index 092aa106f880..538b7b91cacf 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,13 @@ # 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.85 2012/04/19 18:24:15 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.86 2012/04/24 23:17:53 mattm Exp $ + +*zabbix-2.0.0_rc3 (24 Apr 2012) +*zabbix-1.8.12 (24 Apr 2012) + + 24 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +zabbix-1.8.12.ebuild, + -zabbix-2.0.0_rc2.ebuild, +zabbix-2.0.0_rc3.ebuild: + Bumps for Zabbix 2.0rc3 and 1.8.12 *zabbix-1.8.11-r2 (19 Apr 2012) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index ad07a26b1d79..ff5a81160e13 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -27,23 +27,25 @@ 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 +DIST zabbix-1.8.12.tar.gz 4229589 RMD160 0adae9942d32d5d53396f457235414ad0bc40862 SHA1 fd388813e9b78c6357ad30d771d385ec6cd2476d SHA256 8ea52df75c5f5d31ede3c1807a679808bc257b587ddec1759b22dcc9da722fe7 +DIST zabbix-2.0.0rc3.tar.gz 11644687 RMD160 ffd6d667fb6f35d9e76607ecc67c29978ea1efa4 SHA1 4de7f6064517ad26e5aba349c2e9216f1c0f16f5 SHA256 f0209406b8ac5052ea7bc9808acc56b6bdcd3e6530cd68ab6b442b4eaa288ece 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-r2.ebuild 8597 RMD160 3e2472079da8217a667a0c7ef59c15328a031d08 SHA1 45283233a9859a41d45aa640f80fd88e7189afff SHA256 d3e1ea7092d330d13e0df2601a064a6698cc25357d312efc58d86e785041e4bc EBUILD zabbix-1.8.11.ebuild 8114 RMD160 2d80d2e73501096a5774c03968c6e086aef698aa SHA1 57770f513980bae90ce4c8f147f29549b8504eda SHA256 fb0c86e6369b249945df479e2c0feb78cb50d9672212de9e842c5ff64ad77956 -EBUILD zabbix-2.0.0_rc2.ebuild 9627 RMD160 1ec03fda46cf6dcf45dacfa4f5fc12e6d3e69489 SHA1 5d7c281cfe0f9032db9efa72a555f53aa5645895 SHA256 f52d5615b76c8c6c1f3f669807a1090c37de49f86717d114f8ec8be396c6621b -MISC ChangeLog 19231 RMD160 7c46740fafd83140122f14b9c54cad5967e41f2a SHA1 c3170121403e40ccfeb6f6c55fef6f696a78ee2b SHA256 31e22d7290438b386c5a89c231e731ff81cb5314411e5775ce39c45d4ef4582b +EBUILD zabbix-1.8.12.ebuild 8594 RMD160 88751738a23e425727a528b7aa25e2eead1e3fea SHA1 f4543e0347af77b27cc0c5766f92ad9ff2b089b4 SHA256 a391e2940db4cc01da5d96ee83eadba945a010aac457e54b172ccd73ea7a933f +EBUILD zabbix-2.0.0_rc3.ebuild 9627 RMD160 6ec9c1b61da9e4478af4dce4b58e50cc20d86b6f SHA1 ddc0923f07a9cf8fd9f076dacfc60e7854ef4e90 SHA256 eb21600322bdecc683aa3e9c2b456f5c0acd5c183dcb052f2a326701dcd0d4a7 +MISC ChangeLog 19458 RMD160 69f5b83e1b99f6e70ddc46299acf916b6023f3fe SHA1 8c1f2996507a2f9b418dcb21255d59d8a9dd4e26 SHA256 066e6ffb29c1bfd71daa45f968b025d9d356aa049770202cc24b47c94bbe7169 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJPkFhbAAoJEC1LWXx4YDenoYcH/0wsVdtz2+Sbpmd1TZqGhBdh -EQrncFXF1z0mQ1sofLbkfUkk+IP9ek4T8oNLezYDWmF/tbPxMGnaOhNUCS+l8diL -/DcSAU1qSs+V3s/GO8PgkTkW7A8YBs3K2X4OxV4zWUZrAsmgKRK5i+MdIwMFI4ve -L6dj4K2XCMuH0l3Rk7PvBgmKxIBw0Cohin6P4aLu+24siQn1n8sxK2GV1r0WMJje -mrRALxHUjUcQRNLJYCJ41L98+0JgU117l8PsQ35siJpRrxPKmdSncwd7YuHEnJHW -dyISBYGpVg9dV9/tQEspSF8uFYzKIC6l2kGJH0NXg5sBhW35UDgKyNNDLMDD+rk= -=ZlIx +iQEcBAEBAgAGBQJPlzSuAAoJEC1LWXx4YDenqXgH/iWxSDiElFj3tj/cCMqLfucs +wKLPsaP7ThX1B1uTs250odIRjmwOoVB2YuRrYXRG6pAP39N5qrWOL/d0Dgag2A1D +GcYLRLXDQ0AO6FtRuTJBHrAkfqRfkb6OOnFkLxStQVrjz6O6n6XJpG9z/a1evhhZ +pVzG6NowMwovMzi1TyH9p1rDu1jsPeFNsKXofKhBJAFdi3lcxpVrN+1X/ylQOlO3 +vCm26teFtkF+ZYplbeCUSjD+xOwWLkbGFgpqT2Opa6x54fxLWojBW7UMGZs5A91P +PYBP0Y3b5UHNBF+wLb+XsOysT6Ja69vZ142O6wHCXY3a0K9hIb0sW9GspPXSs18= +=eYa1 -----END PGP SIGNATURE----- diff --git a/net-analyzer/zabbix/zabbix-1.8.12.ebuild b/net-analyzer/zabbix/zabbix-1.8.12.ebuild new file mode 100644 index 000000000000..ebfbe2ed3816 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-1.8.12.ebuild @@ -0,0 +1,335 @@ +# 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-1.8.12.ebuild,v 1.1 2012/04/24 23:17:53 mattm Exp $ + +EAPI="2" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit eutils flag-o-matic webapp depend.php autotools + +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="~amd64 ~x86" +IUSE="agent 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 ) + 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 ) + 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 + +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 need to configure your database for Zabbix." + 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 <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 "Add these lines in the /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 "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)." + 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_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 +} diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild index b1722cada10e..505c9f312a1d 100644 --- a/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild +++ b/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild @@ -1,6 +1,6 @@ # 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.3 2012/04/19 18:24:15 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc3.ebuild,v 1.1 2012/04/24 23:17:53 mattm Exp $ EAPI="2" |