Bump to 1.8 #296302, fix webapp handling #300276

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 312 insertions, 3 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 2933a80f7b71..4159149862df 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/zabbix
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.17 2009/11/21 10:32:26 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.18 2010/01/09 12:54:42 patrick Exp $
+
+*zabbix-1.8 (09 Jan 2010)
+
+  09 Jan 2010; Patrick Lauer <patrick@gentoo.org> +zabbix-1.8.ebuild:
+  Bump to 1.8 #296302, fix webapp handling #300276
 
 *zabbix-1.6.7 (21 Nov 2009)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9f75d6118cde..38541565d334 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -25,11 +25,13 @@ DIST zabbix-1.4.6.tar.gz 3784072 RMD160 c53973e8fcabfb04b22256650e278e594853ca04
 DIST zabbix-1.6.5.tar.gz 8246218 RMD160 503c1159c7f3da7a24650dd55296cf05d3b88636 SHA1 b4a224cd9037911c1e68799a13518896de675d3d SHA256 1680dd625a140c97ea945f78c3e614dfe5b42261e0ba4fcf5c9b277870716a3b
 DIST zabbix-1.6.6.tar.gz 8255436 RMD160 96be023ab87d83de28e23d96ae363d65462c32e1 SHA1 3bcecc210f79e70c2c366cd3310a2492d7ab4cd1 SHA256 9eb7bbe99c516c11020d5c95c8f8783fb1dc1123ce9c7e2135db7bfd0ea0aa75
 DIST zabbix-1.6.7.tar.gz 8396320 RMD160 0162ee8e173c895c2dfabc4a2249f480b12900f1 SHA1 0703389ef5cbb34af824e14236091d777fe38197 SHA256 7702b5c812caac39d0ff7b8d841aa1accc2ae2bc59f8229b3a5cf23b31197a3d
+DIST zabbix-1.8.tar.gz 3549582 RMD160 1eba1aacb7579bf560057fe9cc1d667bf36ac608 SHA1 fa82721b745ccaa84c33602f4016c4057b5245b3 SHA256 6743f01f27116ead7b48927ac184708bb920541c88e63602fe1f2b7401866eec
 EBUILD zabbix-1.4.6.ebuild 6988 RMD160 6ba14f5d7707aa647857923c08dfa62216f2d4ec SHA1 cc6334b9311fa8ea08120c65c48033c6802da9bf SHA256 1f7f6245429fa0dfae013898d9d2358ea721b639a1982dff660021cd77b97217
 EBUILD zabbix-1.6.5-r1.ebuild 7660 RMD160 b8254a03803aef34804b6b550e64b0a7c500ee4c SHA1 64f07906928a3a84bf912c2e2678ab687388cec7 SHA256 57748bdee05ee7673e52229ea60da5c061faedf2cc2a9ed0cc6ccef60053f519
 EBUILD zabbix-1.6.5.ebuild 7395 RMD160 3124ebd985d91cb6c26e4296dc9521b7be142183 SHA1 864b2dda99361bbcc361a2f0bff1e35fd75169b2 SHA256 c30329bcb6c5752b73ac0a35639835e4f9b8de272ce4a2426af8abf3a2c066e5
 EBUILD zabbix-1.6.6-r1.ebuild 7694 RMD160 d65c15e3d8cb22cb10713699947cdb4a1fcb84ee SHA1 d8873a6e69c6237061bde087875788c3c0e0f7f5 SHA256 08245b792509374a43dc43cc42b7fa257a72302dde2a3e17ad66539bfd6fe9f6
 EBUILD zabbix-1.6.6.ebuild 7657 RMD160 072d84c8324e729342218dfedd8a8c1103592028 SHA1 62cbeb8a31bdf684df686deb039000731e85335a SHA256 d963b3b1066a299692bcf85e2b7bc9e5c99edf2895804fbb165dcdc9550e5510
 EBUILD zabbix-1.6.7.ebuild 7719 RMD160 e330d08e93ea8113277fc470405a8f1ffae1503c SHA1 feac6b3e936d072fa71d22a684cfb7f93f4a3c83 SHA256 7900725e9aa8ee43f2bb92ec788bbdec9785a3e6623946e482715c9adedb91da
-MISC ChangeLog 6326 RMD160 d9b431b62c71ffecc815e31654bc2061f5ac2c41 SHA1 e8005f6ff865cc2c1e197b2eac592bc8448c923f SHA256 ae90f8960f23db799c87c6e4fede1db7aa0c3eaf5dca109b5c9fe0edf80999b3
+EBUILD zabbix-1.8.ebuild 7851 RMD160 27935411c2bdf74d99b44c65d875b0295c4d3ca0 SHA1 385f21c73b15428e7290097a85dfd889832bb625 SHA256 f7870e4ef6526888946f4eaa7ffb9a8bae24f56659b896b5d8c3ac22d3419af0
+MISC ChangeLog 6475 RMD160 a34fe731a1041daa8f319db163f190228b34c409 SHA1 80553f78e565a4cf85766056403d3b782cd1df1d SHA256 b438021ec698f00cb5ebccda38c808c9511b96f363e672a033e3eeff01058775
 MISC metadata.xml 876 RMD160 eaaf9df3e263aebe0a1229b6fae6ba4596fe0a4d SHA1 fdfdd13b2376b6674d65aff6b70949265ee187ee SHA256 821c5cb433694059af057e1001020f0556a609c69732b34e1326758664e545c9
diff --git a/net-analyzer/zabbix/zabbix-1.8.ebuild b/net-analyzer/zabbix/zabbix-1.8.ebuild
new file mode 100644
index 000000000000..fd34e2655892
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.8.ebuild
@@ -0,0 +1,302 @@
+# 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.ebuild,v 1.1 2010/01/09 12:54:42 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://dev.gentooexperimental.org/~dreeevil/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="agent curl frontend 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="${RDEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	frontend? ( dev-lang/php
+		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_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
+}