Bump for Zabbix 1.8.14 - Bug fixes for legacy 1.8.x tree.

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

3 files changed, 351 insertions, 9 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 12c8349cc5db..3df535190e81 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.101 2012/06/20 20:22:22 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.102 2012/06/29 14:24:47 mattm Exp $
+
+*zabbix-1.8.14 (29 Jun 2012)
+
+  29 Jun 2012; Matthew Marlowe <mattm@gentoo.org> +zabbix-1.8.14.ebuild:
+  Bump for Zabbix 1.8.14 which seems to be just bug fixes for legacy 1.8.x tree
 
   20 Jun 2012; Matthew Marlowe <mattm@gentoo.org> -zabbix-1.8.10-r1.ebuild,
   -zabbix-1.8.10-r2.ebuild, -zabbix-1.8.11.ebuild, -zabbix-1.8.11-r1.ebuild,
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e16919aa79f7..f835c32216e8 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -29,22 +29,24 @@ AUX 2.0/init.d/zabbix-server 598 RMD160 c584152f4d40ccdc9aded4b57bb24e13695565de
 AUX zabbix-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1
 DIST zabbix-1.8.11.tar.gz 4224738 RMD160 d2e8749a43b0846a7bc93a21c6546dad0d66b678 SHA1 2efb94e0b57f1ddbb38ef3f8da225d88effb0689 SHA256 c45819b97082799bb253e4c6a3937affd07a2cd2744d860d657107aa4a3e772b
 DIST zabbix-1.8.13.tar.gz 4235482 RMD160 ade2e43e581fe1b9b3b07057e612abc239798028 SHA1 38fd1e2a208fd2069bea61f2e5d1c66ee0697504 SHA256 ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667
+DIST zabbix-1.8.14.tar.gz 4241608 RMD160 3934998236e54dedcf5ce5b7f590472baf01a753 SHA1 8dcf5b944efac806b88b96276fb4bc9a5723b8d6 SHA256 039be5600a4ca9051a3b068c61da5eeeaff9f948511f31d4345308071ad9ab0f
 DIST zabbix-2.0.0.tar.gz 12091622 RMD160 c6c9e57cb1ce69aed45af921760d9f59d065da98 SHA1 19f0ed5174e4578c6e6f764439bdeadb7237e463 SHA256 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d
 DIST zabbix-2.0.1rc2.tar.gz 12029860 RMD160 a18ed9b8a67b37d5cf8d1ca6976f263097e13bba SHA1 bdf382fac4dc6bbddc6e195b9814d0f72abc233a SHA256 fc6e77d180bb0a14685cbb00ee66aa11c36d5852c2c420d1ef93fde7580495e5
 EBUILD zabbix-1.8.11-r2.ebuild 8594 RMD160 7d2ae7449258a3af5846664db1698304c5277d2b SHA1 23263ff33889bd43d3d547422684182c061ed477 SHA256 d9a30f149ea4fb202a3febd59ae358c82908610a405240b83c6ea0fe02a253a2
 EBUILD zabbix-1.8.13-r1.ebuild 8596 RMD160 25ae835faeeba7460d267beb25ae7fe9c8232a24 SHA1 708b73f90998afb8131eee149520f14ca5c35f17 SHA256 38b47d330723abe68a4923b2ab01b1783d0511b1e26684d3f9addb045c8f4df5
+EBUILD zabbix-1.8.14.ebuild 8591 RMD160 06715f6943d045852e755f0ca28b3a118f47d1e4 SHA1 735ecfeed907a62de101a813cc8b64aace25d0f2 SHA256 b248628e958f8fd52b5df23bac2600209faf12799f1d7407594c9f42e13f530b
 EBUILD zabbix-2.0.0-r1.ebuild 10825 RMD160 fb2cfbd88e449d1313960192f80c3affc12cf423 SHA1 22c152ebf4edc412822f14ac5004dca440d0cbff SHA256 be7eeb39e66edee906b6618d56970077ce207b8e883707ee4199eafdbf5bd4c4
 EBUILD zabbix-2.0.1_rc2.ebuild 10824 RMD160 025687154b6dbb40ed1d5fa9ba810fb723f215bb SHA1 ea3df409134cfa34f8012afa8545fef74c6ae0f6 SHA256 5930de3b5e3c0f738bf52ba54ef2dbd99bc0dede1a865f998e5e212a22e479d4
-MISC ChangeLog 24074 RMD160 be8bcb01c973938bfe17fb6cc8389ab0a3a904c1 SHA1 9a43cdc1839c3c936c340e61a0d43f56e4335d14 SHA256 33662f439ec0a275f84cc60500454554507c544c812d1c7d367122e4bc0273aa
+MISC ChangeLog 24258 RMD160 9dffe6bf4d1176e2140837b235274bda99762ce3 SHA1 a6c089f64f963941e9ca1911fd879d0e99e2b38e SHA256 72f219a607feab9a4bf3d44eb47cd01a360dcdf9b8d5b8e4a94c3a4a6f85d780
 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP4jEJAAoJEC1LWXx4YDen4EgH/1B6Q8JD5A0GTDlZH/HPS45f
-xzSrhPbGIrR+4juWcmEGtgu709EgnKXYIbP+vCN4ar/wwDYCVQdvDss7/ykiTpH3
-48WjA1dwGWWq3ILniVzO/x7ywVqS0JUVvD7yhr+GxEnsSA6z+4GMnpWRojkPzzkZ
-lToyQoPgrO68NuIhSU+HNkCLUIRWhUcnGU1aSsNboJvEDLo7jRFlw8BrAlmufDtz
-BTXGA/72ffi2L6V6X6o9fZ4wacbpCPFAFY4hMzx85UrB6/zrq/vGWfmXycih0wam
-Zn/1HOH8Paam9/a1CGA1E4f5+uwWzDxCFAndYVZqwBp1aJaPrsKjpzlaw1vBkLw=
-=vHJ8
+iQEcBAEBAgAGBQJP7bq7AAoJEC1LWXx4YDen/XwH/3xQv8bEsl74Qr9cEQ4oQJmg
+4XhRtYbZhii0c624kfPRp/cCgIqdFq/e6ONgrxJDPIL48r6cXf9/75GeyKhYJpNV
+6gsmVGCY6dyaEzPYqlCm6W3UscFv105i3d9qlkqzn7Cgm2wVO6NdHWDRiIq9X0Kd
+eT1XFXAx8Q1dgz96I1tdR+kU+9DGkclm9pt3uPr4MYQ0630oViYPOLuNrVkQ4gtC
+vUbx6z5H5wxdRXTS4m6sB/6NVDDNWmRFqBN707BFCdxIaCCxnfe6mldoX5T9zNUm
+eg5ndPzH/Zt2pjDCI3Ny0UhdOfYz2ogPGCO+nOk5tAQNt/S0QyIA89ySHRrUB3M=
+=+ao2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-1.8.14.ebuild b/net-analyzer/zabbix/zabbix-1.8.14.ebuild
new file mode 100644
index 000000000000..685b16dbf29a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.8.14.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.14.ebuild,v 1.1 2012/06/29 14:24:47 mattm Exp $
+
+EAPI="2"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools user
+
+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}
+	virtual/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
+}