Bump, fixes #312875 #313403. As-needed patch fails for now.
authorPatrick Lauer <patrick@gentoo.org>
Wed, 7 Apr 2010 13:09:01 +0000 (13:09 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Wed, 7 Apr 2010 13:09:01 +0000 (13:09 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-analyzer/zabbix/ChangeLog
net-analyzer/zabbix/Manifest
net-analyzer/zabbix/zabbix-1.8.2.ebuild [new file with mode: 0644]

index 30cea82d3f861a247a8059038c27b526eb904b02..d20d6c9f65eb702b4aba5a923b3729a9e6665d61 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.24 2010/02/26 11:05:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.25 2010/04/07 13:09:01 patrick Exp $
+
+*zabbix-1.8.2 (07 Apr 2010)
+
+  07 Apr 2010; Patrick Lauer <patrick@gentoo.org> +zabbix-1.8.2.ebuild:
+  Bump, fixes #312875 #313403. As-needed patch fails for now.
 
 *zabbix-1.8.1 (26 Feb 2010)
 
index 28c22aa9fe9de73f7d83464f753c83bd1ac8827b..9204c3a23418af44917939d9caccdaf48ea613cc 100644 (file)
@@ -24,10 +24,12 @@ AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fe
 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29
 DIST zabbix-1.6.7.tar.gz 8396320 RMD160 0162ee8e173c895c2dfabc4a2249f480b12900f1 SHA1 0703389ef5cbb34af824e14236091d777fe38197 SHA256 7702b5c812caac39d0ff7b8d841aa1accc2ae2bc59f8229b3a5cf23b31197a3d
 DIST zabbix-1.8.1.tar.gz 3607414 RMD160 2f444b7292855bb4b9aaf4830871ebeb49e28b47 SHA1 ac8d4e73eebd1a86b9fdc5df3035df67e7efa5e0 SHA256 ef487766f22527d79fd7a2631b615c34d04103038341f1dc16eceb77172d8a7c
+DIST zabbix-1.8.2.tar.gz 3706540 RMD160 6333bb4c676422956a60c01caee3c67c9c05dde2 SHA1 59573efdffe481f1e0d020f4e75b670daa837ded SHA256 ba1d00454551c1c6f0d270f76718b69ce9f54c427e22acb5a13ccbc9e621fd81
 DIST zabbix-1.8.tar.gz 3549582 RMD160 1eba1aacb7579bf560057fe9cc1d667bf36ac608 SHA1 fa82721b745ccaa84c33602f4016c4057b5245b3 SHA256 6743f01f27116ead7b48927ac184708bb920541c88e63602fe1f2b7401866eec
 EBUILD zabbix-1.6.7.ebuild 7719 RMD160 e330d08e93ea8113277fc470405a8f1ffae1503c SHA1 feac6b3e936d072fa71d22a684cfb7f93f4a3c83 SHA256 7900725e9aa8ee43f2bb92ec788bbdec9785a3e6623946e482715c9adedb91da
 EBUILD zabbix-1.8-r1.ebuild 7960 RMD160 62453c575932f8209ac8e9481515998f195a6f4c SHA1 7d99c0015dfe65b2c95b00806875727ae1e3d30a SHA256 244a75a996f71f6bcd9312bd9ceacc6de6ca1ae322d46aa487925cb779202153
 EBUILD zabbix-1.8.1.ebuild 7959 RMD160 dde0f3da00014c850e36533957c84dfb913aa9b4 SHA1 00eafc26fd65dc962740502147d4de5808ddf19e SHA256 b39ac4cd10831e2abf7bf97628f139820923a7d99eb76592e961a40e4a5a83d3
+EBUILD zabbix-1.8.2.ebuild 7893 RMD160 80c722ee9f1b98806d56317b8250bd8820f967f4 SHA1 07e4bfce81f848a99e397830e89d52863d5f5b41 SHA256 1f0e2936ab1fec417b11a487fc3a45ff5a1e5b1832e4a6211e05d27c4646832d
 EBUILD zabbix-1.8.ebuild 7858 RMD160 4221cd6013b561d44b65257d116792ecf813d9bf SHA1 f16a523079e6077d7220eb33dff97576a605ba11 SHA256 9350f765d6cdc53ffb31db3fd750f1c4e2c5ceb469b30b91afb65baeb10b0b7d
-MISC ChangeLog 7336 RMD160 9e973c14d0e2b451f89b253c02544c5d0631d86b SHA1 5c082a8c332bac5a96e30d478b72defc0e5d3d4b SHA256 d4baa7e6802419765a534788cff356f56bacd2bb7bedcbbd55fa5f79941a150e
+MISC ChangeLog 7500 RMD160 85de25674e00c675eb2fa57ff517a24f11cb0130 SHA1 856bfeee1d180d036e497a2d22039b299e52ce0e SHA256 43194e9c0b4df7e8395d9b90b8bfa9492f61b6036926d3a0295bbf53d5a4edfa
 MISC metadata.xml 876 RMD160 eaaf9df3e263aebe0a1229b6fae6ba4596fe0a4d SHA1 fdfdd13b2376b6674d65aff6b70949265ee187ee SHA256 821c5cb433694059af057e1001020f0556a609c69732b34e1326758664e545c9
diff --git a/net-analyzer/zabbix/zabbix-1.8.2.ebuild b/net-analyzer/zabbix/zabbix-1.8.2.ebuild
new file mode 100644 (file)
index 0000000..fad2e5b
--- /dev/null
@@ -0,0 +1,303 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.2.ebuild,v 1.1 2010/04/07 13:09:01 patrick Exp $
+
+EAPI="2"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit eutils flag-o-matic webapp depend.php
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
+HOMEPAGE="http://www.zabbix.com/"
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="agent curl frontend ipv6 jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
+DEPEND="snmp? ( net-analyzer/net-snmp )
+       ldap? (
+               net-nds/openldap
+               =dev-libs/cyrus-sasl-2*
+               net-libs/gnutls
+       )
+       mysql? ( virtual/mysql )
+       sqlite3? ( =dev-db/sqlite-3* )
+       postgres? ( virtual/postgresql-base )
+       jabber? ( dev-libs/iksemel )
+       curl? ( net-misc/curl )
+       openipmi? ( sys-libs/openipmi )"
+RDEPEND="${DEPEND}
+       proxy? ( net-analyzer/fping )
+       server? ( net-analyzer/fping
+               app-admin/webapp-config )
+       frontend? ( dev-lang/php[bcmath,ctype]
+               app-admin/webapp-config )"
+
+useq frontend && need_php_httpd
+
+pkg_setup() {
+       if useq server || useq proxy ; then
+               local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
+               declare -i dbnum=0
+               for dbtype in ${dbtypes}; do
+                       useq ${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 useq 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 useq frontend; then
+               webapp_pkg_setup
+               require_gd
+       fi
+
+       enewgroup zabbix
+       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+pkg_postinst() {
+       if useq server || useq 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="$(egetent passwd zabbix | cut -d : -f 6 )"
+               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 useq 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
+
+       # 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 useq server || useq 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() {
+       econf \
+               $(use_enable server) \
+               $(use_enable proxy) \
+               $(use_enable agent) \
+               $(use_enable ipv6) \
+               $(use_with ldap) \
+               $(use_with snmp net-snmp) \
+               $(use_with mysql) \
+               $(use_with postgres pgsql) \
+               $(use_with oracle) \
+               $(use_with sqlite3) \
+               $(use_with jabber) \
+               $(use_with curl libcurl) \
+               $(use_with openipmi openipmi) \
+               || 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 useq 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 useq 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 useq 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 useq 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
+}