From ab9f001deec5b13bc21f866b221d5069cd747042 Mon Sep 17 00:00:00 2001
From: Matt Thode <prometheanfire@gentoo.org>
Date: Fri, 12 Dec 2014 16:47:52 +0000
Subject: [PATCH] fixing init script for bug 532314

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3
---
 net-analyzer/icinga2/ChangeLog           |  6 ++++-
 net-analyzer/icinga2/Manifest            | 32 ++++++++++++------------
 net-analyzer/icinga2/files/icinga2.confd |  3 ---
 net-analyzer/icinga2/files/icinga2.initd |  8 +-----
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 1c83d9a507be..fcedcc787a01 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.15 2014/12/11 16:51:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.16 2014/12/12 16:47:44 prometheanfire Exp $
+
+  12 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> files/icinga2.confd,
+  files/icinga2.initd:
+  fixing init script for bug 532314
 
 *icinga2-2.2.1-r1 (11 Dec 2014)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8d99d905868f..158b507851ae 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,30 +2,30 @@
 Hash: SHA256
 
 AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
-AUX icinga2.confd 241 SHA256 60d89dd179520a17959c933f26d834591e8b8bc3f5eed7bd02706a6c0a7685a2 SHA512 f4a25d3517930b3d0db125d7e93c6fe94c39c71f06c0714e4a396483352b9f079d7562a8b9bbe9f3de07c5c3fa7dcd610613d9ae675209d707df7d819e67f23f WHIRLPOOL 0fcd03fc20727b4d4b13db18f8331a12b383886a71bbec641c38377c99e3ca2fce9bbf164476f91727bb25273d6710c768f189cff1586438d0449bc3ab0c9be6
-AUX icinga2.initd 1227 SHA256 b4210142bfee31e752666bdababeeb2512e8180b2c97431c698e70b75d5036cb SHA512 6987b441d250ad3ee7d8c865deb23300e89262c39a8a5ad6bb28cceb518502b80adf65887a7a51ab3024f749026d8533a6ee2afd0b1949868961fdd4186288e8 WHIRLPOOL 5f0403b90df360d2fa5cccc8e0931a2254a975e5118c2d57a574b630c5bf5b36656433c78c62e4cbf3e1b2eb9a8b8574a8f9b07c88feafe41a2a16dae3b6d033
+AUX icinga2.confd 196 SHA256 f2a2573d5ae0d335078183e86b14af804776653f639a4a1c8539580ced895c19 SHA512 e0912ac5dac6d93b720fc83a63321f1245e71a5d4cc5b675680c00b44fcd8346020c387a26477eff69c98683a7e58566d18ff8e9962bad8985b361149f19709f WHIRLPOOL a544174f11c8e1277649cc865c98eca14d9beea69f3d0c8398fb7aa54688a8b025f78f4c0a3f7aef92d4db914661ac166ed8ba531bef20de3d9419a5963cff72
+AUX icinga2.initd 1189 SHA256 f729fef66119a1c81271ec8dca4ad693f75fd839eecbb4f5a9d2c57ca47eacc7 SHA512 341bb598afc4a8c8958dcc920fc51015cfa91d16541d92d5d6e405cbe1cca1245911bdbadf589f2c3dd337f8fa5310f1f0dade3017a0c9d1d3f2128c1fada2ee WHIRLPOOL 70dddb147131754dc33b5e97da8bc7ae983a8cc160349831631e433742f28337a6632fc211f8524a4a306423418623482d2e50e7bb7d58474db2cc4e23a83a48
 DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
 DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
 EBUILD icinga2-2.0.2.ebuild 3308 SHA256 414fc9a46d8f4fc3d8431241209e009e3c2bdf427802e76e45459a7d7e7a92f1 SHA512 c4a1013f864c227a9ec2c342ba666106f4c9e2f7d02e787cbf494d36d556d512e42fd0d1a456a7a5d72d096af7ba703e3ed7ba8c072a644ebe923132ad3b27ed WHIRLPOOL c85eac0059e8e8bea6498712633546be3e39d34c6ee203624cb4e08d9b8d8d7a86f9c67176e2648be55764a9d9f757dec3114973605940b0a3c58f5c13f0546f
 EBUILD icinga2-2.1.0-r3.ebuild 4080 SHA256 22d72e85fcd3db0e8525f7c9c19074b6d0a061831b9e00e8beae67b16d0de457 SHA512 2fac2143445e980f2be841acbdc20dc3e8663ee83d5d9bc1e97a943484c8f919de359285f3a769354c55f16293c01f9b3a386f6f589c3de444b712dca29f2b97 WHIRLPOOL d12cdb58547a05513460bfc6c608b79694d20aef1b519cf4f0374e919daef8e0e597b16669b7a3ae4a580b94c1518c28ea7e68ccdcdffe216a22985748f6d90a
 EBUILD icinga2-2.2.1-r1.ebuild 4461 SHA256 545d1a9088a37e8471ad8f7890c8dff08e730793c6f34194f36fd64b2b07d7f1 SHA512 63077b1e32b7692d2f7ef0552ab2db14770de1d08ad309517fcafbc9ac16360936d0f28b6cace326e7a1c5baeaa396566cc3b0846b4b6bca7503f24896a44577 WHIRLPOOL 8b8d8f0e97a836ba2c64b683c1870b33c6187a7fd6f9e8e4cdab4384558f1186dbb2d430f9e3e57e8ff3ddff2f9a21bf2bf1af7db27e4e5a68ef345bc7d7ee70
-MISC ChangeLog 2584 SHA256 47ff998627fb4dde4d9e1222cca6e8d21aa7242658bfbe5fe7e595cc5fa1d5bf SHA512 25c8bd14b892bdb4ae402e85a254fc43c8c7537322c9a939b9de4d9af5fdd1b12149df6b1e87690ce17f2cfeeca984fa40891a53f298dcba955a60413b999413 WHIRLPOOL 5befe16fce52927f0e6b33b19396fe3e97bc2c9cbf2745577d80c506f7e6b3955db5353d9627713dbc10fc8fa8d085c18554a6b625670ac246cec9f8eec94817
+MISC ChangeLog 2722 SHA256 ab2aab5f814306d6514e7aba3712c1267ea48320bc89c35d4d9e657dd59b6d54 SHA512 4197bf45dca39790e0a571cf535033ec2795258dff7041fcd0eb5791ea7248241eab3a32a9673e9052a9e508cb4810ad6411d25f38089fcea2c83b293f1a21b0 WHIRLPOOL c5e878189a9642022565748c68576b6c9e7dc9384a74b0220cc17de18cfd93e62819b8d528449b47e21c7ae99a52266679d9c392817550a9c1d88406219948c5
 MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUicu1AAoJECRx6z5ArFrDpoMQALTgnrDeAdtSq1xc7bGc/MEt
-rsOTMydFatjx9Gd0Kl8HnWTJIjlszEsDs4YtNxWjGiuzcrdUig112XylH5umz1yi
-M9O+6xhoMobFhcV93VwUcZ46mpy9TlFQ7N+tA166Qf3xBWRFYDhzyHIt9DmD9iAs
-/yR2oY7u2UlcHxvWmiyjJ2pbPhILHFb6qiAOrZRD/XOt3/ZWu3CziXOghFEkVLPn
-jUa6GhDc5kCZxHhN5nYBAXXvcX3d8VaZPhD5egvU2g+ZRCLMXpS7hRBUwSsaMddv
-GfHYFW2Whw5CsnXyXWH3Dy/GDNCKj9r+K8vObOTsWf/XjgEyLmFFYFIESv77CA3D
-owNJjHXfUTFMumzGZtwMpc/aXfPssjlAW2KCOWCMGQvAHT52M548apynFXgSF7kv
-jDS4iHjjFTqlQZ1A8ugmykGtAQNzAePGTJvrWCxKuN/Gx+kaAMt9LWBx9thdmVgZ
-dRqpcdhMETkIQJNA2Z7SELLTKQaH/wHBl7H+7nrKI5Niq7Y3qOtZ9hE5nVYxZKWa
-8B0+Ey/RG9v1u0VJY5E7gA3kVtKcA45ZPo2tFA2+qSgl9exP7t3IxCCzsQZFQ0wS
-QG3v6mCBsM7fhFObFHlHMShvQeHQnp8o4SYF8NGNhM3PlYD1KMyWHuQkVXcB8agt
-Y71BICbMB7gubD8/pV68
-=UdhZ
+iQIcBAEBCAAGBQJUixxyAAoJECRx6z5ArFrDP8MP+wTmuQbksyO5t8MpIbNWBACg
+zQpFVTX6m120rKXI4ZgU81WLUzzRdVwBcOmm4CQo9079NW2c6BucWHgW3DoRNiWG
+OrjyOFvIg5UU+k32NH5JnjEfAnSxcFOVlXi8Y4jeCZRYPRJUpYK94AA+nf15jL9H
+daA/VHddkcw4qfAcp9i6tuRfz2qz1tVqDrSxpsA20XhOb5mwtdzIJVYvVhhsG2gc
+W2M477XPzk3NBsG6cwQvF4uvvfRTezou/ndHcOW1V9uyocFWd+4BtpN3QKvbXJ9P
+N+5dtGSUb+4KTZSjJMZL4pMKn3XM3nXBeczvYzCIlUCcOwNi37cpgRUyOaqzmbls
+JV8tYzdUHqtMkxWik4WHD3v6Y2IhUh/HW6d5Usu2WfyzH3dWqaNfOdsQ1q8OyZz8
+aviOxa30zrdDHEbsVfM9M6/UQtVH0uw6DIB/sKnDwijQlSpTuKUdCwmav3bee7JB
+LBBBSkz7FI5gXAK3D4I8EQ2W61BYQZF6IOvcjJZ/KRIzrb5dpU1skHfR0/IeUZxV
+WWRCMVAMUGMdZd3O/NlWU4S4ZMoZ0+sPUpNOUJ6vJQZI8A1nlfth3Li11ZYiJzWM
+ExvhbWoGqzHfxf2PpPVUkNm86vBY2UkwTqaOkZvSABbosi2jq59bxst2oDmBfep6
+UvGnmX2Nu/GeFG/eEokl
+=IitI
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/files/icinga2.confd b/net-analyzer/icinga2/files/icinga2.confd
index 2e82b06e1e03..b4c2c0b38b9e 100644
--- a/net-analyzer/icinga2/files/icinga2.confd
+++ b/net-analyzer/icinga2/files/icinga2.confd
@@ -2,8 +2,5 @@ ICINGA2_ERROR_LOG=/var/log/icinga2/error.log
 ICINGA2_STARTUP_LOG=/var/log/icinga2/startup.log
 ICINGA2_LOG=/var/log/icinga2/icinga2.log
 
-ICINGA2_USER=icinga
-ICINGA2_GROUP=icingacmd
-
 ICINGA2_COMMAND_USER=icinga
 ICINGA2_COMMAND_GROUP=icingacmd
diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
index 8ef70fc5d326..0adc20eedffa 100644
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -7,13 +7,7 @@ ICINGA2_CONFIG_FILE=/etc/icinga2/icinga2.conf
 ICINGA2_RUN_DIR=/var/run
 ICINGA2_STATE_DIR=/var
 ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2/icinga2.pid"
-ICINGA2_DAEMON_ARGS="
--c $ICINGA2_CONFIG_FILE \
--e $ICINGA2_ERROR_LOG \
--u $ICINGA2_USER \
--g $ICINGA2_GROUP \
--d
-"
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
 
 depend() {
     need net
-- 
2.26.2