stable fixes thx to Thomas D. drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 91 insertions, 427 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index da03e33864a7..2ed5945924f0 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.134 2015/03/23 11:44:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.135 2015/03/26 15:17:05 ultrabug Exp $
+
+*rsyslog-8.7.0-r2 (26 Mar 2015)
+
+  26 Mar 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.6.0.ebuild,
+  -rsyslog-8.7.0-r1.ebuild, +rsyslog-8.7.0-r2.ebuild,
+  +files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch,
+  +files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch:
+  stability fixes thx to Thomas D., drop old
 
 *rsyslog-8.7.0-r1 (23 Mar 2015)
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 84bd161bfb6f..3d4fd68ff337 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -4,26 +4,25 @@ Hash: SHA256
 AUX 8-stable/10-respect_CFLAGS-r1.patch 781 SHA256 14d8f77bbab2e77e177f357e93766b599c06e70ccc9c1ff0d74fc18a463a995b SHA512 a3db26c106e83805d4fe066fff1abfc6c04031933528f61ddda95098c1199e53deebada98834e06f202656f1b2ab06f3a7e765ee58d37407b9fbd96d2b4deb66 WHIRLPOOL aa64b9aa2014b217004a13abae429c2b11e3dc8c056e0206be3d69f3e45e888404adcc208348db35c4d4ced986310b453984ce6d3b585fe60fc419d5f02e2eb6
 AUX 8-stable/10-respect_CFLAGS.patch 646 SHA256 e1c28e8088a9237d3987da5b6902235eb11de3343f3d3516cb4f011d25f70cac SHA512 446ae1bd61817ed20012b504db81daeb2b8e121d82ca4c6dc561a3e468e740d676ac695dfc46c4417b62c3d97fcd4b2db9e9207ef65017eda2a090a9fc209594 WHIRLPOOL 2bc4c4800c9f0650f181fa1095cc4b5c495936a5a3bd82b50281b4d23dbf76fdd2d10d0419c13284f345496ca0006781efe7a0f51edc1d6f858b04ad63b7453f
 AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+AUX 8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch 1148 SHA256 058ff2c124656a8f156e021530df0cf80d4adc37e347612f3cb2b60574cd84a7 SHA512 1f7ebb3b5e0b2fb6ada7c176893488082a681224e7fca66d7370ef679974341ce289df853d302a858a732d0af3082bce67bee2f081950c96021699993e845a9c WHIRLPOOL 2a2296e9f448cb8a22dfb18787748ee9a4ce950d76d42966493d179cae97b71f3a60bf139b69c8b3f968594c32f4627f7ea449e99b83cad281c25e46bd1f5b90
+AUX 8-stable/50-rsyslog-run-queue-persist-test-only-once.patch 616 SHA256 94cbb40e2d4bc23313385323e6ae4f58ec979ba01bf01bbef7c8b6867a696ec9 SHA512 087d5b0911baa898e3fe7b2b80b15923129c3a5d4874f17693508760c1e38b44139b2fd7e1cb4b8c589631d0c41b56ed26ad8df2300ad2f18be43d0f5f04ba4f WHIRLPOOL 6062c8acda4ca608e4f7d94585b8ea40823f40d37e25428d18824e36f0299bcd7b912e8ab0dcc1631ddcf709754e74d46aaf5e9115cbe36b3d8a55f939436a5c
 AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
 AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
 AUX 8-stable/rsyslog.confd 1140 SHA256 f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4 SHA512 8501be8d0abc166994863db61afa5a4ef120aaec601d86fb71711b557741d39b29b96a4d688e7af6ad8d5d15a1257821ca299c5f7391f2ce66cd95e33ea2ff7c WHIRLPOOL 0a3617defa10acfa693a3339e1f7ec69c9272b44aac6fda30b49452f32ea7037743acfd871cea025f1e584639725588286056db6e17663c2806ed47088600d35
 AUX 8-stable/rsyslog.initd 1711 SHA256 204c66d2b7d4d20115acc7499708cf538538fe1c100281ad55f909508041fb19 SHA512 fa0c447243c7aa539a6a0877a4dbfc3b7111e9e0fb3df29d866eb39388c074b7452b644fa25da4311c1513180e11f2929408833f430f03a1835b6d36e19e5a78 WHIRLPOOL d4004080a86739121d82aae33bb0634e074c9bcc3764e7cac0da52433e61450e706367f95378ed8b135a28b9c9fd3041cabefec30ca607770bae47ca53dec72e
 AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
 DIST rsyslog-8.4.2.tar.gz 1938563 SHA256 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a SHA512 f3a8af9c859fac4f490d8836f2083125c2daddf0647df06318628ad92cb63538612ecdc78f725bd3e3725a3c79f0c06a67fafe6a2fd5c9194fa18020de6d3847 WHIRLPOOL b4a17389215202158721739b216f43602668c62d52f169362a548f8db0fdc2c8e8114eb8b12727f638ede3077f1172d5077eb9dc64c5f29e28282cee145e098e
-DIST rsyslog-8.6.0.tar.gz 1975854 SHA256 759f836be460c794a7649f2b5b5ef8d423388ec599bf3b49f51fded3f8c02431 SHA512 e7ca2c0dac249aaee8af8d647dff222b8042b4f2cb0985a7d6748066f03643efbf0d66bcaac4193b1a63a93c86b12b6dbf866ba305d3e1015b82b2009ae3770d WHIRLPOOL 442075d126752260980091c4ea13b3724dd4e6113092e31bcc563fe395315153691bfafacf58c586aea0cf21be1b9f03a9a680d14751373f4c61c22f7c83c614
 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d
 DIST rsyslog-doc-8.4.2.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
-DIST rsyslog-doc-8.6.0.tar.gz 4056307 SHA256 515a33c2aabeb64b0fee3096aa6544a3b4a7e8b2c63963b535090d3ce9d37909 SHA512 c40edd8531ea857ff183db06c7c57b0ffbb940522da485400591741d1ce998642309c4b8596315b0d20bde895d704f71929178f154b76d4ec65800b5082b0e5c WHIRLPOOL 19e1d8d57e473a2b00138146a1b754887c65db326b936a79b86baefb1c2f891ffe4760322e177ee710c589cf93c060917aec027bf265322a7c28a34ce6993208
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
 EBUILD rsyslog-8.4.2.ebuild 9553 SHA256 7a4c84cef6a9dfd89be22ca8736487597acf5ebe022ab6e7fbadd0f30f1e3c44 SHA512 29c00a2bc9c879e75a14af69f82c0a4eb734d82862a5e02c1c194a3aff8191f22ba32afb256683a3e2d68374d89a30b1a16446180f35a6f2ec53d6b1a326ca1f WHIRLPOOL c1624c6f3fe27c233a8193b1ce7010be36f8c8c3ac2c4a4115cd1ff5da78b5b17924ce3a9a72d4190abb9a1415b184da84427c3f2f5b74de99b04ef586d16993
-EBUILD rsyslog-8.6.0.ebuild 10905 SHA256 6874ab8f77c0d553e41936b76afc7d8c9db5006aa86b7e7b7873c6dcbee35096 SHA512 e693d3e15d470a7badf100ba563294effffad179c5df64aafa1c6a372904c755c9aa4c6f201a956167ffffb6e6a51ab732cf84bce2dafbde21c4848a4d447df7 WHIRLPOOL fcb4d11a84feeb8ae28da28b4294888031c8ede7965edf8b10badb47a68227b09c025f11946fa8701645819ef8973088b7eafdc268f22c82bb1452d6bee9a705
-EBUILD rsyslog-8.7.0-r1.ebuild 10744 SHA256 e5d5a539c5d0fb527f9e8a185e2b98c458fe6304ef57b5840f4aa6913edae3c3 SHA512 6fac3ec853310e755a1c1da833cefeb4e6745d340bc5c4001874e6c7d334ba4ba00eaa3524edbc27e7ea73850bd54f4b9fa7cd956c7ad74b67fd36be56185eaa WHIRLPOOL e5b7dd2546986617973a2b318d5c0b9b0fcee885eff985cf4163bf65ac15f2610ca29bd65ef2e0488b5c064892d6d6a5e5a5548e3c4cd0131ec273a77c346a58
-MISC ChangeLog 25772 SHA256 50a542c2b417b123f8d5c207b65d519427789cba82105cd41da4258cd7afaaf6 SHA512 4747a77b875cb77ed7f8ea83c4262d888097ad4c6cf45638d3871b57ce5c3f60da5e9a231f25642a88fea55eb9deb8dc189bcdbf0f375da7fa515555d499668e WHIRLPOOL 406458619ed1467988ae1a9b92b0697e044106b2e530021fa0514079ace1a70272bad04676bb7c8e250560231d5e741420fd2827b8e2a3cf87e6939fc832d251
+EBUILD rsyslog-8.7.0-r2.ebuild 11185 SHA256 770ff78e66f88d51df1129c7cf16394d8510369a4453c25bd3cedc1637fc0eca SHA512 1e69fdf9caed3bd6b95c9b8904088ae97c2bd8ab2cdcfb4d1bc5c54b7b1e710a6359bb460be69b324e1412a5f12a6f8cb91d844b4281f6e8295a3fdc1abe590a WHIRLPOOL 9640323300f8970acf5f6ff8442fbaba28ee79456b07e8872c0e1383236c842d50bbbf24be23d42d6406609b913f964f4e6e340e242b078c9f283b1c589aa550
+MISC ChangeLog 26119 SHA256 b121a66fa3a0d0d89364da42d725394051cbd51726023938e173a3f8432cb6f1 SHA512 7891f615b680c19c327c7a09c6fa507d0f43b72bc96bc92cf558f4f13b60f3136da2d6e166d14d893fb3dc08463c3f58b0c6603795f62ae70100ed566046528b WHIRLPOOL 4bb0904f87d3e9f1033599b20a346e1a4b959e408ec2e717e5ecf01b5e52c8d77cabaf75c710f457ffec26cacbe4118edd25e564e58a281bc2348490ca0ccfa7
 MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUP/LAACgkQKiQSS7ZY+hMocgD9Gorbzk+rEXsski3FVzTQv+xu
-3zjRki0rwwkQ3/SYnUYBAIm6pbKXFfdyOWAwv2+TM2DdI23zoMjMYCO/fNWoWjg5
-=cHNN
+iF4EAREIAAYFAlUUIvoACgkQKiQSS7ZY+hPwfAEA5iHUASPI51pohqUYupnWPY0j
+QFny4pqsKVOt/sDSJroA/193JmNuBSUZNIfrgC/q9NgeqUMrSC73eJqgQmPVRZrJ
+=bJIT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch
new file mode 100644
index 000000000000..67a2f0616f32
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch
@@ -0,0 +1,31 @@
+From 3b7bd0b7a7f0f5f1bf7609bdf34e7d9a32608ea6 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Tue, 17 Mar 2015 11:50:06 +0100
+Subject: [PATCH] bugfix: size-based legacy config statements did not work
+ properly
+
+on some platforms they misadressed memory, which could also lead
+to a segfault on startup. The problem is NOT experience on amd686
+in 64bit builds -- that's probably the reason this bug was uncovered
+very late. We assume, it's present in all v8 versions.
+
+Thanks to Michael Biebl for alerting us of it.
+
+closes https://github.com/rsyslog/rsyslog/issues/270
+---
+ runtime/cfsysline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
+index 36d4679..b441a48 100644
+--- a/runtime/cfsysline.c
++++ b/runtime/cfsysline.c
+@@ -161,7 +161,7 @@ static rsRetVal parseIntVal(uchar **pp, int64 *pVal)
+  * param value must be int64!
+  * rgerhards, 2008-01-09
+  */
+-static rsRetVal doGetSize(uchar **pp, rsRetVal (*pSetHdlr)(void*, uid_t), void *pVal)
++static rsRetVal doGetSize(uchar **pp, rsRetVal (*pSetHdlr)(void*, int64), void *pVal)
+ {
+ 	DEFiRet;
+ 	int64 i;
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch b/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch
new file mode 100644
index 000000000000..d2ded2228983
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch
@@ -0,0 +1,22 @@
+From 31a5edc9be63de42f68825ff8e4d683534664a68 Mon Sep 17 00:00:00 2001
+From: Thomas D.
+Date: Sun, 8 Mar 2015 21:05:03 +0100
+Subject: [PATCH] tests: Run queue-persist.sh only once
+
+queue-persist.sh was called twice in Makefile.
+---
+ tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7575b84..9824e7e 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -83,7 +83,6 @@ TESTS +=  \
+ 	imuxsock_logger_root.sh \
+ 	imuxsock_traillf_root.sh \
+ 	imuxsock_ccmiddle_root.sh \
+-	queue-persist.sh \
+ 	discard-rptdmsg.sh \
+ 	discard-allmark.sh \
+ 	discard.sh \
diff --git a/app-admin/rsyslog/rsyslog-8.6.0.ebuild b/app-admin/rsyslog/rsyslog-8.6.0.ebuild
deleted file mode 100644
index bd8914f3b1bd..000000000000
--- a/app-admin/rsyslog/rsyslog-8.6.0.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild,v 1.3 2015/02/23 11:19:30 ultrabug Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="
-		git://github.com/rsyslog/${PN}.git
-		https://github.com/rsyslog/${PN}.git
-	"
-
-	DOC_REPO_URI="
-		git://github.com/rsyslog/${PN}-doc.git
-		https://github.com/rsyslog/${PN}-doc.git
-	"
-
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="
-		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
-
-RDEPEND="
-	>=dev-libs/json-c-0.11:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
-	kerberos? ( virtual/krb5 )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/mysql )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-1.0.0:=
-	)
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20 )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
-	redis? ( >=dev-libs/hiredis-0.11.0 )
-	relp? ( >=dev-libs/librelp-1.2.5 )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23 )
-	systemd? ( >=sys-apps/systemd-208 )
-	zeromq? ( >=net-libs/czmq-1.2.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
-	RDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-fi
-
-BRANCH="8-stable"
-
-if [[ ${PV} < "8.7" ]]; then
-	# Test suite is broken in v8.6.0 release tarball
-	# Upstream is notified; Will be fixed with v8.7.0 in January
-	RESTRICT="test"
-fi
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	"${FILESDIR}"/${BRANCH}/README.gentoo
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-		else
-			local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
-			cd "${S}" || die "Cannot change dir into '$S'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${doc_tarball}
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
-
-	epatch_user
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-generate-man-pages
-		$(use_enable test testbench)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable normalize mmnormalize)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use doc -a ${PV} == "9999"; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [ -z "${_has_increased_ulimit}" ]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv $FEATURES; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}/docs/build/" )
-	autotools-utils_src_install
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
-		# Show this message until rsyslog-8.x
-		echo
-		elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
-		elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
-
-		advertise_readme=1
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [ ! -d "${CERTDIR}" ]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild
index f828be357a3b..f2edd509ab34 100644
--- a/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r1.ebuild,v 1.1 2015/03/23 11:44:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0-r2.ebuild,v 1.1 2015/03/26 15:17:05 ultrabug Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -10,6 +10,12 @@ inherit autotools-utils eutils systemd
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
 
+BRANCH="8-stable"
+
+PATCHES=(
+	"${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
+)
+
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="
 		git://github.com/rsyslog/${PN}.git
@@ -28,6 +34,9 @@ else
 		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
 	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+
+	PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-run-queue-persist-test-only-once.patch )
+	PATCHES+=( "${FILESDIR}"/${BRANCH}/50-rsyslog-fix-size-based-legacy-config-statements.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
@@ -68,8 +77,6 @@ if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
 fi
 
-BRANCH="8-stable"
-
 # Maitainer note : open a bug to upstream
 # showing that building in a separate dir fails
 AUTOTOOLS_IN_SOURCE_BUILD=1
@@ -92,8 +99,20 @@ src_unpack() {
 
 	if use doc; then
 		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [ -n "${EGIT_BRANCH}" ]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
 			git-r3_fetch "${DOC_REPO_URI}"
 			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [ -n "${_EGIT_BRANCH}" ]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
 		else
 			local doc_tarball="${PN}-doc-${PV}.tar.gz"
 
@@ -105,14 +124,6 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
-
-	epatch_user
-
-	autotools-utils_src_prepare
-}
-
 src_configure() {
 	# Maintainer notes:
 	# * Guardtime support is missing because libgt isn't yet available