Fix for CVE-2013-1364, and upstream bug #ZBX-6097. Bumps 1.8.16 and 2.0.4-r1.

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

6 files changed, 115 insertions, 494 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index cca339ba0528..115dcb0efd40 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.111 2012/12/27 02:55:43 mattm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.112 2013/01/18 18:51:53 mattm Exp $
+
+*zabbix-2.0.4-r1 (18 Jan 2013)
+*zabbix-1.8.16 (18 Jan 2013)
+
+  18 Jan 2013; Matthew Marlowe <mattm@gentoo.org>
+  +files/2.0/patches/zbx6097.patch, +zabbix-1.8.16.ebuild,
+  +zabbix-2.0.4-r1.ebuild, -zabbix-2.0.2-r1.ebuild, -zabbix-2.0.2-r2.ebuild,
+  -zabbix-2.0.4.ebuild:
+  Fix for CVE-2013-1364, and upstream bug #ZBX-6097. Bumps 1.8.16 and 2.0.4-r1.
 
 *zabbix-2.0.4 (27 Dec 2012)
 
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e1ba983b403b..ba17c9b2be28 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -26,26 +26,26 @@ AUX 1.6.6/zabbix_server.conf 3945 SHA256 884ed1002a6f7130f90695f3e113efaf3c7ab82
 AUX 1.6.6/zabbix_trapper.conf 767 SHA256 10c94e2b4e93dfc67fa56156d5227ee91be68e7d8feb5a7d77b164dd1fbe86bc SHA512 4228b01eeca06596f0f662b8f2a85cc4d16acb81e3f07318ae9f7faa0b8fadba994caca1b75816e1fe131041fa0edac80f49834e5f0162634928bf8738b455bd WHIRLPOOL 1625e82a06d7b84e0a436688f8d56f9337481a98da816a7b61ae08f57687b7a18fba4645e27461aca1ff687fae345bc9ba4e23d309ef2c2709a3ae8cd743fb34
 AUX 2.0/init.d/zabbix-agentd 738 SHA256 dceeab67a218af591a5605a9f0ef055757d378e9a35690405b2ca7e34928387c SHA512 a25a9cc484fb4f7ca39dc5c7cd9383ab80521cd50ab1ae51b8f63fa26f89077d30295c5b8b811fb6feb8e213167b1ccd37d42239855a5632e5658e11ebca3067 WHIRLPOOL 385d0268e8b7b7adab69c84955133094dbad34a6a08182d4fef48c5e8702fa8858ffa5c391999724d294dbc3c7d438489f5e8e3b1a704773ad4504c423a5ab6a
 AUX 2.0/init.d/zabbix-server 727 SHA256 6d58a5dd804fad0fde3eefbefc1f8c7def66d3cf34130ce1f6dffe020607d6b3 SHA512 11eb7d74b052081a789f95e2c9ab2d5654c7bf0e07fe5c55d2a051f7dac67f7eacb4a22cb941a6e423bb5a1ccf63ed959c661acadf33e54c71f8f0a82a6ccaa1 WHIRLPOOL b10f6f242f9105e27f242a6d9b959ff050df1e95b5cdb0a3ec60a93e9d94c50f978743de96649eb0481b3c030695eef2a39f2160df7254cfecf0e87d14abc5dc
+AUX 2.0/patches/zbx6097.patch 2383 SHA256 93c882b46431fa4dd78c5e48b2f238bd2e24359e547b513d40e8bb6b808c81bd SHA512 2fd4445821981afd379d86a3cc541c5ba4e1f83497fbe4ee96daeafc17f1489fa731dc8400c3f73375f96180e015752f72daa088d0bc8b5406ba337a49d11be8 WHIRLPOOL 4d9fd7214b8f4d6107b31bb15b48d8f070c1c481ad999cda6836c251d3bf6dfdca397d1d1b25828d3c345d6aa61e7bd85060b37760fc3b54eda8f9bf3d2ae080
 AUX zabbix-1.8.9-as-needed.patch 2737 SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1 SHA512 9ba379e8088697f26f29ac31f2c5e8cad8e0709993285afe9e390f63150ec09fab46089e3f29f2d6a818bf55042c39646ce19840498355fd6df43b1834c6078d WHIRLPOOL bc4728cf9e14284b91b45627090e45d39f53a721ba46d9379418d650d22732994bec11046d64d0f0136932d4f4e2f0c29de68f527db9d9f765f0245f1d39288f
 DIST zabbix-1.8.15.tar.gz 4241782 SHA256 6ee4014dec29652ceba472f8973b267047e5d0599a729e24a266b26dbad7a80c SHA512 7daf81160778c74be29e6f37949713ecd1e920b396c1aed2bfd06248a61aba47b6e53a463d2ea405201e713d17028f5e1f36d6b95dc3402a8658d62a50a26a9c WHIRLPOOL 7845e918eeeaf0ab440f36fcb968840a58a7a477247dbae5e0335da9a4c42dd9b6c8268266c1e62bc91de991a2bb59624d084a3a87c11dbd04538eedd18f03e7
-DIST zabbix-2.0.2.tar.gz 12070505 SHA256 2db56e4fc291f5469584844703f6815fe739c3b33b4c2d5854285a780650cfbb SHA512 8f0e4e6c37614da91af2a6ebdf713332624fecb78f05c8941be4aa8aac70df745c2842ea91986333a3964e98634c648ebdf001cab623fee01f8d7962077af5dd WHIRLPOOL be2ade6661e4ee06234805598870b06f096aea1f4c34379c36d0f7683b606bf6fe6c3b44564174e6c2e8a55b383d18ed64edfe00031aabb16c3bf2fb2c7877c0
+DIST zabbix-1.8.16.tar.gz 4236089 SHA256 a2d4da8d8772aa0b52214739a1aab59dba8cd7e358e769bebbc93867409b310b SHA512 85c9bcef7f64c398e162de901645d3ac4a4013aff31ca4219d2850931a0ec2f0458f8dfa37ee2d71977e233f6d876b8246db96ddbf73a6465439e0915d306420 WHIRLPOOL c6b66f93bcabe33b7b12786b407183db09228ff4972888087c2f0dd87fd0408783a2dca36b0fbaec78047cb69478be05b25d8ad1bed41211c0aba95aa561b1fe
 DIST zabbix-2.0.3.tar.gz 12329606 SHA256 b6febeab76e6af3efdc124bce1bb51a30651babcf41f2d22fe428ff69ab3f764 SHA512 3e12cb738ebc5dbc25b6fe4a09e23933691e60a2477d46908dea4bfbe7778682385b8f8d0128e5c7ba96ea647bbabc89ebaf5103c0f8801b39c80638b22c0ab5 WHIRLPOOL 81efa76d71bccbea05dde6bdb587b6de61ee3d6eee0895ad4378977b729e55ba39afc4d24908bb9b7e3ab5aa5afc300a6f810f14ee78a2a656bfc5a9f69b3f15
 DIST zabbix-2.0.4.tar.gz 13045480 SHA256 7554223a927229b6317d211d413826fb0b2a974f460a9db9075b376a241a0051 SHA512 94824bfe933374fee8d7b292e24de9e9be09e041738c2ecb07f27bdc00ffdd6a6d091802b5daff59c75945de89423dd2e6d224ab2aa973a1a2013f036229dd80 WHIRLPOOL b685e40f355b1e465208c32420aab4c30f51865a6b6c2cbb68e1f196b5fdc32dcc965fa20bbd4d7f6a108d5d21d1a4fa470642fbd481dc46e54385435b51b760
 EBUILD zabbix-1.8.15.ebuild 8587 SHA256 996f7bc9eadcd646eaf381025ca8e47cb8b83e0f8c884e0209f3f51bbff832c4 SHA512 9a2bd922365cbabe37e212eed91f7173ad5169c833c0485bf4f55b0565ba1417e0cfe008900da9fcf57c1f6dca029d12586cdce8165eee1f24cd9a99f124a6d7 WHIRLPOOL f509333e9fcfed1bff20cc9f0fc6dc8272d0091723069437a24e832047f0ddf9aa9166de302b9a55bc0b60da0f9c954cc71e6fa32ed9035a0e341508c7f9b183
-EBUILD zabbix-2.0.2-r1.ebuild 10445 SHA256 c2535527e865a663799ec26b02a5392db4618b9e97187ab9129d81fc8ffc7c02 SHA512 690d28d429aa6fe537596433f1b8ed3d2f20ea456d89f3311cf69580786ab4f39067657eb8f7fce54c03c622a75d041f81df114c7d07c69770a93f5daa62ac5b WHIRLPOOL b4182c469d4ab1906bf02568905f2e925da0f3c62d79f87aadac544c00dfdad9686a8b073a0c34318380b45e98f1b7ffd8e3902002a5cf9ccbf5aaf485234c5d
-EBUILD zabbix-2.0.2-r2.ebuild 10497 SHA256 5e9c2c7c1f948b0dac29f1030331b84299f0e360d1b0f8a07645759c28db6841 SHA512 e812a6a35eeb2e0b89d6278b0b62c46e2fe4313d7f19d322f4a5d3e49b242a836aed8fe99221093297e584d767d990f1865d39ce4a685234b861c1705ce004a5 WHIRLPOOL c229d4c65a83164b6255f983d65b69a75ff34548cfb1fe626cba0b54079885fc3232538065707a606a017f35ee955e6263984f54c3bffb875f21df1c2c6ad13d
+EBUILD zabbix-1.8.16.ebuild 8591 SHA256 ab45ba5a3d7f0cd1bf01610c4b4c6b45e558375df38f9eea41077fead557ed75 SHA512 9e555591136003cb765da65ee3565974038147dfbe698f0a49f3fc93de0efbddc2e5e768ef092b2a9315313ce563d60eb2d1c2caff261bd554c7845855be6894 WHIRLPOOL 0e1370bffc022aede52c11250cd1be7f9d4ffaca9605f2e5b881b716de56dec039e4f0c3864d3f93126aa0095bbdf8190ae56dbf65e09ddfa2540bc635b3567f
 EBUILD zabbix-2.0.3.ebuild 10494 SHA256 407bc9804a06257726ef2bcb3725d72ddc47a65bdeee5b35abda12a4a068fb65 SHA512 92b59c3a2ac3fcacfdda1533eca38a0a9f86163201c2a9b1d477f4bf46f7f345cb3febfb0e84e35d4748bd1e8a0f01608a126d73254b09aee3e394706d155420 WHIRLPOOL 74aaa200aaf42fe8e31fefa231cce770664da7578a3f1ae51fbf28a19c835503a5726cae6bf9807775208d594b031f530fe6c85f3f69ee6bc853ca42b79992a8
-EBUILD zabbix-2.0.4.ebuild 10345 SHA256 16dff683b1c462cb86453aca38fd08fa8d60b81f08227efaeb3ed4c0ac518a06 SHA512 bec113a79fdd8791869a6531fe54d5adf94d2c78229f362cca17280ed3cefa2e04f6f9b755d34bd1e19116509fc304d12eaac11b5990c1d111052b152f54cd62 WHIRLPOOL a229edae1edccf9900c757e13bb91d680775479792ca25c919657210d0eaa0b01db22a0093256329281741669a3cfce03ce0aea0aafb7b6269dafe51cad86331
-MISC ChangeLog 26779 SHA256 a428b8ea208e2ac87ae59e891a541f818ee9d93b01f86c0f81dc238eb347fc20 SHA512 1de6695baedd69db24b61474e6bf9580f0203552dea0295fcf719463ed7546e1fd5290a39e93a6b28a0e308e9576f4b0ca62e36a449770a5939ad5ddc6fad0f2 WHIRLPOOL 521344126b448be7cebd51f148050bd7924559b42c5bfcab14ab7685e2598c7093f53df552f23ae82cf6c7f192b0f205882d963d436d207333b7f9c9ee21fc52
+EBUILD zabbix-2.0.4-r1.ebuild 10396 SHA256 3dce7037030ab04f64ebdee92a1e784fb08952df942e96855373f85006f23565 SHA512 84f796fc4d91557b9a5bb074f43972233a0d722288b9c9d466d39bfd31a1ec068c6e980a6b9d830f7feb421d5bb885e597903c635096daf7d5da4c40b31efb2f WHIRLPOOL 02f32f32db5a7762f790a5c3911a4e79bf3579c5adcb74a9ff640d45e8b7b8cf698b6cbc12cebf6e3e5acd709044bbdee24d933f3097f7b78ecfaf20150567dd
+MISC ChangeLog 27131 SHA256 84c41adaf56b79f412ee9d27223a045652d8269cda6c595537f76ebc9659a95d SHA512 d48a78e789c171c26257cec321f7d40f7ff07551e33194778bccf6cf21247a4287c1a8fa3bd4fb45691d7f94aedfb1d7d3b7f2b1959f33bb966cd0fb71e11ced WHIRLPOOL 8b4acf5629c57ef0a6474846f24bc50c9b78d31229f80c1c2f3ac306249a86f02c639af58d09b3727a6666ea43603bf8bdd886a5ed77cd55ff42b3fd0727a1b3
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ27i3AAoJEC1LWXx4YDengEwH/0kw4EntuQX3MNtN0KZUy1KG
-gDXgKjMjlhdPZDnkMqxCaG52GiOLHrUBzrztLSIJBpFXrjUK9OPRapafCCCXVpjq
-zXwJ+oOMua0qI2qBvkPMf7fnH1/u+qQIMcCQUvdDrapUq+N5mmPE6cKw+7MBIE27
-bphNans/NU8iLEytuiZQm9JxbHZhKhZHj8LplU36MxR9oSoRCQxMTsyH8HQAsAMb
-S0wh6OTJ1R+CCoUSAm74CUlnl0BgrusNf9s7DC0SwRLD58Bseo3UPg/kcJswGcHM
-V2MNgQNEdAYud871ShBb0An8j5sWlgUdL8x4FOTeRpP/nZ0Hkk6Fb/4OrtcrG9k=
-=Dr4y
+iQEcBAEBCAAGBQJQ+ZnTAAoJEC1LWXx4YDenCPMH/3CYQJ3JQtq+EkCeqZ+kVP30
+IaoAn2MC4U3/+JYUQ2csUY/jJ5PloSPIUkTV4Cr8nPcJ1tnmtAgc7w/RcyEgVvnl
+Tr5JFbGawe5b8TBFWbbH4iNL1181Spn2WuUTNOWYAKQFtBgfI6U7dpyaNi1Kbxr9
+7P29N1OtMnhHlqlGxeKgYGOe67tgOzVBEINrcCQzG1N6FOC4wPI7BMH4ZsMB0CwV
+vToVfXoR+L1PYowlHD62UXjkdlfYRzJPb6b/ZWMNlOZSjlvCxidVeoyMFCCRpaBT
+yvtP6Ck6XCS1qvlZn2s2Csk4h6cMSIm25dxGpRfXnQquO0qkM5iNIMhT6yjucZQ=
+=deka
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch b/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch
new file mode 100644
index 000000000000..65d92a873f8e
--- /dev/null
+++ b/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch
@@ -0,0 +1,66 @@
+Index: frontends/php/authentication.php
+===================================================================
+--- frontends/php/authentication.php	(revision 32376)
++++ frontends/php/authentication.php	(revision 32393)
+@@ -101,12 +101,11 @@
+ 			$config['authentication_type'] = $_REQUEST['config'];
+ 
+ 			// check login/password
+-			$login = API::User()->ldapLogin(array(
+-				'user' => get_request('user', $USER_DETAILS['alias']),
+-				'password' => get_request('user_password', ''),
+-				'cnf' => $ldap_cnf
+-			));
++			$ldap = new CLdap($ldap_cnf);
++			$ldap->connect();
++			$login = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', ''));
+ 			if (!$login) {
++				error(_('Login name or password is incorrect'));
+ 				throw new Exception();
+ 			}
+ 
+@@ -129,12 +128,13 @@
+ 	}
+ 	elseif (isset($_REQUEST['test'])) {
+ 		// check login/password
+-		$result = API::User()->ldapLogin(array(
+-			'user' => get_request('user', $USER_DETAILS['alias']),
+-			'password' => get_request('user_password', ''),
+-			'cnf' => $ldap_cnf
+-		));
++		$ldap = new CLdap($ldap_cnf);
++		$ldap->connect();
++		$result = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', ''));
+ 
++		if (!$result)
++			error(_('Login name or password is incorrect'));{
++		}
+ 		show_messages($result, _('LDAP login successful'), _('LDAP login was not successful'));
+ 	}
+ }
+Index: frontends/php/api/classes/CUser.php
+===================================================================
+--- frontends/php/api/classes/CUser.php	(revision 32376)
++++ frontends/php/api/classes/CUser.php	(revision 32393)
+@@ -822,15 +822,12 @@
+ 	// ******************************************************************************
+ 	// LOGIN Methods
+ 	// ******************************************************************************
+-	public function ldapLogin($user) {
+-		$cnf = isset($user['cnf']) ? $user['cnf'] : null;
+-
+-		if (is_null($cnf)) {
+-			$config = select_config();
+-			foreach ($config as $id => $value) {
+-				if (zbx_strpos($id, 'ldap_') !== false) {
+-					$cnf[str_replace('ldap_', '', $id)] = $config[$id];
+-				}
++	protected function ldapLogin($user) {
++		$config = select_config();
++		$cnf = array();
++		foreach ($config as $id => $value) {
++			if (zbx_strpos($id, 'ldap_') !== false) {
++				$cnf[str_replace('ldap_', '', $id)] = $config[$id];
+ 			}
+ 		}
+ 
diff --git a/net-analyzer/zabbix/zabbix-2.0.2-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.16.ebuild
index 814a3c0f3b80..24293d3630f9 100644
--- a/net-analyzer/zabbix/zabbix-2.0.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.8.16.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2-r1.ebuild,v 1.1 2012/08/01 22:27:49 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.16.ebuild,v 1.1 2013/01/18 18:51:53 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
+inherit flag-o-matic webapp depend.php autotools user
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
 HOMEPAGE="http://www.zabbix.com/"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~x86"
-IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp sqlite iodbc odbc static"
+IUSE="agent 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? (
@@ -24,15 +24,14 @@ COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
 		=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 )
+	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 )
@@ -42,13 +41,7 @@ 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]
+	frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session]
 		media-libs/gd[png]
 		app-admin/webapp-config )"
 DEPEND="${COMMON_DEPEND}
@@ -56,18 +49,6 @@ DEPEND="${COMMON_DEPEND}
 
 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
 }
@@ -120,21 +101,14 @@ pkg_setup() {
 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 "You need to configure your database for Zabbix."
 		elog
-		elog "Have a look at /usr/share/zabbix for"
+		elog "Have a look at /usr/share/zabbix/database 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}" ] && \
@@ -167,7 +141,7 @@ pkg_postinst() {
 
 	elog "--"
 	elog
-	elog "You may need to add these lines to /etc/services:"
+	elog "Add these lines in the /etc/services :"
 	elog
 	elog "zabbix-agent     10050/tcp Zabbix Agent"
 	elog "zabbix-agent     10050/udp Zabbix Agent"
@@ -177,9 +151,6 @@ pkg_postinst() {
 
 	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
@@ -245,11 +216,10 @@ src_configure() {
 		$(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 postgres pgsql) \
 		$(use_with oracle) \
 		$(use_with sqlite sqlite3) \
 		$(use_with jabber) \
@@ -282,15 +252,15 @@ src_install() {
 			"${FILESDIR}/1.6.6"/zabbix_server.conf \
 			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
 		doinitd \
-			"${FILESDIR}/2.0"/init.d/zabbix-server
+			"${FILESDIR}/1.6.6"/init.d/zabbix-server
 		dosbin \
 			src/zabbix_server/zabbix_server
 		dodir \
-			/usr/share/zabbix
-		insinto /usr/share/zabbix
+			/usr/share/zabbix/database
+		insinto /usr/share/zabbix/database
 		doins -r \
-			database \
-			upgrades
+			upgrades \
+			create
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf
@@ -308,10 +278,10 @@ src_install() {
 		doins \
 			"${FILESDIR}/1.6.6"/zabbix_proxy.conf
 		dodir \
-			/usr/share/zabbix
-		insinto /usr/share/zabbix
+			/usr/share/zabbix/database
+		insinto /usr/share/zabbix/database
 		doins -r \
-			database \
+			upgrades \
 			create
 	fi
 
@@ -321,7 +291,7 @@ src_install() {
 			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
 			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
 		doinitd \
-			"${FILESDIR}/2.0"/init.d/zabbix-agentd
+			"${FILESDIR}/1.6.6"/init.d/zabbix-agentd
 		dosbin \
 			src/zabbix_agent/zabbix_agent \
 			src/zabbix_agent/zabbix_agentd
@@ -351,13 +321,7 @@ src_install() {
 		/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
+	dodoc README INSTALL NEWS ChangeLog
 
 	if use frontend; then
 		webapp_src_preinst
@@ -368,28 +332,4 @@ src_install() {
 			"${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
-
 }
diff --git a/net-analyzer/zabbix/zabbix-2.0.2-r2.ebuild b/net-analyzer/zabbix/zabbix-2.0.2-r2.ebuild
deleted file mode 100644
index d6267ba89c70..000000000000
--- a/net-analyzer/zabbix/zabbix-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,395 +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.2-r2.ebuild,v 1.1 2012/10/02 05:34:04 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
-
-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 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() {
-	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 \
-		"${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}/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}/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-${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
-
-}
diff --git a/net-analyzer/zabbix/zabbix-2.0.4.ebuild b/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild
index da2ebaacafcf..eba2839a9c38 100644
--- a/net-analyzer/zabbix/zabbix-2.0.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2012/12/27 02:55:43 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.4-r1.ebuild,v 1.1 2013/01/18 18:51:53 mattm Exp $
 
 EAPI="2"
 
@@ -68,6 +68,7 @@ java_prepare() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/2.0/patches/zbx6097.patch"
 	eautoreconf
 }