Bump to 1.6.5. Fixes #238151. Patches by Calogero Lo Leggio.

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

4 files changed, 307 insertions, 4 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 8fbe316727b3..898ea7ca4691 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/zabbix
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.10 2008/08/04 20:23:44 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.11 2009/09/01 13:38:46 patrick Exp $
+
+*zabbix-1.6.5 (01 Sep 2009)
+
+  01 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/1.6.5/init.d/zabbix-agentd, +files/1.6.5/init.d/zabbix-server,
+  +files/1.6.5/postinstall-en.txt, +files/1.6.5/zabbix_agent.conf,
+  +files/1.6.5/zabbix_agentd.conf, +files/1.6.5/zabbix_proxy.conf,
+  +files/1.6.5/zabbix_server.conf, +files/1.6.5/zabbix_trapper.conf,
+  +zabbix-1.6.5.ebuild, metadata.xml:
+  Bump to 1.6.5. Fixes #238151. Patches by Calogero Lo Leggio.
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 05c2f095eacb..caee24aa4a16 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -4,7 +4,17 @@ AUX 1.4.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d
 AUX 1.4.6/zabbix_agent.conf 1119 RMD160 6da1953fc0439cf0c991272db08b291c7b319cc8 SHA1 386501f78cd138f15d90ed66eacdef20c49659e4 SHA256 ba99099f1943d5cc86e29250d1040388d6b8af2e2e89423f1a681b6401399556
 AUX 1.4.6/zabbix_agentd.conf 2353 RMD160 baba6bdd27a6f8d6cc4cd14e26d98eba38f276c5 SHA1 ee72e6945ae7269628903eb3c3ab7cc07908ea70 SHA256 73bb022dce06c40ae98833068599fb0d1854eafdbaef2098db2ecd223a0e5856
 AUX 1.4.6/zabbix_server.conf 2443 RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 SHA1 888914b480f3f3fedbdf66356baf7cf9b0ee063b SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4
+AUX 1.6.5/init.d/zabbix-agentd 582 RMD160 051a6bf6e8d8181258f99ddb3964881ff78d0954 SHA1 757d60d5f681ea9dd2c32347f6eb787d2c23a5ce SHA256 e6b10adda63ff234bd3c11fd19fd30970dcbda292b2fcfa1c382d9d0b7a795f1
+AUX 1.6.5/init.d/zabbix-server 564 RMD160 f05bfbcbfc163db19076656e995ddc72fbb7a78e SHA1 141f08ae3966fd935df89589eea62554c3b69bb3 SHA256 eb5ea05e53d8bbf502cf3f6b873c9275dba793446b0f5ab11ed7a169d757b3c9
+AUX 1.6.5/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f
+AUX 1.6.5/zabbix_agent.conf 1121 RMD160 09c6842c9846b5506ebeef7bea6f596e875b9a9f SHA1 64a513652d2cd7e764db67a4dde519499e554cd2 SHA256 0bbeabf0a3b9a7a3a2c71d384d785c9c1b9da420e1fb46445a15ce952d6c7790
+AUX 1.6.5/zabbix_agentd.conf 2515 RMD160 bdf4e66de1355f9b05f8ca228bdae3e592aca5f1 SHA1 df20ca520c05cc02ba1fcd872abe31be5b7f25a4 SHA256 7853fd3a22bdca6c05ff5326bf0d3f7d80cb3fe854c872a086f7f05484720f1f
+AUX 1.6.5/zabbix_proxy.conf 4509 RMD160 9efacc29f9e592484cfd4e7cf1cb121886f7318b SHA1 1d619d6d7789be4290245b8bdb8bddf0e93b6a80 SHA256 d7f5d87f3ad9860b0dc8fe2175303b9e83464a5a0b51010a87a759f3b6de46e9
+AUX 1.6.5/zabbix_server.conf 3922 RMD160 a38ff076d34a9807d60b67ec3df3a428f03a8095 SHA1 48fbeabd262d0552f0cb86c39b3f645788077a11 SHA256 4210390a0400b86b090945abab6fdbfe91965d6746a46cf92434dacee4dfe3cb
+AUX 1.6.5/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
 DIST zabbix-1.4.6.tar.gz 3784072 RMD160 c53973e8fcabfb04b22256650e278e594853ca04 SHA1 b9b573b24fdee182b99cd8ee83fa1cc5c55eab87 SHA256 c91aa005fbe2e7df3945890234e574ceb4d160eb11d284ad0402d97ca3faaca7
+DIST zabbix-1.6.5.tar.gz 8246218 RMD160 503c1159c7f3da7a24650dd55296cf05d3b88636 SHA1 b4a224cd9037911c1e68799a13518896de675d3d SHA256 1680dd625a140c97ea945f78c3e614dfe5b42261e0ba4fcf5c9b277870716a3b
 EBUILD zabbix-1.4.6.ebuild 7003 RMD160 adda92022c4fc6c709beebe9495b41c4651f7861 SHA1 80d28fc04798d4d782e47ebe1195535d666cc8ae SHA256 10de37a7795944ffb92fc32b8f1b29987a2d2628bdb70f06aa21dabacb423808
-MISC ChangeLog 4558 RMD160 2c8305685fb81877c583111d7d438486b7f8caef SHA1 43dce2cc4373d89b6dad4eea7218792265fbf3e3 SHA256 e6f755cdb3c3237ada7569255e9107ca3000ff2105ff3640a2a7132de0c8ccf7
-MISC metadata.xml 827 RMD160 9a500535d1be9b790295ac70a3116b3fd108fc78 SHA1 d98693d18d9ea3a607f96014c1524e7cfb65e21a SHA256 34e96335704f0eb52c22086e0c4d3672a5fb80d291815854c000050fab756c6a
+EBUILD zabbix-1.6.5.ebuild 7409 RMD160 cf0157a3582916a008a2aaa147bf3e2f45202378 SHA1 28a83ca352711fa970b6339dde5461d3b7d49f95 SHA256 7438c2168bcb786cceeb35bcffd718847382e98d708c3d085edcadb8261ea6bd
+MISC ChangeLog 5018 RMD160 c9406a1b83b4c5f9d016d3c98b016c287b67a237 SHA1 2defd7c7d0d1da6ffed39d2eb3efe60e94507d80 SHA256 ea972f7a451b2adbb63648b73b7261465c76ec1c030c5fd21e8f587c80103492
+MISC metadata.xml 928 RMD160 4414ef8a0c347f8310cb65e55603ce5c6444c3ab SHA1 728a997211435ad12f58b50f1abee3ac04b6865e SHA256 4e858620c369c1eaed4127773407373228b78de19b48ba1154f7b014039e1654
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 4727ffab9031..0646ec0255d4 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -16,6 +16,8 @@ configure different types of notifications for pre-defined events.
 <use>
 	<flag name='agent'>Enable zabbix agent (for to-be-monitored machines)</flag>
 	<flag name='frontend'>Enable zabbix web frontend</flag>
+	<flag name='proxy'>Enable proxy support</flag>
+	<flag name='openipmi'>Enable openipmi things</flag>
 	<flag name='server'>Enable zabbix server</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/zabbix/zabbix-1.6.5.ebuild b/net-analyzer/zabbix/zabbix-1.6.5.ebuild
new file mode 100644
index 000000000000..7e7b3e79d336
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.6.5.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.6.5.ebuild,v 1.1 2009/09/01 13:38:46 patrick Exp $
+
+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="mirror://sourceforge/zabbix/${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="virtual/libc
+	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 )"
+
+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_compile() {
+	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"
+	emake || die "emake 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}/${PV}"/zabbix_server.conf \
+			"${FILESDIR}/${PV}"/zabbix_trapper.conf
+		doinitd \
+			"${FILESDIR}/${PV}"/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 agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/${PV}"/zabbix_agent.conf \
+			"${FILESDIR}/${PV}"/zabbix_agentd.conf
+		doinitd \
+			"${FILESDIR}/${PV}"/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}/${PV}"/postinstall-en.txt
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+}