Bug 412659, Zabbix incompatible with fping >= 3.0

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 358 insertions, 13 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 7759b573d5d3..092aa106f880 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.84 2012/04/16 20:52:41 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.85 2012/04/19 18:24:15 mattm Exp $
+
+*zabbix-1.8.11-r2 (19 Apr 2012)
+
+  19 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +zabbix-1.8.11-r2.ebuild,
+  zabbix-2.0.0_rc2.ebuild:
+  Update zabbix dependencies, not compatible with fping >= 3.0, Tracking Bug
+  412659
 
   16 Apr 2012; Matthew Marlowe <mattm@gentoo.org> zabbix-2.0.0_rc2.ebuild:
   Zabbix 2.0 changed configure option for postgres from pgsql to postgresql.
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index b136104dc5a9..ad07a26b1d79 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -31,18 +31,19 @@ DIST zabbix-2.0.0rc2.tar.gz 12255453 RMD160 366651b9fec6da043d36db9bf6c6100bf918
 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 9537 RMD160 d0b7a3cbeafa23b6b667f1e832206c3644dcef84 SHA1 d3a4e11ea69708f832a260989a6e9de907d59405 SHA256 576a7579e6edb0554a9708fe15100b979fe76778d0da534ba993101d21a61a66
-MISC ChangeLog 19008 RMD160 5ccabd2a24b3a794a5fe6ef7b32049a3739eb017 SHA1 cf3194023d08a238c82c5a72ca115d8cb3812513 SHA256 538a1c22f211a6365e2282e7f4f9b4916f405ee54eb9ce2dabf3ffc4b03a3cdf
+EBUILD zabbix-2.0.0_rc2.ebuild 9627 RMD160 1ec03fda46cf6dcf45dacfa4f5fc12e6d3e69489 SHA1 5d7c281cfe0f9032db9efa72a555f53aa5645895 SHA256 f52d5615b76c8c6c1f3f669807a1090c37de49f86717d114f8ec8be396c6621b
+MISC ChangeLog 19231 RMD160 7c46740fafd83140122f14b9c54cad5967e41f2a SHA1 c3170121403e40ccfeb6f6c55fef6f696a78ee2b SHA256 31e22d7290438b386c5a89c231e731ff81cb5314411e5775ce39c45d4ef4582b
 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPjIakAAoJEC1LWXx4YDenOCAH/jDxqhcMOfDnX+XmXxa4fTMl
-2m71xsM7j2sc4XK9N9iRedqQt4bPkrM3FweRkcTMdbQkCUP836NWojQZBxiG2Kk+
-W+S/aHAd9Qj4+b1bDmHuiMxe6kH5XPTpw6PJ2CBY6ZWFEeKk+Ls74XQ8lJfnjhSd
-wdMYRURE52O0IBFlp2zdOn6JcM1sEsyXOpLLow/TFSdLDfKxbyvgOn167at88URW
-HF/ngJ4fnD3MOuq3Wxzc9TI18pFDlikK0Jx0XB5yCZuU68kk/HEjSMPgitQ8wHuM
-AUiZ17Xyv2y0T8ku0ZMdZXazcGUyDDFsPu0a0xDO83dfEDuSbQ74qWvmec6HjXI=
-=TEbQ
+iQEcBAEBAgAGBQJPkFhbAAoJEC1LWXx4YDenoYcH/0wsVdtz2+Sbpmd1TZqGhBdh
+EQrncFXF1z0mQ1sofLbkfUkk+IP9ek4T8oNLezYDWmF/tbPxMGnaOhNUCS+l8diL
+/DcSAU1qSs+V3s/GO8PgkTkW7A8YBs3K2X4OxV4zWUZrAsmgKRK5i+MdIwMFI4ve
+L6dj4K2XCMuH0l3Rk7PvBgmKxIBw0Cohin6P4aLu+24siQn1n8sxK2GV1r0WMJje
+mrRALxHUjUcQRNLJYCJ41L98+0JgU117l8PsQ35siJpRrxPKmdSncwd7YuHEnJHW
+dyISBYGpVg9dV9/tQEspSF8uFYzKIC6l2kGJH0NXg5sBhW35UDgKyNNDLMDD+rk=
+=ZlIx
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-1.8.11-r2.ebuild b/net-analyzer/zabbix/zabbix-1.8.11-r2.ebuild
new file mode 100644
index 000000000000..0a1f656123d4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.8.11-r2.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.11-r2.ebuild,v 1.1 2012/04/19 18:24:15 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_rc2.ebuild
index 644f0dc7cc2d..b1722cada10e 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc2.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.0_rc2.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.2 2012/04/16 20:52:41 mattm Exp $
+# $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 $
 
 EAPI="2"
 
@@ -39,8 +39,8 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 	)"
 
 RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
+	proxy? ( <=net-analyzer/fping-2.9 )
+	server? ( <=net-analyzer/fping-2.9
 		app-admin/webapp-config )
 	java?	(
 		>=virtual/jre-1.4
@@ -182,6 +182,8 @@ pkg_postinst() {
 	elog
 	elog "The java use flag is new to 2.0."
 	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