Bump for Zabbix 2.0.1_rc2 which is currently masked. If no major bugs reported, will release into testing arches soon making the 2.0.x releases ~arch while keeping 1.8.x releases in stable. Also, minor mysql socket file path update in default config files to fix bug 377241 which has been waiting patiently for closure.

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

6 files changed, 32 insertions, 16 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index bf39b34143a8..9e02b5b38b11 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,17 @@
 # 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.99 2012/06/12 03:55:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.100 2012/06/20 20:11:59 mattm Exp $
+
+*zabbix-2.0.1_rc2 (20 Jun 2012)
+
+  20 Jun 2012; Matthew Marlowe <mattm@gentoo.org>
+  files/1.6.6/zabbix_proxy.conf, files/1.6.6/zabbix_server.conf,
+  files/1.6.6/zabbix_trapper.conf, +zabbix-2.0.1_rc2.ebuild:
+  Bump for Zabbix 2.0.1_rc2 which is currently masked. If no major bugs
+  reported, will release into testing arches soon making the 2.0.x releases
+  ~arch while keeping 1.8.x releases in stable. Also, minor mysql socket file
+  path update in default config files to fix bug #377241 which has been waiting
+  patiently for closure.
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> zabbix-1.8.10-r1.ebuild,
   zabbix-1.8.10-r2.ebuild, zabbix-1.8.11-r1.ebuild, zabbix-1.8.11-r2.ebuild,
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index e4334a994779..3b22c8f89ae6 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -21,9 +21,9 @@ AUX 1.6.6/init.d/zabbix-server 563 RMD160 ae69bd294ef0246a884293446c0a149b237995
 AUX 1.6.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f
 AUX 1.6.6/zabbix_agent.conf 1121 RMD160 09c6842c9846b5506ebeef7bea6f596e875b9a9f SHA1 64a513652d2cd7e764db67a4dde519499e554cd2 SHA256 0bbeabf0a3b9a7a3a2c71d384d785c9c1b9da420e1fb46445a15ce952d6c7790
 AUX 1.6.6/zabbix_agentd.conf 2526 RMD160 0b4a81a0efce31c09423d0f11a674f83c42aba7c SHA1 a6cb66c2b07fd6d4a309bc46e81459260f57fcb2 SHA256 78d16e30d210f7790797312462b3abf713125f7ca18f6ecb39e7458f6e9990ef
-AUX 1.6.6/zabbix_proxy.conf 4527 RMD160 0d8e266731808eed69c64e02bc5fae9068ce4f6c SHA1 c533ec42dd4f042ba7e39706bb258a743d2237b8 SHA256 6626de0c5c4199696b8ea8d2b4c6faf59ee3223ce25e41c43269f6b850bf644e
-AUX 1.6.6/zabbix_server.conf 3933 RMD160 7e0cfe262911d5a42ce590071e2852ec8d76e8ba SHA1 909836c361b2f6ee42629141f9e7678aeeb1aadb SHA256 e44defbf4036476707c8c7d1268df45117df263b188b268fb5e52931c9895ffe
-AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
+AUX 1.6.6/zabbix_proxy.conf 4539 RMD160 5d8cdc9c644fe9832557c734531ac56a0bd335a5 SHA1 0ae7e628de25959ea5617d1209495fc7784a67c5 SHA256 d2f96ffab6e88d3c6c54b39cc2b0b55dceb5d66d6a703489a30a88672edccdc4
+AUX 1.6.6/zabbix_server.conf 3945 RMD160 4a1f0aa2a019bfc45a5b7ce467a00999a32e4f70 SHA1 b32cc332ee276e9f221565fada1803e77c60a49c SHA256 884ed1002a6f7130f90695f3e113efaf3c7ab82f3bf6c9a8f9e22e2f7025aff6
+AUX 1.6.6/zabbix_trapper.conf 767 RMD160 a3e86b95a5b39d0042fb954c66d358b89f34aa1b SHA1 8ca16ac0453c117d62b5a5a84dbc7a2a155774bb SHA256 10c94e2b4e93dfc67fa56156d5227ee91be68e7d8feb5a7d77b164dd1fbe86bc
 AUX 2.0/init.d/zabbix-agentd 666 RMD160 c2d8426ad1442e61a6e128691b1abfa8405bed12 SHA1 0cf9f5e934351aac0eb6532fbe012dcaa1c1a170 SHA256 e6472d4a9805ebe44462a397839a06560a8b06146368cdb3d49397d37b6cdb94
 AUX 2.0/init.d/zabbix-server 598 RMD160 c584152f4d40ccdc9aded4b57bb24e13695565de SHA1 f6809b1a50f9634f80d9a33670527d6e5a6819bd SHA256 4d17f4966513c068b6097125d0ae34a371fbd4edbea3b1c52c1b0620e2cac19b
 AUX zabbix-1.8.9-as-needed.patch 2737 RMD160 ddeb918ac3f4b297810da105cf2a4cfaa4268fd1 SHA1 278fe59122a90a4b8ccc26e1d722ee107c1e91fb SHA256 1c9b85c0a9d9161f983a590df387341c5168f254deb9f2cf858886a2e6e8aec1
@@ -32,6 +32,7 @@ DIST zabbix-1.8.11.tar.gz 4224738 RMD160 d2e8749a43b0846a7bc93a21c6546dad0d66b67
 DIST zabbix-1.8.12.tar.gz 4229589 RMD160 0adae9942d32d5d53396f457235414ad0bc40862 SHA1 fd388813e9b78c6357ad30d771d385ec6cd2476d SHA256 8ea52df75c5f5d31ede3c1807a679808bc257b587ddec1759b22dcc9da722fe7
 DIST zabbix-1.8.13.tar.gz 4235482 RMD160 ade2e43e581fe1b9b3b07057e612abc239798028 SHA1 38fd1e2a208fd2069bea61f2e5d1c66ee0697504 SHA256 ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667
 DIST zabbix-2.0.0.tar.gz 12091622 RMD160 c6c9e57cb1ce69aed45af921760d9f59d065da98 SHA1 19f0ed5174e4578c6e6f764439bdeadb7237e463 SHA256 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d
+DIST zabbix-2.0.1rc2.tar.gz 12029860 RMD160 a18ed9b8a67b37d5cf8d1ca6976f263097e13bba SHA1 bdf382fac4dc6bbddc6e195b9814d0f72abc233a SHA256 fc6e77d180bb0a14685cbb00ee66aa11c36d5852c2c420d1ef93fde7580495e5
 EBUILD zabbix-1.8.10-r1.ebuild 8167 RMD160 7398316a55ecd2f7048e5b6025220ea0bc23fa2b SHA1 40022e105fabe4e2b13e5de6165739b102363a8b SHA256 a84369178a5e5b52099e478ada98df1b45b39502e97b0cc8a840672acfc2395b
 EBUILD zabbix-1.8.10-r2.ebuild 8173 RMD160 9d2902fd9b5a4d923c3f078499e324ddc64c18f8 SHA1 e72bf5c241a7578b988174699230dda594a13eae SHA256 b0783166c1fedf2fdbb1dcf57599c6c199299b766c10689044a34274f509016f
 EBUILD zabbix-1.8.11-r1.ebuild 8505 RMD160 7f2b0a4b0c18d56d7f76f10001587be331ebebb4 SHA1 5fc735b9e60ec583f39a92523df8df442bd4af40 SHA256 8518a7de5ec709650363b909766bf00718424e464c30763936947014dfd141f0
@@ -40,13 +41,17 @@ EBUILD zabbix-1.8.11.ebuild 8113 RMD160 ea2673a15a7400786649ec47c822fb3eae91c358
 EBUILD zabbix-1.8.12.ebuild 8593 RMD160 758b36762ba086b364e9ca924eaf5e6fe58d23f3 SHA1 9b54c198baba54b8b0ade9e92105f9a5ca2092ec SHA256 aa6c470a3d5deab9e6a097c7b7b9c5472db9134289b15917ff2d8a3db66cdf66
 EBUILD zabbix-1.8.13-r1.ebuild 8596 RMD160 25ae835faeeba7460d267beb25ae7fe9c8232a24 SHA1 708b73f90998afb8131eee149520f14ca5c35f17 SHA256 38b47d330723abe68a4923b2ab01b1783d0511b1e26684d3f9addb045c8f4df5
 EBUILD zabbix-2.0.0-r1.ebuild 10825 RMD160 fb2cfbd88e449d1313960192f80c3affc12cf423 SHA1 22c152ebf4edc412822f14ac5004dca440d0cbff SHA256 be7eeb39e66edee906b6618d56970077ce207b8e883707ee4199eafdbf5bd4c4
-EBUILD zabbix-2.0.0.ebuild 10816 RMD160 278bc735efb554cd4624a5677c2c79749f3a073f SHA1 e940e71d13dc09afaca578a1288b66c4f9bb4902 SHA256 417e1c53d91debb7f4772a195066a4768df532f8128370fe159dc570a2b67986
-MISC ChangeLog 23114 RMD160 aae7c06dbc3d5e6c2c9df5fcfa930898fdfb6522 SHA1 d1e49c83a5bbff5607206e700dbea8edbdb613c0 SHA256 fb86b075572f6bdcb4be9a878f0c6830b55c3e1640cfd7b79afcfb9f17554814
+EBUILD zabbix-2.0.1_rc2.ebuild 10824 RMD160 025687154b6dbb40ed1d5fa9ba810fb723f215bb SHA1 ea3df409134cfa34f8012afa8545fef74c6ae0f6 SHA256 5930de3b5e3c0f738bf52ba54ef2dbd99bc0dede1a865f998e5e212a22e479d4
+MISC ChangeLog 23654 RMD160 416699d339a5881a0ed1af16ebfafe919736bd88 SHA1 b0709388cbad4ad98c9f6a1ed0a5db53992b878f SHA256 49ad7ecb7b21d4cfd498adf9a645f1543e9a7920555dd70dca605c8108e66f47
 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/Wva0ACgkQ/ejvha5XGaO1XACgmdcnVgEzBI/3in6/HWfQDL9K
-cRkAn1KbHEvXBLaAKbx0pCyLU0GAC9yO
-=9oMy
+iQEcBAEBAgAGBQJP4i6cAAoJEC1LWXx4YDenVt0IAJWg5t4ZjgXU83qDGgR0Mn0o
+0yfKFsqJ6Rf+Hc0QO6LztqgKOROIeq9rlQF+yGu/foYzdP5cu8T2+MDZp30zj9PV
+rax7P7HJvUQiDclwKJFqc4TZWUXKMxtIbIMnuL74HM1SMZEBmVdyMhjEEenqVTVf
+7/39m5/9h2inRz/+53we/iXIhmTtj1Wo9alZb9LEzSI2CZ8yBZ9xFm+GtTGVkRQh
+Tv2mUUumVfDT3+UXAXY7f1L1cX/NPPdfnolyE333QHSQlbUqFFteXZr4QoMR+Yba
+eUc8xziwHo8a7i17nSam2FWSWs3CM5APP3Xkkq0PzYOQ9w1Vk8Ypvzc5vVLN9Ps=
+=8wUr
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
index 6dbcd12e3c2e..e0380d4fab7c 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
@@ -172,4 +172,4 @@ DBUser=root
 
 # Connect to MySQL using Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
index 4973a007d347..63f14c5de83a 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
@@ -152,4 +152,4 @@ DBUser=root
 
 # Connect to MySQL using Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
index 20222950bb96..8bbe0f99a8cf 100644
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
+++ b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
@@ -41,4 +41,4 @@ DBUser=root
 
 # Connect to MySQL usig Unix socket?
 
-#DBSocket=/tmp/mysql.sock
+#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/zabbix-2.0.0.ebuild b/net-analyzer/zabbix/zabbix-2.0.1_rc2.ebuild
index 67a80f697010..a1ba38fd4531 100644
--- a/net-analyzer/zabbix/zabbix-2.0.0.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.0.1_rc2.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.ebuild,v 1.2 2012/06/12 03:55:18 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.1_rc2.ebuild,v 1.1 2012/06/20 20:11:59 mattm Exp $
 
 EAPI="2"
 
@@ -48,7 +48,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-java/json-simple
 	)
 	frontend? (
-		dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter]
+		dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls]
 		media-libs/gd[png]
 		app-admin/webapp-config )"
 DEPEND="${COMMON_DEPEND}
@@ -299,7 +299,7 @@ src_install() {
 		insinto /usr/share/zabbix
 		doins -r \
 			database \
-			create
+			upgrades
 		fowners zabbix:zabbix \
 			/etc/zabbix/zabbix_server.conf \
 			/etc/zabbix/zabbix_trapper.conf