Minor tweak for bug 460562 - zabbix_proxy init file.

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

3 files changed, 16 insertions, 13 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 5f09282a30be..965647cbdce0 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.126 2013/06/24 22:59:25 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.127 2013/07/19 04:27:56 mattm Exp $
+
+  19 Jul 2013; Matthew Marlowe <mattm@gentoo.org> files/2.0/init.d/zabbix-proxy:
+  Minor tweak for bug 460562 - zabbix_proxy init file.
 
   24 Jun 2013; Matthew Marlowe <mattm@gentoo.org> zabbix-2.0.6-r5.ebuild:
   Removing package mask for 2.0.6-r5, it has successfully completed initial
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 2198515d3723..712c9b8deef8 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -25,7 +25,7 @@ AUX 1.6.6/zabbix_proxy.conf 4539 SHA256 d2f96ffab6e88d3c6c54b39cc2b0b55dceb5d66d
 AUX 1.6.6/zabbix_server.conf 3945 SHA256 884ed1002a6f7130f90695f3e113efaf3c7ab82f3bf6c9a8f9e22e2f7025aff6 SHA512 61f1ee88ba1cf65c2e63362100b1466bbf669b5014c689626fc2d6b22cf87958c985d0a0291ccb576d2fbe2fac0eee4faf639fd526d64678db2c38bea0b993f8 WHIRLPOOL 453ac1046d7c8c85613ee5e663fc08c8944ab632d98471bd92a78aae4f6fba3e082b425cdc27e7af75cbab8dad14f02db4a5e253badbb6d6c15e58ae0dd25d41
 AUX 1.6.6/zabbix_trapper.conf 767 SHA256 10c94e2b4e93dfc67fa56156d5227ee91be68e7d8feb5a7d77b164dd1fbe86bc SHA512 4228b01eeca06596f0f662b8f2a85cc4d16acb81e3f07318ae9f7faa0b8fadba994caca1b75816e1fe131041fa0edac80f49834e5f0162634928bf8738b455bd WHIRLPOOL 1625e82a06d7b84e0a436688f8d56f9337481a98da816a7b61ae08f57687b7a18fba4645e27461aca1ff687fae345bc9ba4e23d309ef2c2709a3ae8cd743fb34
 AUX 2.0/init.d/zabbix-agentd 738 SHA256 8032cf57f85cb11a0ff5e25127cfc8c586c5ae8c2044cc300fb8fca6c8dbe712 SHA512 aca6f49258bfa82a239003854401c190150714f8caab8dcbd20f7ed00b4891e12670185647a5e8dce8ac82c2d997a7b9556a30174fab3322e06441fa1d30106b WHIRLPOOL 31d4a0eb42b19df33af8c9a6f022c9ecfa646a53bfd92d90167b22c5c5969194e2c07c2cb0794387c235120b452e341be91aacd84fc4d94ac953b64b7654d69f
-AUX 2.0/init.d/zabbix-proxy 715 SHA256 9b72576484f37d81d5d7c97be6522337520537b353d8be81d384da2405efcba4 SHA512 de1d94c26b18ef1d2801245d81fd4356c09cc108fe566a38fe07900b00727965422f16cbc58696d06f5d9a534f0d6352dbdfe0faafd5d031ff37669bacc16c23 WHIRLPOOL fc75f59604b2d85a3f10d1ae31e1dbc9857228ef2d1273297e56361ef360651143a78608393a5521d6f3ba97a28e39adee21aa79ca1b4257527b345de4d0f1e8
+AUX 2.0/init.d/zabbix-proxy 715 SHA256 bde2f3ab765969735114231e43b243303ab7f08859135eec1f8f0f03e2680276 SHA512 1505f08d47b6cca9ae197f778647e77752ad994e2c9fddd8edc77e77ede7e76be9d1983ad892c2fca61f65fc83ff54a3efabb7e85e0c8225845bed8e8abc01f0 WHIRLPOOL 4b1a85454d72d7952fa0c5d71e2d0829b5284bb8dfbedefff7ac7cb0eed40807e985f5cbedb4e8f9383bc31b1ef1c3175db29574f19e67ffa34f219981e5952d
 AUX 2.0/init.d/zabbix-server 727 SHA256 2846405ed120c4ddaa41583ef7141fbb5b0f1ddc4761f4b6ef736943d794cdf4 SHA512 7cd93b3bc3593ffbd67f22989b8bfeef5d0b2a96def769f51c549740229a905daa69d1614ec2f89759803f3fab759a553d8122956be05d70d6182d439e2cf17c WHIRLPOOL 16cf2fcb54db348963d78e45c632f6274b2b2fcd40f8e4969b02028b20aab72638b20ca3da80da47369618b415bda5f44e7c6f7b7a3fad8fde5497ce19c358ea
 AUX 2.0/patches/zbx282.patch 5556 SHA256 28334cdc8ee3dc6fc650dc55f2b9394d49c7a0355161ad8ef39c0529b75ad591 SHA512 7288c3ced5bfebe614fbe7d1d8ebe4d8af453b98908b73272fa4f3be7babc598dea2a51e4a26bdda1e665fb83c67b2a2b6bec030b18e3e998f51b1beaec3b7f0 WHIRLPOOL 8c6afb54b906dd4c7d317adf6a8cf602b2bb13344cb1e882636555b22c75854ca6f33cf69e2689b0d8c580e59e7dcf217c00c4bfb601a9b8416d1b4f5e134fe5
 AUX 2.0/patches/zbx6097.patch 2383 SHA256 93c882b46431fa4dd78c5e48b2f238bd2e24359e547b513d40e8bb6b808c81bd SHA512 2fd4445821981afd379d86a3cc541c5ba4e1f83497fbe4ee96daeafc17f1489fa731dc8400c3f73375f96180e015752f72daa088d0bc8b5406ba337a49d11be8 WHIRLPOOL 4d9fd7214b8f4d6107b31bb15b48d8f070c1c481ad999cda6836c251d3bf6dfdca397d1d1b25828d3c345d6aa61e7bd85060b37760fc3b54eda8f9bf3d2ae080
@@ -37,16 +37,16 @@ DIST zabbix-2.0.6.tar.gz 13402400 SHA256 46dfa7e63d3d38991cddaa7455e70179dc3fbef
 EBUILD zabbix-2.0.4-r1.ebuild 10403 SHA256 eb1b54e23c377d3f09d58fdd0146b42d667e039dd63be7dd7da737103686cbc0 SHA512 ca1657b7184314ad2bc4e820026864e0bbf80238cb4fe2fd36430e9b8587443e252212106f1b053b5523b23f3b511e46783dc850e3a28cef2e770027dd8ad24d WHIRLPOOL 6e3d20be1dc578075840d10308aedac8b665add26ea77fff7f4ca68fe882fea644bb23639134c424e847ed93322359634359b5c567b6dba5f149809da65acd3d
 EBUILD zabbix-2.0.5.ebuild 10356 SHA256 798869b9df18cd21517ab3ac86e9a9c5ae26cb864b126a31bd3d8e353316c82d SHA512 0b999d51d18157fdadf93cdd13c9be6a0c94cfde90ba74e4412e41fe754f45180def4199050178a2003e4796271bca9c8edcfa0761a2efa42392f32b16bad6ef WHIRLPOOL c54d7367802bbdae792e8121ad4fc0568bb32d02e6a21bdeab7d027039fe023c4794cf7557ad2d6f1108241f78e1f00791f0632294eb54353199ab640d666dab
 EBUILD zabbix-2.0.6-r5.ebuild 10587 SHA256 5d2b81018480a51e8fcd118e623970cdb2ecae704fd0081a4adf149c94b0f482 SHA512 7a0f72c76e8f5350cce46a4349dbe7b7e5b0c9a24c0f38b3f49b48a3089e14b29f7d8516b1f2c939516e4b399e09b28e2f9000eaa56b0c548e605e81e3e2fd58 WHIRLPOOL cbf80b0be6f314b4db569fa95d62750dad90269000aca77f589917f3784659a4e3d3ea5e90f463ad406d6aa609728b10d89bbb4b30b6e11fedfb76b62e601f60
-MISC ChangeLog 29690 SHA256 be6e42738af5752795f49ff04cc31cc067df3f869cbf9d106a86953d3370d6ae SHA512 e9489eaf417922512f180879857dec8135830b2f14a486b12eb5a7c3a5437d2b518bb54c2569eaeee7e23feb893afd784d8be97fe312a6d2654d397a47914c1f WHIRLPOOL b555bf5972d07fd27361eb11dbc841603ccd251c2da8669667e528551f189feb3e49ec752d270395df3b8fcf6e1df92c7039142aaebd54a333dea3dc5fce2091
+MISC ChangeLog 29827 SHA256 5a631e0074890e17dc44309624b7babd6012903866d80d6b56eea078d70f357d SHA512 90bda6ef8aeb8fedc196af21c35ed9a1129787b882340e9ade2fa6283d26cdb0d47a620d751a0338ed6e347df2859953059c5e7486a33fc52f24a51b7e079c57 WHIRLPOOL c599561af7dd71640e531ff038030595e3c667c558ce26684afb08a8a28b453d0862825ae5541b956bf80fdde73c872148e1e66730eca3d85e8f938c6527d21a
 MISC metadata.xml 1192 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 SHA512 c4295da1665f2de24d2966a6a434a28c4dbf6a41779eb8f32ed2178b6979c17c92d2f2af042dda759af8a27a6371bbd02378f83846f538ef59954c506ec38cdd WHIRLPOOL 2d07f85c566949b01c169119b117bbda48326480639473636ff7082fd74d355ec40b4e153b29a2595152433ae2800eb775cca8533243d42061aa9f41fed8f0e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRyM9VAAoJEC1LWXx4YDenPGMH/2Z+A2pneAry6BtNDOAvAx5G
-lZX8psuU8aTi8SV+u4yE5m0OeBjx0xqwDP7TdiNZT1jUXG6QAD0af/JDIzk/Q2ON
-y4g4qJhRHljl6GSZhq2wQ96nVLNOtlsqSiWO/QGl3LpMJ0nWUNd7ox1G0XLgK0np
-L3gAN5CErMYVA90sNvITvD9s/SqCfW/gBdLB1YHjnSk6THpKzSVb+uJyUfPCxC9G
-paSkM4YfKAW7sXeTQ+Tqu8n270OJz5+zKgDgg9hWhx18EOhqtGbd17ay1Bp579wW
-qxRxJa1sXHeZKCVJ7djmIJ3oKIcyNDXJcEWgzawOaRmF1y4NqiaaWYZqmoihA9Q=
-=X6t6
+iQEcBAEBCAAGBQJR6MBRAAoJEC1LWXx4YDenzV8H/jCLcQmFro3VcuAYk/YZvvd3
+zo1nyMNsE+fqBx0YIVgicj0omBaXicOElz+AScRD/d4YBdIEGCQWGmiEEBCN7ERj
+PgfIZoA68r46ovdhgucAXpC0xayg7PJSuFh+H70tq/3FL80/hErerT7abfvj8f8a
+oHqZJTQ44vLnk/c6wHRundXJju4tAjPXG+77LCRxR2onMmmzB0zqWXiF3G1Na57P
+aM6wi05bG5zar2ZVSAkJrlmn0rq0c3TjNF643RPKwNlb1MuvIjZTGjbmwZCyMzFc
+FH6UK5hMwYGDP5CId4gcXLULAxSo/OH7SmFdAjajkPU6w84dCrLFCVQnYXfGedQ=
+=VSoJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
index bc6cad1e417e..f312cc86ab20 100644
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 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-proxy,v 1.1 2013/05/06 22:27:12 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy,v 1.2 2013/07/19 04:27:55 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_proxy.pid"
 
@@ -15,14 +15,14 @@ start_pre() {
 }
 
 start() {
-	ebegin "Starting Zabbix agent"
+	ebegin "Starting Zabbix proxy"
 	start-stop-daemon --start --pidfile ${pid_file} \
 		--user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping Zabbix agent"
+	ebegin "Stopping Zabbix proxy"
 	start-stop-daemon  --stop --pidfile ${pid_file}
 	eend $?
 }