Bump production to 1.8.10rc1 which includes bug and security fixes - remove very old releases from tree, some of which have known vulnerabilities.

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

3 files changed, 333 insertions, 15 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 830fee079dc5..ae0d975068ee 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2011/11/29 00:08:44 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.69 2011/12/16 23:14:31 mattm Exp $
+
+*zabbix-1.8.10_rc1 (16 Dec 2011)
+
+  16 Dec 2011; Matthew Marlowe <mattm@gentoo.org> +zabbix-1.8.10_rc1.ebuild:
+  Bump production to 1.8.10rc1 which includes bug and security fixes - remove
+  very old releases from tree, some of which have known vulnerabilities
 
 *zabbix-1.8.9-r1 (29 Nov 2011)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 316ed0c4259e..0a9f54459088 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -28,17 +28,13 @@ 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-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1
 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.5.tar.gz 4184672 RMD160 200e1cdddb0f7149c7cfb62237a46a563054f95e SHA1 655f5c7381139ec97d23df4cce0469e1e032c54d SHA256 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32
-DIST zabbix-1.8.6.tar.gz 4204545 RMD160 925b43dba17bdbeb3967b335c2da264bda09996f SHA1 03c8db65ce5a7face0c2357dc6dab5487231a768 SHA256 9e1b778c17f98b816324332675b910c9ce6e4d184c955b9cee82b6b25371a729
+DIST zabbix-1.8.10rc1.tar.gz 4216502 RMD160 784ed6822ee747a101998897e0d3c0056e1a6a36 SHA1 d1df03c76db7fe6285b806625e832f0b14c815fb SHA256 de3ef9985bfd5091823f2f84e6a7d8e25311d1da469ab9e5634e2040ddb253e1
 DIST zabbix-1.8.7.tar.gz 4211376 RMD160 7de7e7d90d6b08bc070a1f44c14c626c74fca429 SHA1 48a5d02ea127b7cab619187d3cbab33294f636ee SHA256 2d2929802b042a90bb91b9ca81aa4190a69b8fa67e10645353c739787df2479c
 DIST zabbix-1.8.8.tar.gz 4213181 RMD160 efaef4f3fcde09e5dd0ee2bea90db3a56f4dbc66 SHA1 3f98c6f8883340d49395a957b803a6dd3a7bd154 SHA256 25eded2536213cf1c75631f2becf46349b915dd8782698f5b2936f5abb7eeb99
 DIST zabbix-1.8.9.tar.gz 4209593 RMD160 448e12f4f9830a432fec4bad3ecd86f747bf2b91 SHA1 6101a0c3bef134573dd33e12e1ffee4a4227afe8 SHA256 de7a54c1e654825a863fece816f20272c816ea2f61652b1c6c2e1f1b24e00588
 DIST zabbix-1.9.4.tar.gz 5582992 RMD160 b08252a3ee7860b7239596bb95b7dcf4d08cf529 SHA1 17dba347592b1aee833dbb3f68b76556cb6a1f39 SHA256 2ebb6db448da9b8c4041e63af9ed45b53124a89b5a6e84b2ba842d0b6c36d954
 DIST zabbix-1.9.5.tar.gz 6321068 RMD160 ec607d019d926e44d4755afca331bef190386217 SHA1 c9d03641984409e6df829c8d3369dc6f9c50a942 SHA256 311b1756da32949c1d3ebaa17ee60eb364b8892b60290417cfa68a281e6834c5
-EBUILD zabbix-1.8.3.ebuild 8089 RMD160 1aa3f013fd2cfd6634f8ab9ae7aa2f8f76e0fb01 SHA1 09fe3f4133f27dd13ef8d0a02fc16d5fd5ed3fa4 SHA256 1f33735bd222f529a674a5cc5b0937fdbffbb7e88d986f916ec0acc16cae0980
-EBUILD zabbix-1.8.5.ebuild 8095 RMD160 162133bdef112f020cbdbde9fbca98c167a51c7f SHA1 0f1de7c331ff6e62663ee176465dcceb13f33025 SHA256 d605fbbfe6c477546f32d9dbe8c4a80bdaa54ecf7fed11f6a1d22b2043bc6cf7
-EBUILD zabbix-1.8.6.ebuild 8095 RMD160 276eb937318e85a48a4ce26f66474503e150a678 SHA1 3882ad6d854f437e76815e48fac5fb9dba16690a SHA256 1ebfd376b15cf093e522e2b5b5d288873de8c6a07c09d97801023b96f2490e99
+EBUILD zabbix-1.8.10_rc1.ebuild 8164 RMD160 c2a74554e5a53aeb0f9eac7d8ee184348c9c9ab1 SHA1 48d6c22ec581c697ea6a7b8d0b3a37560a6bfced SHA256 f62b28cd87cd9d02f962fa5347106155cb7359eebc2e28d55d3d7df93a21de77
 EBUILD zabbix-1.8.7-r1.ebuild 8145 RMD160 b449025a7834d74b516cf0afd824e471d712b506 SHA1 4c039f1f611c417665dc639fbfcdd4ea1966fa73 SHA256 f375ba8df4b0001a419a7af08f15f1455c11e94be88eb2cec38b9cbb44358e45
 EBUILD zabbix-1.8.7.ebuild 8096 RMD160 87d397d3856f1e440a0adebf3b78f93e366a2ae3 SHA1 264f579bba3f03885df8480939c657ad11dde894 SHA256 3199aa213ae6dd860865fd64bd17301bcb55f58298d2f6feddbd051e7576e23a
 EBUILD zabbix-1.8.8-r1.ebuild 8147 RMD160 4b16a3304bb3a913855baeca34307afc57131d5a SHA1 1e85f1019a2fd24f665409d4bd1141a68e6cb11f SHA256 1e26f528cc28791a2b69d3df48673d851c2dfd035e465c53a4b9f17f284a206d
@@ -47,16 +43,16 @@ EBUILD zabbix-1.8.9-r1.ebuild 8146 RMD160 de849ef8d0148b65454ed8da957fd381607ae5
 EBUILD zabbix-1.8.9.ebuild 8132 RMD160 59509d08e0c30bffa46d389f356332401eb20acd SHA1 850029d52cf2d41977b7c6151dc1692dc54938ac SHA256 b64f320d25c953a8f86a8e2459eb6a403f32011e80331a954974e48a82253adb
 EBUILD zabbix-1.9.4.ebuild 8091 RMD160 2c66f2c64f31923791ed9e1f5f1306e0f5b97df5 SHA1 b56cbffd741c1f6285c8f3ed626243701b683e3e SHA256 5b5eff01b956a9625b30af16fbea9e812fdc5c628c1219a18837c5b7c13f2749
 EBUILD zabbix-1.9.5.ebuild 8091 RMD160 791e1baa4f8f1fb696f057cc958a60406267ddd1 SHA1 95369c15a6f6219fdd1dcdd7879c1c5014ac1f83 SHA256 a3152587bc62a7b41bdc67dbfe327ddf1d0ebe0509eae418041de3aad0cc3ac1
-MISC ChangeLog 14068 RMD160 24e27a6c31eb18781ff8a2b7ed595a14988b1f89 SHA1 1a4bc52b969e7804a9348bf10d2c5f3e38d91f40 SHA256 293a502093d8adf12ba2a74e767928fcff98d92b52db85e2e289009cb819e93f
+MISC ChangeLog 14330 RMD160 5671b4c5cb0b15619e725ec4cad8e0ff635dde50 SHA1 ae2b9df02339b1f3e5cd31201ce93ba617ec3e94 SHA256 3fc7347412103dd2c5b07dfc806ea0a41ba4d92a6a31d42977b34eea11362b99
 MISC metadata.xml 990 RMD160 edaffb17a34b9015c48eaf1ae61ef676b9bfdf63 SHA1 1eb2d630b542283f5460a49327dc93fee2de5663 SHA256 b5f00181c6943bf7dc15acf9b7dd21453d7cc0402a55bb2385b3fc0de6520f6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO1CKXAAoJEC1LWXx4YDen6UMH/2r2Pkjvwku1F8n+ZSEK7x0R
-4ab4twCyy034j2jfGDA0O6zE02HV6C1b8RHxwRtCDZgo6+DDxaQY4LXYpVfwqNz7
-fKd2odtU/P5HTRBNgZgRo7MKMuUoM3gh/HAytr9fHvYu75fpHDMxf2Dw5pH6xlEA
-CnPEd4pQz4BZmgThKujfNNoykUy8RNcCQi5UxSfEVhXsmYG+O7nmAWltQqsXHbJ8
-rNsbn8W6aRtflJ4a4XogEfCOMwCKLEMOqDA4wU88ex5bgYO3uEcOJlcCTHjsBffF
-sWhentWGb7don3kAtMwP0S2XQykrwSvb9D7WDnghCLwwrLrSYp7KQetQvd9W9/Q=
-=eEUu
+iQEcBAEBAgAGBQJO69DkAAoJEC1LWXx4YDenozoH/3l9BfvZ/+ehaVjJLsBHXS+e
+k1e6CZFA9xxG5L6RD6qkIKWSoPWm5sVOEZGX0DAHYzrfJUQn9yfGFsgzmoPfxTcc
+skM+xKQn8I6kTfwQWEu5HkohHulmHA/Az/bYDzh7CNKFzeoZMIvndUuXp4VhdXiX
+z2VSpoLXIbzERjhkTv+U+1iCMHBfwSGKZgHFuRJNG+3TzDhAr0i7JNdWh7p6sfHM
+ZgIoZNRjHRTP0twcQGcCpHUgVMls3dyNDz0KNRA5eecTVAlqCbYL5D+loqUyP5RR
+jxG5yeJzGXG9WcL+1AxLzG7utkBwzfGrBu5WEIeA2SwORTGEaVOEmywF+FuAwVY=
+=uljh
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-1.8.10_rc1.ebuild b/net-analyzer/zabbix/zabbix-1.8.10_rc1.ebuild
new file mode 100644
index 000000000000..d08e9fa458cf
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-1.8.10_rc1.ebuild
@@ -0,0 +1,316 @@
+# 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.10_rc1.ebuild,v 1.1 2011/12/16 23:14:31 mattm Exp $
+
+EAPI="2"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit eutils flag-o-matic webapp depend.php autotools
+
+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 +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 )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	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,truetype,xml,session]
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+use frontend && need_php_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8.9-as-needed.patch"
+	eautoreconf
+}
+
+pkg_setup() {
+	if use server || use proxy ; then
+		local dbnum dbtypes="mysql oracle postgres sqlite3" 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
+
+	# 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() {
+	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 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
+}