Bump for Zabbix 2.0! Everyone go wild! Also, some minor init script and elog msg updates.

(Portage version: 2.1.10.62/cvs/Linux x86_64)

5 files changed, 41 insertions, 415 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 9b8527f4f03a..37787c4b986c 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,14 @@
 # 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.96 2012/05/21 09:15:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.97 2012/05/22 11:34:02 mattm Exp $
+
+*zabbix-2.0.0 (22 May 2012)
+
+  22 May 2012; Matthew Marlowe <mattm@gentoo.org>
+  files/2.0/init.d/zabbix-agentd, -zabbix-2.0.0_rc6.ebuild,
+  -zabbix-2.0.0_rc6-r1.ebuild, +zabbix-2.0.0.ebuild,
+  +files/2.0/init.d/zabbix-server:
+  Bump for zabbix 2.0 plus minor init script and elog msg updates
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> zabbix-1.8.11-r2.ebuild:
   x86 stable wrt bug #414551
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
index 2a92bc01b814..294881238c2c 100644
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.1 2012/05/18 05:31:08 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.2 2012/05/22 11:34:02 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
 
@@ -14,7 +14,7 @@ depend() {
 start() {
 	ebegin "Starting Zabbix agent"
 	start-stop-daemon --start --pidfile ${pid_file} \
-		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
new file mode 100644
index 000000000000..7aad616a51a1
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.1 2012/05/22 11:34:02 mattm Exp $
+
+depend() {
+	need net
+	use mysql postgresql
+}
+
+start() {
+	ebegin "Starting Zabbix server"
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Zabbix server"
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
+	eend $?
+}
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc6-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.0.ebuild
index 3ec2f34cc355..29fe0688da07 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.0.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_rc6-r1.ebuild,v 1.1 2012/05/21 04:42:08 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0.ebuild,v 1.1 2012/05/22 11:34:02 mattm Exp $
 
 EAPI="2"
 
@@ -128,9 +128,13 @@ pkg_postinst() {
 		elog "Have a look at /usr/share/zabbix for"
 		elog "database creation and upgrades."
 		elog
+		elog "Execute schema, images, and data sql files in 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}" ] && \
@@ -174,21 +178,17 @@ pkg_postinst() {
 	elog
 	elog "Zabbix will be officially supporting database upgrades from"
 	elog "2.0.0rc3 to the final 2.0.0 release when it is available."
-	elog
-	elog "Upgrading from rc3/rc4 to rc5 also requires db update."
-	elog
 	elog "At some point, there should be some support for upgrading from 1.8.x"
 	elog "to a 2.0.x release."
 	elog
-	elog "Upgrading from all previous 1.9.x or 2.0rc releases is not unsupported."
-	elog
 	elog "Note that this is the first gentoo ebuild for 2.0.x and likely"
 	elog "will need further tuning with bumps/revisions as bugs are closed."
 	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
+	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
@@ -291,7 +291,7 @@ src_install() {
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
 			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
 		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-server
+			"${FILESDIR}/2.0"/init.d/zabbix-server
 		dosbin \
 			src/zabbix_server/zabbix_server
 		dodir \
diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild
deleted file mode 100644
index e93f05b3ac63..000000000000
--- a/net-analyzer/zabbix/zabbix-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,403 +0,0 @@
-# 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_rc6.ebuild,v 1.1 2012/05/19 03:45:29 mattm Exp $
-
-EAPI="2"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit eutils flag-o-matic webapp depend.php autotools java-pkg-opt-2
-
-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 )
-	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 )
-	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]
-		media-libs/gd[png]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-use frontend && need_php_httpd
-
-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() {
-	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 "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 "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
-	elog "Zabbix will be officially supporting database upgrades from"
-	elog "2.0.0rc3 to the final 2.0.0 release when it is available."
-	elog
-	elog "Upgrading from rc3/rc4 to rc5 also requires db update."
-	elog
-	elog "At some point, there should be some support for upgrading from 1.8.x"
-	elog "to a 2.0.x release."
-	elog
-	elog "Upgrading from all previous 1.9.x or 2.0rc releases is not unsupported."
-	elog
-	elog "Note that this is the first gentoo ebuild for 2.0.x and likely"
-	elog "will need further tuning with bumps/revisions as bugs are closed."
-	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
-	# 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_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 \
-		/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
-		insinto /usr/share/zabbix
-		doins -r \
-			database \
-			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
-		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 \
-		/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 \
-		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-2.0.0rc3.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}/
-	   	src/zabbix_java/settings.sh \
-		src/zabbix_java/startup.sh \
-		src/zabbix_java/shutdown.sh
-	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
-	fi
-
-}