Bump for #351312

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

3 files changed, 321 insertions, 2 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 4fff383efd0e..d7ba8cda45f7 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.39 2011/01/16 11:30:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.40 2011/01/16 12:27:33 patrick Exp $
+
+*zabbix-1.8.4 (16 Jan 2011)
+
+  16 Jan 2011; Patrick Lauer <patrick@gentoo.org> +zabbix-1.8.4.ebuild:
+  Bump for #351312
 
   16 Jan 2011; Patrick Lauer <patrick@gentoo.org> zabbix-1.8.3.ebuild,
   +files/zabbix-1.8.3-as-needed.patch:
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 0e03cdf92aa6..1022c1afddb0 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -25,6 +25,8 @@ AUX zabbix-1.8.2-as-needed.patch 2328 RMD160 8a69c4b6267c0e280e0135bbd13915b5d02
 AUX zabbix-1.8.3-as-needed.patch 2623 RMD160 a29c220a61686296a03171fe8ef81a559f12a65c SHA1 db14bd8794331f4f15987a9343e6fbb8d6284a0c SHA256 ad9083833a44d2e729b285e485982bc0f5e4b3e7de97035255a0ec1a2828a9b1
 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29
 DIST zabbix-1.8.3.tar.gz 4106152 RMD160 f0d54c1cd8865c952945a8ec3958e7ebdd9a92d5 SHA1 68f5d1f12897bc69c6ff5deea2bad82b0c1f5761 SHA256 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c
+DIST zabbix-1.8.4.tar.gz 4123814 RMD160 647e157a59fc55ec903ca5be027eb07b6efe8a10 SHA1 b70a31a39d7f54f32a3d6956594c2bfc4fd1e0e4 SHA256 0cbb237e2524631c4c849f4f19a67ef57e42025d651e213ef0cda48cf823163a
 EBUILD zabbix-1.8.3.ebuild 8080 RMD160 4f75e6e7b4852da9006dfc3369291a46a6dcb724 SHA1 901be9264742a30375d509247028889becc2d8ed SHA256 9771ee96ba3dc12d76705f8134ad69786ad075b61a07e7e0b1ddc5c682f3d117
-MISC ChangeLog 9317 RMD160 3ff8ec05185b47756a9b48f8c86fffa568af80c7 SHA1 696ce8072b6f71e1efd82044dbfdbccbfa359b61 SHA256 58db1f2777c39d2ce774652af42dca3606042db83bc6fb3139e0efb55f5eb85d
+EBUILD zabbix-1.8.4.ebuild 8090 RMD160 4e9e8f8ac53edabeeb519559710b5db0e8933171 SHA1 1fef972ae510b4126ce7ad47314ff607723a9355 SHA256 0003d5d7a219d51fac152a6318497cd7589fd2cf9db5a42d9df325966db3a269
+MISC ChangeLog 9438 RMD160 f625670c0694690d42e5a6bd7c23434f47edd8c4 SHA1 4f79d88d6035409278d89de93c50ccce97e63fe7 SHA256 7f719a5208e36f31895d1251a10d2ccd4cd068a9a4fcf50ad0b10823b3ffc809
 MISC metadata.xml 923 RMD160 4318cea3643c9523c0bf71913d355b31954d079b SHA1 0a121546e57330503091d4c29f03de07d54f578f SHA256 1f7a69cb4461cebb0f1bc62c1a91167a2e69dc9c3640c8c4eb9488643f154c23
diff --git a/net-analyzer/zabbix/zabbix-1.8.4.ebuild b/net-analyzer/zabbix/zabbix-1.8.4.ebuild
new file mode 100644
index 000000000000..25893c4d44d9
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.8.4.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.4.ebuild,v 1.1 2011/01/16 12:27:33 patrick Exp $
+
+EAPI="2"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+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="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="agent curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server -ssh snmp +sqlite3"
+
+COMMON_DEPEND="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? ( dev-db/postgresql-base )
+	jabber? ( dev-libs/iksemel )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	frontend? ( dev-lang/php[bcmath,ctype,sockets,gd]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	jabber? ( dev-util/pkgconfig )"
+
+useq frontend && need_php_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8.3-as-needed.patch"
+}
+
+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
+	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_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(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) \
+		$(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 useq 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 useq 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 useq 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 useq 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
+}