Major version bump zabbix 2.2.0, Minor ebuild cleanups, no keywords until testing complete

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

3 files changed, 386 insertions, 10 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 69c94a50e0f6..b7ff97dfd955 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.140 2013/10/14 15:50:09 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.141 2013/11/15 20:46:37 mattm Exp $
+
+*zabbix-2.2.0 (15 Nov 2013)
+
+  15 Nov 2013; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.2.0.ebuild:
+  Major version bump zabbix 2.2.0, Minor ebuild cleanups, no keywords until
+  testing complete
 
   14 Oct 2013; Matthew Marlowe <mattm@gentoo.org> -zabbix-2.0.8.ebuild:
   Removing older ebuilds affected by 486696.
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 1f813b74aa7a..28f1a3bad318 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -32,18 +32,20 @@ AUX 2.0/patches/zbx6097.patch 2383 SHA256 93c882b46431fa4dd78c5e48b2f238bd2e2435
 AUX 2.0/zabbix_proxy.conf 9979 SHA256 a1fe3728322abac55d3dc62ce1b3c86daa58c7c8c57da78ae04f7f2f11adfda6 SHA512 b1720c0b03f623ef74c58b9111a3f02d990fe3a04d7a2d58592501933387f908d4c7f856307ec83828b7406922101857eb3617dfb5443618237fc7ea81e8d8ef WHIRLPOOL 19e4aa0f704eee67e678531b0db8186359fd21a984a09c74b1761dcebe5ed6f0703f748cf188c63abb1d3232b7c49d8a4e6c27d6b6fe225bc2899465608ba61f
 AUX zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 SHA512 9ba379e8088697f26f29ac31f2c5e8cad8e0709993285afe9e390f63150ec09fab46089e3f29f2d6a818bf55042c39646ce19840498355fd6df43b1834c6078d WHIRLPOOL bc4728cf9e14284b91b45627090e45d39f53a721ba46d9379418d650d22732994bec11046d64d0f0136932d4f4e2f0c29de68f527db9d9f765f0245f1d39288f
 DIST zabbix-2.0.9rc1.tar.gz 13648577 SHA256 474ac3a0fb47a0f2dc43667948ae40fbe895ae754ae71377ff084cb33c716db3 SHA512 2d67f5850066c6c932b42a2ca371def9bbc77a52b29e8f98bb116261a94df5aa13160f45a5d5c18a856c5c61a0cdb18d73178701e1ee80e476ad6eeb36110963 WHIRLPOOL 44edc34c4b8f81899e55c4d4b9f68bf6b604df3acd15c1d1a5468c5ac2cca9394cc9091e37dfbe0ca71278aebb7d1df9e622ef799bd8e84944f391b0ff5b058b
+DIST zabbix-2.2.0.tar.gz 14252290 SHA256 f436f660866eaf16f9e360c158170f0e7c7251f7a393f9e14d19541161f3465d SHA512 bbc9aa3b6449076e0575f3514c595b740e9699e266402f32e4776f0b0fdf945748e3bc671b590a9678ff364742607dd5789f1a7f6e4efecce252217a7e45b36e WHIRLPOOL 88e8d86e9bd16657ca9ca799a65d1e9c0e5c4b9b57cfc929e96a20fde8d711f87a0e57960a2583cfbfd8797ef0037c246bfbff72d0897d551ed734d684841ae6
 EBUILD zabbix-2.0.9_rc1-r2.ebuild 10560 SHA256 f2098014c15d357edf50a590d372a9988598808720939337078cc3c4c9b91c73 SHA512 40353c6b0a72840e1ef251c57e80fcee763daf0308ac4f431f28048a61bff480011e92ffadf4d44b5afc0df0bf30f996775b385ed3b33a71d1e47a4a1e7ab7df WHIRLPOOL 509b5de60c5980787cac831c0b271b2fead29eb3a2711bd9f83750f247fd42ab96c33884be19d319119be3b26bf39926047e67e673644bde47174b05b596053f
 EBUILD zabbix-2.0.9_rc1-r3.ebuild 10569 SHA256 1aec64e76a53c785d84818b05b04fee9c87e462eae00de58b7768a8f8967677d SHA512 9beb3a2666ccaaee823841ff6ce90d5add23d936f001484a471d42a5e213f238dc7b64fbe7c09f6108670276d0b2483723ee6b60c20682aa380a44710d625764 WHIRLPOOL e42b4d43c4d45c85c7b4664b10d9671463dfaaaab5b6fb812f33821d9abd4f6752933af4dac0b3aced48fda62251bdc177f52e67230cfbff636596de05f0c409
-MISC ChangeLog 32377 SHA256 9998ca3d78d7c9ae2b6101b3136a002a6b36783e789958f475b7739709c0e3db SHA512 2f90f1ce63241c6e579613f06b248fa44e4d76bbaba9a3c5050dd87cc9d59db668ac3a78067e8f425947b0191c2204eddb15be652b900e6f6fdb9fc831aa015d WHIRLPOOL 6f457abf23db7588cd5102530d5cfbf6dc1f0da3974fc8078eaa8c7ddb5ed43f2ab17dbd917852d5c6a6aff4b37c2adc36a05d5e1ab1d9fcaee21f91433b5d45
+EBUILD zabbix-2.2.0.ebuild 9766 SHA256 46b8257c00caabb7690cf6007f2bd014d48d6ce977321206808589b1518cabbe SHA512 99e93410907fd15ff98d6d14bf79d5053ed5a32e699f07c50cc4646e18d242df23953735753bae8e79c857e385f642e0b6928c2bf5d201443806773d1a417818 WHIRLPOOL b280140a31cf0d765a73bbfbf78c505d43d2dba889de441c8cf881c58de5c87c94cd996317c42d175d10d7ea59df0a71e91f5543c0265b0bf30095c836341a0e
+MISC ChangeLog 32574 SHA256 cea58f91fe4a7c225b9cdf9f599fc9ebed14069cea5ec01a45367447c3f24590 SHA512 fe17486f6b089fa3175bd145229e496c192b56b08b00d4822bb14147ddfd5d72dcc493e9346acb46b19bd11fda45395491db2ae4605cb0e6f84ba807dc09d77c WHIRLPOOL 0e274527ede552abf08848b12eaeca63b24dbf49d776ad5d0ca55314565b7acbdfcd5ff05472ee86a5801caf2354b03d1bb52325d7520f89290010234dd15b9c
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSXBK4AAoJEC1LWXx4YDendAoH/2hoF7uaLwKv+J9fefw52WsY
-zlgswOd78k2epM6jb7pcOrdTAzIy//lO/EUBE+e7xdxSh7XVS8S1m0GG8hyStO0K
-8ikyUuYyDiveYduhDYvoZ6tdBjcSGaxUdKW39uyaHCSDQs20xF5JQxEd92frfYsW
-Z8xhh9IPiiTB6AExFTr2oSOO5IIzmb1bu6e+bG7ol/woVW7ehDsk37hvb66ExVOu
-HkwnUuudIGruBDpZ75pGqNtulOPpd2EfnID1nq6Gcu1TEZGC0ggqFMiS+tyxQ1VG
-H8FSygNuIsXPz1oHoK06j4hp2QyLOzIxRBDNFjAdvGAbpNFCDDhE6UPHI640hFc=
-=fg9h
+iQEcBAEBCAAGBQJShog1AAoJEC1LWXx4YDen4JsH/jBc+hD9cGDhEnebFS4bF3GJ
+5gyVMVuMhw1zUYrWNLoU3EUptWFT/sxMia5UxNLh6nYsdGHdvFhuHR95GnSaZK3V
+OumcNBD4aS55JmLIB9PMyaIm7Ua2Bgv9o92mUYDdfZ6YNLnJCxtBe2cg7BgrDSKV
+TsXkYZ5E3X/ytD4RuIuq4JdIUrxaZ3H46R1GjMVfKyyzXSKJED4JHAL0g+0L5+F5
+DPb3L3S/NBB1sPI23FC39/wHBRGvAzR+2mvKDKsg7MRgfQ9hHNq+ksj/wa2L+T7l
+a0X3hrSUVO4wYrwy3ixS+SSs4+z0ybe1JxCoZWdLWBxMqBp1vXmRJFLHF9Z03AE=
+=AxVd
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-2.2.0.ebuild b/net-analyzer/zabbix/zabbix-2.2.0.ebuild
new file mode 100644
index 000000000000..5ca0d29e450f
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.0.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.2.0.ebuild,v 1.1 2013/11/15 20:46:37 mattm Exp $
+
+EAPI="5"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS=""
+IUSE="agent java 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-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-base-8.3.0 )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	jabber? ( dev-libs/iksemel )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( >=virtual/jdk-1.4 )
+	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 )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+		dev-java/json-simple
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+	java-pkg_jar-from json-simple
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/2.0/patches/zbx282.patch"
+	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 may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		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 "You may need to add these lines to /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 "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
+
+	# 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
+	chmod 0750 \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/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
+				;;
+		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_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(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
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/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}/2.0"/init.d/zabbix-server
+		dosbin \
+			src/zabbix_server/zabbix_server
+		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}/2.0"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.0"/zabbix_proxy.conf
+	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}/2.0"/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
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	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
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/org-json-2010-12-28.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}