Update files which haven't been tracking upstream

13 files changed, 47 insertions, 40 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index f5fe7c52..7b960f54 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,6 +1,6 @@
 AUX monit-5.11-imap.patch 1798 SHA256 7d870b923c04e7203cb13e24e2c6758f650f1e210f8ef9b0b5dc710e8fbbdc64 SHA512 ba7a96cff636cff171e35d01289ab316443c15febbc394259cd4d6cad96948126554bd36ffd00bb3beb20f630728ee0fd0a0c164e88c02c64c7bd015eaa24225 WHIRLPOOL c7818277fcf26d43f1ecd09e7936b77a63493de18afed2da7449a4866f3a3ec18452f693a6c1ab420ac9ee56ead474cd0df7f59d1237cc777f0ebe8fec387a11
 AUX monit-5.6-libdir.patch 1653 SHA256 13b6775377bd8b60d2f95ac641188f77f6c94ce4ba2a76304c833cf242f5074b SHA512 bf1c9634eeeb0c0a07e6dc6ea87e348106e5e22ba964d4e1fd5d243ff742cd8bfec942c2d0866ca08cb3ea37a2ce891d56759fd007bf5b1f7611f9779b48a52b WHIRLPOOL a3ce84217007dce0cccb7ec7f818af08afd53497cd44074498c5e8b406c7393ac252c91a7b6886a2072e5a9c296b343e63796fb887c42d48276a76b024efa5ee
-AUX monit.initd-5.0-r1 1667 SHA256 4fde4619ac72a5834738223fc9a939beb38ed802273ce79b1fcfbd27ad8bb1be SHA512 d47a4d1d531522446869a02c6c14d75a9105305bb87c2286d1fb83275fc5425737e273e2673de6842192d4a1cebf5bcbb1a8594dd9f3ac7f5e42fa478230fce5 WHIRLPOOL 64ee18cb27620ec84062dd61e96248d6cee35d573ed0d7842803864443670faa97d683fee0fe596fe2fa5eefdf742bd02fe4639e4c8847d7e1483a9881d12daf
+AUX monit.initd-5.0-r1 1625 SHA256 78a845ca5fd4d38f34d4d0ba73fef1c15aa773f45ef191ca0f3650fcce22ce8d SHA512 eedb994de0e32a1acecb0b90206ce8fb9e2f0ee4abc0e2b1379b4292ceabed4a7625a189f73efbab47cb544fa2cb78b8dc81f94427f854a4002e7210d98c9ed4 WHIRLPOOL ff3ee1568163b6bb01b129376e400bd4cbe923b0fd43113f99bc0382e0a23a538df65c4df7c5d135c81b556e161452276125f743a439a2fc76fc639910509593
 AUX monit.pamd 120 SHA256 02dabf0dd08f535538fcd307dc25cef22ccc60d16ada41e6b2d631c72150fb5c SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c WHIRLPOOL 677e654fc01dccdcb6541683efd37f2b0f17f24f1b79ea10a0882f23b605d15e9cd485e8a3fafa679555c6b21ad30c26f8eaf51f5c76309bc76512723f01b8e2
 AUX monit.service 226 SHA256 c7071a98916a1533c1ffb32dd7508bcd8f60a0458b83c7f1b672f65a7be00526 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88 WHIRLPOOL 053218a34c71a55a8fa732c72cba17e4100158ef6e931c9d4ede5185e470c51dbb93e68c47db2371e7ab29be55082b31054fc40512cda411683e694d22a84436
 DIST monit-5.11.tar.gz 1223927 SHA256 d507957b1e18e6f45af5a4d3f94529ab22b26f522f5f62287919bc905c44283a SHA512 d3bffd0fa5326d7783259af5f14beaed510d06644ec865e933e63aab2c35d47e2f859a9e490b0193ae62c9174a065c216cfa0ae3708d5a06a2d92e9c384f4151 WHIRLPOOL 55d63f7fc3ac197ab71b95b76c4c2362ea640f80a61c3bfa1238ca80a6566c057c1728f29f358aee998a6c30801fa4ed42e230f0cff3bb28e0396c749357c966
diff --git a/app-admin/monit/files/monit.initd-5.0-r1 b/app-admin/monit/files/monit.initd-5.0-r1
index 8aec87a2..662d0ffd 100644
--- a/app-admin/monit/files/monit.initd-5.0-r1
+++ b/app-admin/monit/files/monit.initd-5.0-r1
@@ -1,11 +1,13 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-admin/monit/files/monit.initd-5.0-r1,v 1.2 2011/12/31 16:28:50 idl0r Exp $
+# $Id: 9d16c11a196e17dda5b968389c223fd29251d03c $
 
 extra_commands="configtest"
 extra_started_commands="reload"
 
+command="/usr/bin/monit"
+
 depend() {
 	use net
 }
@@ -14,31 +16,34 @@ configtest() {
 	local ret
 	declare -i ret=0
 
-        /usr/bin/monit -c /etc/monitrc -t >/dev/null 2>&1
+        "${command}" -c /etc/monitrc -t >/dev/null 2>&1
         ret=$?
         if [ $ret -ne 0 ]; then
                 eerror "${SVCNAME} has detected an error in your setup:"
-                /usr/bin/monit -c /etc/monitrc -t
+                "${command}" -c /etc/monitrc -t
         fi
 
         return ${ret}
 }
 
 start_pre() {
-	configtest || return 1
+	local ENTRY arg
 
 	if ! [ -e /etc/monitrc ]; then
 		eerror "Cannot read monit configuration from /etc/monitrc"
 		return 1
 	fi
 
-	sed 's/#.*$//' /etc/monitrc \
-		| grep -v '^\s*$' \
-		| grep -oE '^\s*set\s+(id|state)file\s+([^[:space:]]+)|basedir\s+([^[:space:]]+)' \
-		| sed 's/^set\s\+//' \
-		| while read -r ENTRY; do
+	configtest || return 1
+
+	sed 's/#.*$//' /etc/monitrc |
+		grep -v '^\s*$' |
+		grep -oE '^\s*set\s+(id|state)file\s+([^[:space:]]+)|basedir\s+([^[:space:]]+)' |
+		sed 's/^set\s\+//' |
+		while read -r ENTRY
+	do
 		set -- ${ENTRY}
-		local arg="${1}"
+		arg="${1}"
 		shift
 		case "${arg}" in
 			*dir)
@@ -53,6 +58,7 @@ start_pre() {
 				;;
 		esac
 	done
+
 	return 0
 }
 
@@ -61,7 +67,7 @@ start() {
 	start-stop-daemon \
 		--start \
 		--quiet \
-		--exec /usr/bin/monit -- -c /etc/monitrc
+		--exec "${command}" -- -c /etc/monitrc
 	eend $?
 }
 
@@ -71,12 +77,12 @@ stop() {
 		--stop \
 		--quiet \
 		--retry TERM/5/KILL/10 \
-		--exec /usr/bin/monit
+		--exec "${command}"
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading monit"
-	/usr/bin/monit -c /etc/monitrc reload >/dev/null 2>&1
+	"${command}" -c /etc/monitrc reload >/dev/null 2>&1
 	eend $?
 }
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e9cbc756..0d85f670 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,19 +1,19 @@
 AUX 3.6/syslog-ng-3.6.2-redis.patch 853 SHA256 0645bb613776a653b844e8c3bb96ee85cecc9446c073b8646c29cd6428bc4c82 SHA512 fea621e66185509d79bd33ec440a8122faeadaff610c8823d428a6485563f4f83534c5ed40012a4d6818256e278a5bf0cc0d90caa00e60ce3a91561b549ce828 WHIRLPOOL 6eb24eca6c369e25ee3263216b20313e1332c6af13202a8b036ee6d7155adddc912083539a44ed7b3f330a895dddd4d98bb45e1d748a18749f06e31bf5c78ba6
 AUX 3.6/syslog-ng.conf.gentoo 1332 SHA256 3e51ccba31ca55d7428e7c01373e3c6700936c115aa165f6a1fc9428500c7f9e SHA512 a39b4baee4a60b252a866e423c4cbeffb7f23d8d6446c40169894d5f45c4ef0e98b14e02e63ce1623e9d08a6e1f4037987bfe9453d3bf65f5315c70583a21d08 WHIRLPOOL 0aba4311cc95303aed2fe51332476bd9cabf3a6f57edfb52e28cf4d76db1a45bcfdb0417a42e30f45ad056a2c4c2675170686817d1d5e985d0c7f5352a6e3d0c
-AUX 3.6/syslog-ng.conf.gentoo.fbsd 727 SHA256 7f33666d6cf0772e1afa8a09658cb7799aa0278c20c1adb33018c1bc5bef4bcc SHA512 a571d28d4d8f49e204601526b70cce0690f4a5dab61a33c1cd46af1e4199bb2427fc5a0f69257a3f439197abf1177ae26826b0a4cc7762a4acbd0978275eb9ae WHIRLPOOL 332a13c2b7cd25a8826d424fc4ed782d36f37211aeef714913d3d50f3f26332e02b819f06842fbdbcc9a8149ff2f44a3a26df7a37408bf4a1b8d7f963e449973
-AUX 3.6/syslog-ng.conf.gentoo.hardened 4658 SHA256 e566c3758b71255bc51bd72fa0a4b7d039c448b3f8fb85ff36b7eff541537e6b SHA512 06988cf6192e498b8f8845de2d192d5495f72bb7ac58276252e77a4593cea04cb6e3d18b9d77f9ea2e3fb18680b2d14799b6bf226f1a1ae1ca6c9f97cf5c1812 WHIRLPOOL f42ef0a3bb28dd066f7cc9b7337e5710b91de6141ee6a94ca81f6c9dd230c6baad9b4cf1e4e4ed4c6c2b7ebcb38be5993fec94c0f907dc35f1a88fa69fbb76a2
+AUX 3.6/syslog-ng.conf.gentoo.fbsd 643 SHA256 783e1e4e5dce6d72826cb93d6f520a07dde3a46901de84f005758daed4d09e93 SHA512 f4e48de95abfff8fd203cd9d380e11b130a99b44cd7011c6c48700dfdad2a958758249ccf9bb9e2d8439c0a1db4e9a59bbef88653a40f4cfbd5861959c79aefa WHIRLPOOL 6f89de39e13be0f4ece81d69dab87221e12b658468ed3e07b4696c87dad93bc3ba1561e969df013631a21581c4c6af527ba27548d19051aecea9d89845105ace
+AUX 3.6/syslog-ng.conf.gentoo.hardened 4570 SHA256 6e42af58e6d5bc0c53675d491313baaf6fc8e90ec8fc783ba7c92db3e8e17998 SHA512 72369ffc98bc1d264fabe6b9f12322675ad75836b23c3687ab4ac86c2da4fb452b64d7678fd50aae16e6fa028e97a658dae7665c4457a0cd4cb5b79b34d31e63 WHIRLPOOL 6b5134bebc313aac621a90ffe847f8b41bd575b36dbf5f2946ddab0360778771e82e151376dfbff2d0648c54f00a11ab0b68702f426eddbeb8d4e0f93e577175
 AUX 3.6/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
-AUX 3.6/syslog-ng.rc6 2043 SHA256 3599493fa842a6340c2435bffa03dcd4302469dc4cc9070fc64f24b1af50b0be SHA512 ee930cb470c0947f5e3a377a8dc5a050b2d73480a4e1978740d8d1f305fb6b7eae020636bf9fa9f24c43930bd5eda0a11197655daf168a25fa52f971c09689aa WHIRLPOOL b8b4c1073d07418db5a275433d39bf77ecb387040d54fd4e0e78989471180456436a45efe407b6dfcb17f72e4911ae82aee0110e85362f6ee7f48dde4195da10
+AUX 3.6/syslog-ng.rc6 1973 SHA256 80f158ba11896dc515e78cb80b78f73614fc575f90384f9cc92f607497719865 SHA512 e04f06e2ebce6bbbc054f1e41ffddc7b7d3f30095bbd64d60ff4244dbcc10c036806fbe775f7e0d2f970a37a30200978d4020972d0c43b0aa9b0010a1ff97565 WHIRLPOOL 12a8ad639a8d7cbac9a85f228bd8f2ba97dbd2df62ace26775d8992182d560db755d4847e75f6e4940a369f79262c82dea0977bad0b123a30ee4eb8ee7a6f1a0
 AUX 3.7/syslog-ng.conf.gentoo 1253 SHA256 247e4d87fc0c69f7a31b34d98e78d6cb3ab4f2856c3bd1e54e571a8eaa8c2a82 SHA512 7331a2fa273846d41aa3bc59628d018be32fcb5e11eb28c8cea201b08ea4562ed9e9761e432b3e6a2d516e47074e27ed0fad51d658e5f60ef7d0828a3e686556 WHIRLPOOL eec492bb54a79ab8a685f27785d69d3bcfde1227fc6f75c8d2b8c33eba562f7a471816897f564bf198274258cb615bfb50733de05394cd686025d9ad9331bcbd
 AUX 3.7/syslog-ng.conf.gentoo.fbsd 643 SHA256 ed3b50d3e3d7f619a6042d2210db8f6a80e8a56173fc010d50295219b5164483 SHA512 110f197baafd5f15b4d3aefaeadd2d34503478069c30bb4946752e897fccab331a46660ee3ea2b84e95780b6f1ddd1d42428a69adc1d99fba571482c8fb6c674 WHIRLPOOL 0ad213628467fd91d305e12fcc3cf0296c30f62b08ef20737e3d7507c69e903d29037a81f2a6e0b29906df5e93bbaab9c252ff613c2747386e272ef350c1d58d
 AUX 3.7/syslog-ng.conf.gentoo.hardened 4570 SHA256 c985792dcbd447cd3f8e05310392a9d51a280f9fde9441de0beca7692bec25d8 SHA512 d2f2a041097e287d599838fe67d66930b45c67cf9415ad8a299d5f01eeed4a38e6934f1ce06985fbf1e822ce2e2da33d18b5b60b5b90fa779355e08eef406382 WHIRLPOOL f64f16b62e09844ae6aef7d64d5c967c05e7980d8f7b9c1708c4250f81809ca2d2669a375376c585c74b0973dac6b64891eb7bc3e54328e3ded79fc2019e26de
 AUX 3.7/syslog-ng.confd 1496 SHA256 d28c269c8aa2876a389aefdc76b18bcd30eb6653ea1e54a0eb6fb596568643b6 SHA512 792258acfb78caabc2078f0c7c1fb6c61fe0ad91ca45d4901a0257d687e51edbf81ca67a304ead345579855ae2ba0a7fd8b82f1e80e798d4b6c339c31b687afb WHIRLPOOL 3552c19038489743740acf5e77df83d54bb750547055a6c0711a2d6ec9b97fb1389e33142e2fdbc42a9dc84c69b67329657bf1c519492e2c0a2a71a7a8c78444
-AUX 3.7/syslog-ng.rc6 1972 SHA256 da89a8afda734a433cf9d1bb526c5d15daffc76b1dd7d425fe2808e839257586 SHA512 b7d01bb50edb0183db73c77023a9c7bb0b72f91d61d0aaad18d35edabe2bd7b4c6e1ca0c9a3783a68595fcfa4d5eee4ea42037fb943d63509227f67ab74462c2 WHIRLPOOL 7c3d085b03e783b31291f67dcacc287d6738fac0912d66ba9306341793eb0b3ce71069459f0ce87d7d484fd1da97376ede183b36386498bdcb903b176da955b4
+AUX 3.7/syslog-ng.rc6 1973 SHA256 80f158ba11896dc515e78cb80b78f73614fc575f90384f9cc92f607497719865 SHA512 e04f06e2ebce6bbbc054f1e41ffddc7b7d3f30095bbd64d60ff4244dbcc10c036806fbe775f7e0d2f970a37a30200978d4020972d0c43b0aa9b0010a1ff97565 WHIRLPOOL 12a8ad639a8d7cbac9a85f228bd8f2ba97dbd2df62ace26775d8992182d560db755d4847e75f6e4940a369f79262c82dea0977bad0b123a30ee4eb8ee7a6f1a0
 AUX README.hardened 358 SHA256 712e5bb70d79e416237ccd69a73e0b8deaf7d9bfbb92a0c85554a12bebbaf6bc SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e WHIRLPOOL 7980551efe131b736c2542f7d066e2442201be3e541dc0036e92de1c5379d945148164b628b47ec5c5379c1e50ead7120f653c63ab78feefe69c5753998c0295
-AUX syslog-ng.logrotate 354 SHA256 e8e1b6d87f8217c77c0bfbe3095cac0c4edcb72473cbd1423bf2ae7bffee8ca3 SHA512 c3dc48bd0525947d728c51ac79faa05b481d5ad7dc4f52ed69d2f5a4344fe71c3e06591fe058ef5dcb8ea6cf089954e9a312d510e129727b35a6e32d8e9ec5e8 WHIRLPOOL 34e5efedceed29fadfc99165a70407a2bd64e4df05818f8da831840bf16e287c2e54c47cdb81393f581e14c84407137dc18b5a17b840eb0587877803e8b8be41
-AUX syslog-ng.logrotate.hardened 1742 SHA256 f2c9f99c7dd73e709e5edb7be99de5a13058baab29d3c922ab9366ddd50eda8f SHA512 2f751bc34e2de833b764f4fc1ccb2fc0337c1d3f84bd30194897972270ef6fc502ff3822912921a15479bea273bc0aa4eeec8c68d672ce1edcdcb5cfed70926a WHIRLPOOL b80fe444f140f842677dc59cef7d19e777429e2983a808c264bed1436f505052bc239f8238ad5d739d50eb21e1f36b5f52d45010d6b3b3ae8fd296a7c4939608
-AUX syslog-ng.logrotate.hardened.in 1653 SHA256 78e3db0f0a75dfc74d9a34cd865cd02c97e37c0eb505968700faf9b6c154ac46 SHA512 a2e2e9175fc32a4c717629526940dcc6f323147e40833118ceffbd44413bfb320f94e07fdef0b99a64f72c5e7f7aa00447f81d85f8c716982636dd3241f7f955 WHIRLPOOL 03f691e64a1184526acfeaeb6187443becc7816f558774faeb1d5ee785cc09fd35f444bf79451bd91754c558b4e17caa10c69430ae3e10aed4458b108cc80c93
-AUX syslog-ng.logrotate.in 345 SHA256 7e854cbac5b376b3d1d6906fed4cff794e17998c04c647239da4245f112cf97f SHA512 d729111944527fc269e884c12fc628b95a9b83757c756a18c2e45355a7df6ed7802d1bfc0d1af37e3d5b07deaad6f42a38c70dc899835d659dd12917204b15ae WHIRLPOOL 4ae7fbe448e346265117c0fa407b6632d698cab4514937f699195306228a7b81b70cecc23937f336f808fe35fbeeaec4ec97cba8684897dcf06ffa6eecd4ea4b
+AUX syslog-ng.logrotate 281 SHA256 6d3422218b60fb45cfeee22caf50b1dbfd483c9bb5ba429d1f21beb0fc10941a SHA512 13a282e8f181115e4ceafab438f7f90db3ababc89023da69e555c444ad81e793e6bfcf45526f6a3a117db2a2c9c7119ee2a31fd16365822739a5d30c4ce390bc WHIRLPOOL cf3298a2e0a64c82f704691538928fe845a107212e7f599fcfaaa316207aa9c3183151a73b26ea5ebecd68954a460c8fa70768bc1ae431bec110e75a0c34b5c4
+AUX syslog-ng.logrotate.hardened 1664 SHA256 98e25cac1f3ac2361a254d09d489ce1cc29db8a6a06c527e56cd5398ad8e077a SHA512 2cdc75ca6d26bb8b3373fe9a95b4e2d261925a970be48c28423024d66638790a1c6464929e983b86bd901f57eef780aa8cf0a92cc244c7134accd2a030ff5890 WHIRLPOOL d6e48bb8d6e7da7b5dca154ea78f37b34665bb7cbbacc915aec3591bc345a0cfe907afb0908c3b2d55d875aabbd111a679c33cdc74ccf4770dfb3cda7eea5dfa
+AUX syslog-ng.logrotate.hardened.in 1568 SHA256 34ea3847f4add99ac59fc9476c57b96035283e938ef847a5c304d05a43ffcaec SHA512 372056598e1b90ce87a79ee09bc4798934c6f52e7a0368f7a6e3ca70f0b19a7e6c1af4eccd8fd46f0536d14d6ae8fc59c544475e47d0d069296307c045767281 WHIRLPOOL 79193f5a477adf05a3bab62720ae45dc4d646cc31cafae591bdd9be1228e915d903ce76e657a71b7ca67e8261fd2a454a1a9d0172f1aefa6988ca72531e187ce
+AUX syslog-ng.logrotate.in 269 SHA256 fc0aa61abd37f8c68f7f8b910a96380ac328d4c8c6da6ca6766a18b5cc3f6525 SHA512 4c378df35700df45793a39c852da8ef0bf94035b9a71a8f6ff0b13410ec66d3fe907592592f28b16e117e226b9324814a761d0896012ebc31bfaed76da660770 WHIRLPOOL e29d474d025b6a3e6c6ceacae81697640db8904854a78cea0f581d445940c73e10120b443a200f35f305dcbe5bf2e08e145bba546fe5082bfb795cf644a44e11
 DIST syslog-ng-3.7.1.tar.gz 3509575 SHA256 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220 SHA512 6f9a68aec2594d83c43cf40e12a3d56e65661929a47c2a053ae120e34ad358d4dfd0b5b0303a374a5557f2ac0670114037a339530b111b1078b56e5baf284ed4 WHIRLPOOL 247498f144aec419d1214378332bc286795fa8f59ba33ce75b3d000be6340758f00a694d76b5cbfdd6b68d138a6cd373c06bb52c70e6ed6de29189c03a56d16b
 DIST syslog-ng-3.7.2.tar.gz 3558377 SHA256 b1b3ccc0ce7f0d8bf15b23e59f2f4f5ded70eed410dfd27105219bc8856388a5 SHA512 dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f WHIRLPOOL 3721841f6e5ea883cd5ee71bf1651fa0861904008eb1136127c36990e2fe8801deafdf31ce880677eff7739b0b07411eee4542d8d4a80b60819fa3bd9ab24b9e
 DIST syslog-ng-3.7.3.tar.gz 3511155 SHA256 49201dcfd59c8992936aa16c694f5e6593d505b44895f6c66b7d7f7895ce2c62 SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b WHIRLPOOL ee434b8919183a70f484e6c96246b020a53a42e4306b2dea3b8ec15de71a1ad5be5185f0f3df5da76f0ca68618ff8391806748c6bea4a6844648e0939a57e97a
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
index 309e8311..6d11b7a9 100644
--- a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd
@@ -1,5 +1,5 @@
 @version: 3.6
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.fbsd,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+# $Id: 46b1a84ae19d40482927cc9fa0bebf2b3f64dfa2 $
 #
 # Syslog-ng default configuration file for Gentoo FreeBSD
 #
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
index 243d9a41..212715db 100644
--- a/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened
@@ -1,7 +1,7 @@
 @version: 3.6
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo.hardened,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $
+# $Id: 8afb55338fe95b544e92a8e8f216aa887611965b $
 
 # https://bugs.gentoo.org/show_bug.cgi?id=426814
 @include "scl.conf"
diff --git a/app-admin/syslog-ng/files/3.6/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
index 64ae93b7..0f3db4ea 100644
--- a/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/3.6/syslog-ng.rc6
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.3 2015/03/29 07:27:06 mr_bones_ Exp $
+# $Id: f31ee17927aa8031b9072c988dd7db3284de7265 $
 
 SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
 SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
index fe48e1eb..0f3db4ea 100644
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
@@ -1,7 +1,7 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 88ca55f639286ad45c05000bbd57c246f4c8375b $
+# $Id: f31ee17927aa8031b9072c988dd7db3284de7265 $
 
 SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
 SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate b/app-admin/syslog-ng/files/syslog-ng.logrotate
index e982686d..6bbbcb6a 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate,v 1.3 2008/10/15 20:46:12 mr_bones_ Exp $
+# $Id: 60a181bc05cb76f9d497620031bbac3d1cc6e3c3 $
 #
 # Syslog-ng logrotate snippet for Gentoo Linux
 # contributed by Michael Sterrett
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
index b743b146..a1353cd8 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened,v 1.3 2010/04/05 22:19:33 zorry Exp $
+# $Id: 2586fa3a4adf702c706c059ab3576e56b0318d49 $
 #
 # Syslog-ng logrotate snippet for Hardened Gentoo Linux
 # contributed by Maciej Grela
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
index 86b3bfab..58251a34 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.hardened.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $
+# $Id: e27ae40b82830acd17451a1dfeb14a5872705711 $
 #
 # Syslog-ng logrotate snippet for Hardened Gentoo Linux
 # contributed by Maciej Grela
diff --git a/app-admin/syslog-ng/files/syslog-ng.logrotate.in b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
index acd48ec3..48f28bfd 100644
--- a/app-admin/syslog-ng/files/syslog-ng.logrotate.in
+++ b/app-admin/syslog-ng/files/syslog-ng.logrotate.in
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $
+# $Id: a6a7580f665c732b414c025fb68409dd7aa7abf9 $
 #
 # Syslog-ng logrotate snippet for Gentoo Linux
 # contributed by Michael Sterrett
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index d3268bbe..0c26a080 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -4,7 +4,7 @@ AUX ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch 3187 SHA256 aa1226e726e2550248
 AUX ulogd-2.0.5-remove-db-automagic.patch 1464 SHA256 40188b4d15f59b63d4a7d5aa2852546f78e7d0b101afb9a13c4145c48bf65921 SHA512 9bf3c5c1c8ecf0d8d40f2eb56004ce8843d5aa40273539f6b34b163db60fc90bb4305e1f9b680ccefcdce33aa47e0e248df314578fc6dfb94beb346c63163897 WHIRLPOOL e4ae6b3c027215d2eac98daea795f1b4d73de07c424a1bbe5bcbd05ad5397214f0f14cb3ab65fea588f3afc58f888f8b49c4f18c98219ed876c28663813b9bdf
 AUX ulogd-2.init 951 SHA256 eedfb1e29ff8618b28f87fa454d32cbcdc6ce5714c7a0674541bea81a78a1be0 SHA512 1923e27d800a267b2cd8833d7854d623f2988f138654ff461e8adfc1a8f3c41f72c4bb0e5da27fe5abbcfdc2f09e2375fdb8b9352cf1955a3b4a3f21cebbbfa1 WHIRLPOOL f1b2276ba827e00c095d752cdf02e4006acabb8d4b232430cd29972cd3ff192a7905918fe8323f9c1b88fcdc4b6317e027a2e64573bea17ab1315d02715144ac
 AUX ulogd-2.logrotate 367 SHA256 c87f4265a35900b61108820a8841bdc24b3849e2dd36f35c2999495e2279ee67 SHA512 19856428420bfac4d94bc85908cf4a29c0dd6502ff43d212fdeabea59e9d7867bc3229c4895929fa0a423947b82e29e8234bc052dda5bf34e4566c520cec2675 WHIRLPOOL 05bf6fae2e42475f558d57d627b58ec2ab1319b453d92784ca699eab0d8db35cc6be151571614bdeaef8be4962b048a47ee704b5b99655566c4fed27d26dcc91
-AUX ulogd.init 1009 SHA256 29e60bfad913d5de7adfcfcaa5c33703beb7679981e0b38a1f312162e04e8ab6 SHA512 4165fb7e38bd537e767ccca70200265f163fda1cf13e3774445cb4da0f615b93d727d5e9380f191cdc9133c3b7906bb0ce506b65fbba09f15e9ca8de8f5dea6d WHIRLPOOL 0a8f80ff65dc5dc586b96aeb27e48e1747f20589990f6a63a0e910b8f2741f67a135bbb111cce282e7585ef3e597462172dace8ba426067da46ea64633196d7c
+AUX ulogd.init 1003 SHA256 3cbfc1cbb23d3f18e60cd0a925b8363c29076ca8bbed3a278ceb0c2b2a038da9 SHA512 20ee1f8d6061314100918ec257c4be003ad7cb617cef5d172c452c4504d20e81827454dc74e76f237b15bf46059174ed5dc01dac8c76ada188b6908b984cf613 WHIRLPOOL 1e7d0ba7e1901c9c98b08dab5a588d84966f882386de5317393afa5be3b5b050dba62e4ad756bddfd294004ca7781557cba2970ad8894355739c63351fb735b4
 AUX ulogd.init-r1 960 SHA256 578b5ea79031d5e84bc41eefa5916f69956dccb93ee5fdfcbd2462792fcb1256 SHA512 d6fa334d6e4542b2b364f5bee349564f92dbfaa03687005a512d07e4482265102cb8b12e8744df43628e700b2aff425dffeba054ab811b48f78c101ed1d450d7 WHIRLPOOL 5a549de00ff43dee15a2e8327e7c092d82f5df6b7c78fa7608246afb1c3a42d79ac21480ae0e490ef175ffc45b76d19229bd6946f88e769fd8ccd7414ecbda8f
 AUX ulogd.init-r2 1002 SHA256 efd308aa46c887aaece7da699d1ae9ac49c39fc39db4b52a6ca90ec7db92ae9e SHA512 ce3b45ef53cd5e37bca4731e4e80232cbefaa6fcd8a1df08b3b862aecba4ecf58e8a4a664aa3e2082d7a953ce87a2203d01aae839cd90b3bca9b7f0246d39ac7 WHIRLPOOL 7e8221cf1ce937ff51f3d8f883608a922dbdb9dac7ad12d57cde0d2a61526b973a0e4d94190273bd21263ffebab8880712e1fa98dd1eb40600cea9b49ff107db
 AUX ulogd.logrotate 201 SHA256 90b998fa585cb19da08732a20558fac3c5b8d7ba4d7c9ceda819f9bd2a353f70 SHA512 7258caedc613bf41c89e44fe0594836f99c710c14dab964be5470c7a714cf52d2af5a26dd9c7c781b58851236a20604c8e0a08b381bf89c69c2542eff30e209d WHIRLPOOL 0b84df546b7124463ec958ebd925caad53477aec35d6b842c4b9c0e096cd51d3c61388d0b8969abb10f2e22309736ee6851e513f86ab0675bb4e936194c17ecc
diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init
index e39141b6..ee18777a 100644
--- a/app-admin/ulogd/files/ulogd.init
+++ b/app-admin/ulogd/files/ulogd.init
@@ -1,23 +1,24 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd.init,v 1.1 2015/05/30 09:38:29 idella4 Exp $
+# $Id: 74571bb51faae5cad5fe410bc77b6346e313155b $
 
 extra_started_commands="reload reopen"
 
 : ${ULOGD_BINARY:=/usr/sbin/ulogd}
 : ${ULOGD_PIDFILE:=/var/run/${SVCNAME}.pid}
+: ${ULOGD_WAIT:=200}
 : ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
 
 depend() {
-	before iptables ip6tables ebtables firewall
+	before iptables ip6tables ebtables nftables firewall
 	after mysql postgresql
 }
 
 start() {
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start \
-		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
+		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \
 		-- ${ULOGD_OPTS}
 	eend $?
 }