Fix for bug #456850 - Allow non-standard AR/RANLIB if user specified.

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

3 files changed, 411 insertions, 9 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 3ce0b7f9d304..9f411d62bdbb 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.123 2013/05/06 22:40:15 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.124 2013/06/22 02:37:03 mattm Exp $
+
+*zabbix-2.0.6-r4 (22 Jun 2013)
+
+  22 Jun 2013; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.0.6-r4.ebuild:
+  Fix for bug #456850 - Allow non-standard AR/RANLIB if user specified.
 
 *zabbix-2.0.6-r3 (06 May 2013)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 702f3b60207c..f8d8d06586d4 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -39,17 +39,18 @@ EBUILD zabbix-2.0.5.ebuild 10356 SHA256 798869b9df18cd21517ab3ac86e9a9c5ae26cb86
 EBUILD zabbix-2.0.6-r1.ebuild 10395 SHA256 eaeb0a47bf7c2d9c1d295f8102313b97a7dc3fccc75dd5f83bc007357c466420 SHA512 47e2f518469af0c89ebcaaaf56a73d56f497b2112b5f8b01f7f6fb941ad6f8279ca124a0f93e1967921785d095df77a51e78d3e0af87feb0ae861325106ecab8 WHIRLPOOL b091b653f5a925445531b491a007ae38f5687c6b2a0e78b79631a9d9b47b7bb280f210224d94c88a3dbf0b736340768d6223d602d47f0351982082a0084a7b1f
 EBUILD zabbix-2.0.6-r2.ebuild 10393 SHA256 3a72b6b491514a9b224d48fea1dccf1bbce48749e05466f5a0cb9c84bcb459ac SHA512 c447e44701e0eba7b7f33917115c32cc59cf3f7234f97fbb5b2612191bab28b5e40d26bc2470d9dcd8b735bed5a7e44766495460b72ceae759e60dc3863edd80 WHIRLPOOL 30ff8a65e56aace739c82128d8c692ed2a2687708027f84c1a43f3d8163e8fca1ad89b2f6a8771dbc0af55c2e3f23ce76954d95ddea03d196803ef6f054d996c
 EBUILD zabbix-2.0.6-r3.ebuild 10391 SHA256 c7e58d2983a038ad2107c5298e5b65bd1f16de1ae2c6a77b4c6b902d52d7e31d SHA512 6a60a071accd4d4a4376fb111f998a17be2a3d04ab74fd9b9259db868a521b285a94fc2bee92aa58484103139b874884b87c74cf2652c98fcbf395a465987908 WHIRLPOOL 8d7d593828732fbfe3ab910e28b579d254506c862c7be1ef2427b4437703fc45a2cf9cdd6cb35701354bbc0a946deffb38bed6be1ee63d2097fd753b41ba514c
+EBUILD zabbix-2.0.6-r4.ebuild 10569 SHA256 58d85069f5dcaae5a6abfe1c8555ab57e69d254bb4b0b7235fa8ed8a3d2e08e4 SHA512 0c17697e1c40ec578986fb8f0ada2d203b7db93c8d48c25ea55d4eb221f0df5c6d2c219d0ddf2403dfac1e371972201f951f25b8f48cbad31b35a3e9a2aa68ae WHIRLPOOL 7fb35f7ee315f9bcf4d477e73a465661a387ecf06a2a784f02bdd1c2f683e32b9aa3f9f6983be52d3ee30d8caea2a4976f528e7f82afdba3946acc8e1793adb1
 EBUILD zabbix-2.0.6.ebuild 10345 SHA256 205134ec4ddc63b54a6110b1a864312cc37ae58e90118d7f4a68dfb3dc945218 SHA512 32f1ad248bb3e27f5e0908e3bec53c170a16178e2b6e66a824c98b10948457231e0079a0b24cf2636a9d1620f5829f32cd55b5c87b0907f522ca8811ce51f2df WHIRLPOOL 9f56d8a29448c0f057e1b5c223dc641d221afd0b577e88baab7527e2116400c01745d5c95665f448dc58b3a49a93a02e2ae9386b586a0065aea5e83634961af8
-MISC ChangeLog 28969 SHA256 30d61905a74b570ceeaf4559f877afc07b58eed7f5ed744d9507b71546fb7349 SHA512 73c65392ec6437e36e4c95a27eb92dd0457516069f628ea37558b504258037fb79ee9edf01660cca60f4ad7612954788fa8c2e31fa66266dd69eb332612c303b WHIRLPOOL 32e4b0e5e334b9512b7c2cbf6c67e0e4180c05e2e4050da83099e17dfebcaf36c19e35bacf8f204af9d4cca57aa004adcd0f615d8bac4b9f837090bb447e9579
+MISC ChangeLog 29149 SHA256 eb2e31a5a330a6110c2c598677f72109a663783a93e38133dc058799ea055ad7 SHA512 3c4c8a133846fb0201454164a3e954a7b9f9f758a434e23599cdc869e324f85f6a652f82ff0bab4659c4504e9f0316b79e8440348ce89dcffbd5ca215dd67bd5 WHIRLPOOL 12b220523b9abdc508ba730651bbc2ee41825253ab3530a97979d66ea8137bfdd8052404976e25312e9300bc60e9b0dea9705cf958476563f29fdf01dea38e0c
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRiDFYAAoJEC1LWXx4YDenE34IAJoyHMF0qj/o6n1KLsKxpgAN
-cA7K71614tBnis5CkR9TkZuScvldldLlG7nC1VL7lYAyj0tgeZe6QrQp6nnQUTGn
-TKYnMl7gIr90rBovqaK91ntXhzfrQYjQXV1jqFUyRBy1l5hfGa/HeK1j1bvU9ILm
-DLk+wXLIhn/71yi1rrC+VL4PImkyq1LdK+tibgW/5Tqq1ZmDsj//F0Tbr0tZDWg2
-blPTH17Ngy1XZsVGATDeUrfQN6UxHUp84AAKYkdDK/j4KPHq+i3lvem2BCNpsg5D
-N/IMZyf/OuYNxjnXABvMTW2WQGpjgD50lNLwml/96WFqIr0ZyVhy2gxIGJFfQ+c=
-=uCD6
+iQEcBAEBCAAGBQJRxQ3VAAoJEC1LWXx4YDenzusH/1PB5Vzl8eRACOvynXorfyyz
+s+nvHpwGTlnDvAqWHCyaiwRahcRz7hdMbZgFb6E4V1lyyyP+uBtFqC/aofnuOL4m
+WH2bNOQhumGpSwnfhYpGgUMKTy+XU4ih/o7cz9hddtf9nk6Lr3gwB0bwc+losaph
+P042slZpMFxz7SvrqEPXnO1DVN36q7uCMqSalAOgHEhtwva8M0UQeI+hz3l3Fypi
+eBFgWF9MvAHCB15USDtmPgbN0iDXqD9cmvCspXKmqk/Tmbb/wU1TkhofBEKJntiO
+Jf3/QBgyuTuNbrcx+dvJueAQ+uVclboxBRmecVXuXz1kMpzBHHBg+3+g+ZcjKPY=
+=NpFd
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-2.0.6-r4.ebuild b/net-analyzer/zabbix/zabbix-2.0.6-r4.ebuild
new file mode 100644
index 000000000000..a8f0ce0d89c7
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.0.6-r4.ebuild
@@ -0,0 +1,396 @@
+# 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.0.6-r4.ebuild,v 1.1 2013/06/22 02:37:02 mattm Exp $
+
+EAPI="2"
+
+# 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/_/}
+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 )
+	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[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.  Most minor version"
+		elog "zabbix updates do not require db changes. However, "
+		elog "you should read the release notes to be sure."
+		elog
+		elog "Have a look at /usr/share/zabbix for"
+		elog "database creation and upgrades."
+		elog
+		elog "Execute schema, images, and data sql files in that order."
+		elog
+		elog "For more info read the Zabbix manual at"
+		elog "http://www.zabbix.com/documentation.php"
+		elog
+		elog "New use flags: java, odbc, iodbc"
+		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 "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)."
+	elog
+	elog "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP).  We may"
+	elog "eventually create a seperate package in portage for them."
+
+	# 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
+				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_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
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			upgrades
+		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
+		dodir \
+			/usr/share/zabbix
+		insinto /usr/share/zabbix
+		doins -r \
+			database \
+			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}/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-${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
+}