Security bump (bug #524058). Removed old. Remote syslog PRI vulnerability (CVE-2014-3634)

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

14 files changed, 394 insertions, 742 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index eaac90d6cd16..3ad622905a9a 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.119 2014/08/20 15:36:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.120 2014/09/30 13:09:39 polynomial-c Exp $
+
+*rsyslog-8.4.1 (30 Sep 2014)
+
+  30 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -rsyslog-7.2.7.ebuild,
+  -rsyslog-7.4.10.ebuild, -rsyslog-7.6.3-r1.ebuild, +rsyslog-8.4.1.ebuild,
+  -files/6-stable/rsyslog-6.6.0-fix-runtime.patch,
+  +files/8-stable/README.gentoo, +files/8-stable/rsyslog.confd,
+  -files/rsyslog-7.2.5-json-c-pkgconfig.patch, +files/8-stable/50-default.conf,
+  +files/8-stable/rsyslog.conf, +files/8-stable/rsyslog.initd,
+  +files/8-stable/rsyslog.logrotate, metadata.xml:
+  Security bump (bug #524058). Removed old. Remote syslog PRI vulnerability
+  (CVE-2014-3634).
 
   20 Aug 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add proxy-maint herd.
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index c086179cda6a..e39117e9ee6f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 6-stable/rsyslog-6.6.0-fix-runtime.patch 1173 SHA256 c2a80dc2b8d83f25625ced4782f104258599ba3a9a8faa9738596d70ad8c1ced SHA512 ec478fab2371e4bc0b3e64366c1f6d1cc8836af0df257ffaaf90e387d2c2688d8e6a292377e64d7514e3afaac4626601da67645e7f332b592e13b1265ce73c28 WHIRLPOOL 81cc8f2292dfa4d916c8cd2a10360dff9c75d2f119e5502c01c93a1731222f3bda91b0928a8df80d93c24f6b673fd74859192d46c9f153c9b9a4c87a7578ccdc
 AUX 7-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
 AUX 7-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
 AUX 7-stable/bugfix_52.patch 3776 SHA256 756f7630fa2c14d9605ce560f608acdc66277abb4592feec11dc05ef9ecc01cc SHA512 1b4fb7efd2a9e3a5b16003124e63ff5434512d9d103d938d2cfaf9ceb6087bad83d5141c21bd1d13b8dad7c67b58e0359fc836dc8263652eafd5404d181b0a4f WHIRLPOOL f0062ca640e11957da6621d8e73189e6be9eca275adfff32e3f701235682535cc42d34709a9c912541764af3d74073afd82c8d8048a3521eab9b70f8198ea02d
@@ -18,21 +17,33 @@ AUX 7-stable/rsyslog.initd 985 SHA256 7b3b32e89c051566b68c5e5a077cd5960da183e071
 AUX 7-stable/rsyslog.initd-r1 1708 SHA256 35277ef9d6b9e12780ba0806ae9c99047421d9e5ed77734c344235c803d9677a SHA512 d27e28f4a45efcdf772112d38302e035777a24a5f5027385cb4b9fdef4c39aee10033e854ecdb6d9a3243026178ebcbf06e71b44a1dfe1872b8956c3d3c8fa0d WHIRLPOOL b5cd17afaacde85471483c645a339f9588a387452f73525769a2a55f710da3697890e81593d06e2156c82a82a207598c009ab5c0ea9095989d16dafbec9b108c
 AUX 7-stable/rsyslog.logrotate 555 SHA256 fe65a914ad2a90bc07dae4fe879fdc5d50c930062107528c817de4b1eb460aec SHA512 bb6354a10d7b9421ece10f5f54cca235b9195653fa33c1498995a4b538002c6eeb38eb5c44b8f41b6d8ca18ec65966587be789a8ece516ffb6cbb0557bb0f146 WHIRLPOOL ea73d1bc538ec472ed4dff35ef2a8fb0cd3b664c8cae9c7148b57ec45f5c13133ad21ca6586a1faf09b8c666ea54a91d5bd9c1206553aa7aed0325355e4c3f0e
 AUX 7-stable/rsyslog.logrotate-r1 690 SHA256 88d8587f25e222721a7db82948b43b1e9912a6599f0835dfcffee19600dffad4 SHA512 f51c61aef8e107a2e8865ff59e5ab3211db6105ad23f142369ee71519fc797113ec409e85788acf315f793f0fc57e93ccb3db2020974cc2dc17ec56a700b4bc6 WHIRLPOOL fd47e469e152772dd977d5329d2df4a1868bbb62c661a0d148eb10317a34f7c5cf8a93a36bd58741c0058d28db5ee5a0ab15260fc12c98eb1a27f9bb6aca524b
-AUX rsyslog-7.2.5-json-c-pkgconfig.patch 5587 SHA256 107990512f1cbaf4459ec83870cde288fde8ca8c95905658b1202ee8ac12e6fc SHA512 04c4b12916fe158c580d5e9ad74449108d42b7242e0c5d8ecc89f99fdd13bf68b3576d187b4ef5b52d877bc7f7b3d7a2c12786fcd08140d23521a7bbf3c50a56 WHIRLPOOL 4cfc61d46d472b874864726c0ebb88495c4437106121b79fd05f338939ae48d3b8658676305a88d5de996da69f5bdee8b25dc73275ffe4aa01b209d89fb78c81
-DIST rsyslog-7.2.7.tar.gz 2761741 SHA256 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d SHA512 4489de8f0fa63d2c9296695faacb653b43ee7a779fcc29bcb8ce0ca0442554b832e3d491248d15a6f3d9b6982cfcc669cfae750fccb58c52ad847c3a7df94e3c WHIRLPOOL d59a433c82153ad52297b05dc2422e20d90b2398f6cf4e11f0408b8565ace7d559bf80fc8e2f5fc086a693311f97ed09a5c004cd356d210c14aef9bd848d00f1
-DIST rsyslog-7.4.10.tar.gz 2924496 SHA256 ab1d26da2bfd38db34dd991a9c5d93034ef1373d01f9d5a0923bb0d4802b9fbe SHA512 8e9a665304419a738e7dac0f682681071d0269291ffe86bd4a0008a00c2bd5259d982a2f78349ee7f26d43bf85aea312293515925d9c9001d3b994dac981390d WHIRLPOOL de0410250129933351c773efa30afd7e4827d6e8542da83ad57d3536893c42552e5e0c3f337f786c45812262ec0a6bb93a3257966c64deb99ff126a924f15845
+AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
+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-7.4.4.tar.gz 2910075 SHA256 276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087 SHA512 cefaa0d5c5e9deb8a6e049a5b6c4503a9f30bfe89324a06f3e8ac6d85334bbddfec9e81010a1821ad5f902347bbc519e92d501783f77bd12f29e216a9abbfc08 WHIRLPOOL 0ba87e3edd7e0eba6ceaeef251d9e29d580452e0305c9df9577769abd53e01345a86de45c0289b945eca3d283838d7cbc4d36eb04ba8105fe3cb754c06a759b9
-DIST rsyslog-7.6.3.tar.gz 3052448 SHA256 013359035f8b6e5a4328edaffbda1120974accaba36ddc5de66a582fa588f5ec SHA512 f5bafbf7e40011e583a01d20beb1a98b78512cd537128c8f925c27b1906b22471b98d11e58c41256570fc205ec7ca756219d5cf44041ffe4e613fbd802d1f309 WHIRLPOOL 23719d6451eec4d21b022dfc2701726a00adeb132f8fe7e93826fba8693edbf949d7b6a9f3fac358482ee86b65fbccfd25330a6bbbd522e92bfc659bf01ec243
-EBUILD rsyslog-7.2.7.ebuild 7242 SHA256 b78a4318a93c2d6ce36d2e51ad216f5fa21797ebe5941daef4d5bf8fbe32c641 SHA512 8c2394ddc3855b44fc7135679e197e2acb31b1ca20efbf1469f03edb9aea73555dfa5b66c908cb6beeb36fb6254a66a8480f1814d2dfe8f5414927ef6f865f01 WHIRLPOOL 2e78d86f6c03e989237811a74138b75cc0d33435b72a3286a1943ece009d434307a1282e333c7ffc9dda4ec9d773e287676a5f16cf2e0bbe29f076e52cf39b85
-EBUILD rsyslog-7.4.10.ebuild 7286 SHA256 bf809c04b622fac07835c50022d08080f4996991807a55f594c9225dedfcbc29 SHA512 fa80b702e69d281ad60c304dfc76af7aa103f92d41c873ec88209311b23cc78d62bcfa5c1cff331d0a52d33d5e2db91c047a079f0867048af766976847eaa967 WHIRLPOOL 3ac67652764549ec67d390a9e2f7d6a505ca6f9a68c1e00cd33f4d942c92a878f708bf2710a04f4b0ffd4b0606303698bd79e5ca6ec9f98b1187ec1eea550c0e
+DIST rsyslog-8.4.1.tar.gz 1938151 SHA256 1c7f3e8ebb7f9865dd4100c4982d50567dded2218177086d1e02d698e352d8ac SHA512 20b57554d1e097b392eca2dc3dc472330072c9ccdb190d4291e952508c6392ef832041ba9aef1e2e52a5df586326958b582764bbe6cf01648cf1b11bd80ac8a6 WHIRLPOOL 8de09b6c04520d0171e27f5fb8df570ce7a8ab2ed1fda17a6ff56a2207de475761341d13813e077538e63c16e7b619e53347682e75f0629dbd6b094c6ec61fa4
+DIST rsyslog-doc-8.4.1.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
 EBUILD rsyslog-7.4.4.ebuild 7068 SHA256 5fd6b6681b9fb7677ed00541237ce6e1b1eede86c9ac4ecfff56a1ccd2aae4a1 SHA512 e979da21fde67ce6d759273cdc0cfd138d2fd4dd7550650d7a467ca5484f0eac4ce0832e13fef7ffe638f005b91eed940037e8784fc7772b1d46823c62554c3a WHIRLPOOL dfa887210559f405484b59ad0f22015dc9a832f474af108652a9defddc8ab4329e8855322904b110fc2e0cbe65805839772d6dd00ef5d1db283d2cd6b83d864f
-EBUILD rsyslog-7.6.3-r1.ebuild 9312 SHA256 9105b6dd1f6aba6e2232263e56679ad7d10d8437a7e9f319088e47615e19086f SHA512 4ff1846b77b9efda8c0271eaac334d23a44eae8d5faf330163672635d3b4752e01f92eed13f88a454263a0b2640eec640ddece652b0582a69325a93a12abf3df WHIRLPOOL ad93935860bb21b34850e06d2a2d388fddd6ef84b1925aa9f51a1409c651871c43daf68369ba7ebafd7a2ccb4be1e7ae024c1446f6aa9b1476e25cd14995ab7c
-MISC ChangeLog 22616 SHA256 e3620d198dc1130e4c8e5afbbaf90650f26acb9dda7a6a6cc83e990070240868 SHA512 374407c6e95550bde912e7ffcf8c7f885e7028b34ff7ade45ef4e01733859f33c42a30e27b19b1cfd063c09b8958f59b55e1d4b2325104b20de147d1efced449 WHIRLPOOL 3434c0a0f6fb0276c2fdaed5b64fd2db70956a4b3fd562e50dcacf025cb3255bc209c7bd5691a9d523bc068d8f4e48e7b871379ea73f487f4b0ab1b45ddb7a7d
-MISC metadata.xml 2973 SHA256 351005f3765227fe566562dd7c8811e9926a9821c3834fcaa484d852c8d119b2 SHA512 17877e3c64736d645c4330369eb23be2448d621fc3f5ae75566471a03c20408e95101d4fc8cb41bb6050a87228c89a2b20a3859f326a13857dfef5d2ecb19915 WHIRLPOOL 15a39501a2805bfaa4c1f6b4f7d07bb0d64bdea47b10015c1041acca0bc55948a9fb25a2919d30059e6be62aad23799e008d3bdac33820ab8852e48609098b54
+EBUILD rsyslog-8.4.1.ebuild 9502 SHA256 ccd900f34ffd23fad81c5a8444b3e33cd4defd6f2caddad65f5134d72456e85a SHA512 b3873abe2b6453f31a3b8e993e9c63c1d167e53170e29dd960dc6d1d44b41666a7719de5b8704481f2702bf48ea56641d9ef8018f398d71a560f38f13f81da95 WHIRLPOOL 82f186db0a9445b50fc0863fcb9dfa5b2fff90a618eba1f0d23a0c4952e72390b2b5e14f5ce30991b2d7b9923cc42da59160c1457a2c19ed4287b7807d6bf4cd
+MISC ChangeLog 23212 SHA256 12662aa96f4184023d394ff647a135830750f9b94bdff709ab3fd1bb2afdda8a SHA512 a89a2f6a31fc84d59c37eb0b7378a9506f19c6cfa107a44a1611138fc95831876fc6a74b2f51a92a8fcab92333d94caa4e871b8b9d02d61b40873ae49ccc82a1 WHIRLPOOL e2a714f8f3109474228f701c8399d3c9f296eb9d3a18821f51c940065e142ef2c743149d77843e1d00e2188479722396be280c93ca2ddeb8742d0bae205f6178
+MISC metadata.xml 3022 SHA256 beef16872a84a41762913e3e5f438d631ff6d1380670d0a715c95d4e90c3acc2 SHA512 9e5b3b2832cf3a2ca0f49cdd422552bc40c634a5080e2c92d50df637347af90c60b3427abb6ef1831f0cebf897d894f6b5ef60d15cf58937e5dd5e803cc14c5d WHIRLPOOL d7e17381498f0e211eadadbbfd560cc34b21c9771d8979cce64ac7011538f6ac52f42303ecd413a0181e4cbd5cfe672819066689af3f8bcc1aea64e90e7dc1d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP0wI4ACgkQVWmRsqeSphPgkQCeMQahjtrRtEWf4WzyVUmBzC+m
-cEUAn1ebZwmzhNzmGFB5a/nHuiNdO50k
-=IHWw
+iQIcBAEBCAAGBQJUKquUAAoJEPiazRVxLXTFBMUQAIE8cXkOOaFJxP2ELHn9jYej
+cPja4/vDspJRCKpRSLR5hT/s82ZTuCKPYuzpOSyI5lR6RruWIGizs18GMqJydoP6
+MxlpEOdsDOMvFOc4Ss6NDew+GcckKAlRVTJsMYI3xCWDCwYbZWTSkt5QDjbsV8qi
+AX0iNDSyON7qD1nBnCg5UntysFHAvzEd9MC+rzzXcsa+trgJXgYyshF2/b9v3rGL
+ZgGQ00bcm0/iEWEsPoMD8LCGQMgNxIlRpg4onelZaqiIZ75GQMhSDwxBxUC00b/7
+KHnoDTR56DTqeEDnsfpIi6VrnIKH+MAMEk0droNMyKIp3lQC1OoI8mjcgECiPlKz
+5DkNYQElhXvNlV3SD3pdgZyBEGhjV8ujB4zuWKv7CN/KphDXLzdiCM3wzZQ8mA0k
+jOT4Llyac+UaaWSRHgR3zRucdCiiQrazSVMaocsH4fbVQrcaDjLgQT5UXCbfMZGV
+szZQ+FBWhVr9BT+HFYvKHf4E2Wxpr5vl6l2r/ILdJe0F5r4fLx6g3wSLTnK+NPAB
+iJtdWJ1M+c9YPG2H2ubm20CHBuhOKbWr9GhT4NS6nS7h3OBQQHLkWSzGT5IhAR34
+5VvY0cV2noGOhl0Zozrr7Mxmei9CzlwhXyXg3eeR05jTbPkW5hKFqqVlOK0JJH0x
+amEueXW7UMSuxxactheF
+=xrbj
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/files/6-stable/rsyslog-6.6.0-fix-runtime.patch b/app-admin/rsyslog/files/6-stable/rsyslog-6.6.0-fix-runtime.patch
deleted file mode 100644
index c6f50cea2e77..000000000000
--- a/app-admin/rsyslog/files/6-stable/rsyslog-6.6.0-fix-runtime.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/runtime/Makefile.am b/runtime/Makefile.am
-index 67e235a..5287c0b 100644
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -95,12 +95,13 @@ librsyslog_la_SOURCES = \
- # runtime or will no longer be needed. -- rgerhards, 2008-06-13
- 
- if WITH_MODDIRS
--librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\" $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/:$(moddirs)\"
- else
--librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) -I\$(top_srcdir)/tools -I\$(top_srcdir)/grammar
-+librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
- endif
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS)
-+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS) $(LIBUUID_CFLAGS) $(JSON_C_CFLAGS) -I\$(top_srcdir)/tools
-+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS) $(LIBUUID_LIBS) $(JSON_C_LIBS)
- 
- #
- # regular expression support
\ No newline at end of file
diff --git a/app-admin/rsyslog/files/8-stable/50-default.conf b/app-admin/rsyslog/files/8-stable/50-default.conf
new file mode 100644
index 000000000000..9ae8578215bb
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/50-default.conf
@@ -0,0 +1,95 @@
+#######################
+### DEFAULT ACTIONS ###
+#######################
+
+auth,authpriv.* action(
+	type="omfile"
+	File="/var/log/auth.log"
+	FileCreateMode="0600"
+	FileOwner="root"
+	FileGroup="adm"
+	Sync="off"
+)
+
+cron.* action(
+	type="omfile"
+	File="/var/log/cron.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+daemon.* action(
+	type="omfile"
+	File="/var/log/daemon.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+kern.* action(
+	type="omfile"
+	File="/var/log/kern.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+lpr.* action(
+	type="omfile"
+	File="/var/log/lpr.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+mail.* action(
+	type="omfile"
+	File="/var/log/mail.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+news.* action(
+	type="omfile"
+	File="/var/log/news.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+user.* action(
+	type="omfile"
+	File="/var/log/user.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.=debug;auth,authpriv,news,mail.none action(
+	type="omfile"
+	File="/var/log/debug.log"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
+	type="omfile"
+	File="/var/log/messages"
+	FileOwner="root"
+	FileGroup="adm"
+)
+
+# Uncomment the following directive to re-enable the
+# deprecated "/var/log/syslog" log file (don't forget to re-enable log
+# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
+#*.*;auth,authpriv.none action(
+#	type="omfile"
+#	File="/var/log/syslog"
+#	FileOwner="root"
+#	FileGroup="adm"
+#)
+
+*.emerg action(
+	type="omusrmsg"
+	Users="*"
+	action.execOnlyOnceEveryInterval="10"
+)
+
+# Create an additional socket for the default chroot location
+# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
+input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo b/app-admin/rsyslog/files/8-stable/README.gentoo
new file mode 100644
index 000000000000..9f0666c86b0a
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/README.gentoo
@@ -0,0 +1,36 @@
+Introduction
+============
+
+Since rsyslog version 7.6 we are shipping a new default Gentoo
+configuration. See bug #501982 to learn more about what we were trying to
+achieve by rewriting the entire configuration.
+
+
+Important changes
+=================
+
+1. "/var/log/syslog" log file is now deprecated
+
+   Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
+   longer being written per default. We are considering this file as
+   deprecated/obsolet for the typical user/system.
+   The content from this log file is still availble through other
+   (dedicated) log files, see
+   
+     - /var/log/cron.log
+     - /var/log/daemon.log
+     - /var/log/mail.log
+     - /var/log/messages
+   
+   If you really need the old "/var/log/syslog" log file, all you have to
+   do is uncommenting the corresponding configuration directive in
+   "/etc/rsyslog.d/50-default.conf".
+   
+   If you do so, don't forget to re-enable log rotation in
+   "/etc/logrotate.d/rsyslog", too.
+
+
+2. An additional input socket in "/var/empty/dev/log" (default chroot
+   location) will be created per default
+
+   See bug #490744 for further details.
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/8-stable/rsyslog.conf
new file mode 100644
index 000000000000..da484598a652
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.conf
@@ -0,0 +1,61 @@
+# /etc/rsyslog.conf
+# 
+# This configuration is based on RainerScript, the new recommended syntax
+# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
+# details.
+# 
+# But if you don't want to learn something new at moment, don't worry: The
+# legacy syntax is still supported.
+# 
+# You may want to use the new RSYSLOG configuration builder to create your
+# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
+
+# Check config syntax on startup and abort if unclean (default: off)
+#$AbortOnUncleanConfig on
+
+
+###############
+### MODULES ###
+###############
+
+# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
+module(load="imuxsock")
+
+# Read messages from the kernel log and submits them to the syslog engine
+module(load="imklog")
+
+# Inject "--MARK--" messages every $Interval (seconds)
+#module(load="immark" Interval="600")
+
+# Read syslog messages from UDP
+#module(load="imudp")
+#input(type="imudp" port="514")
+
+# Read syslog messages from TCP
+#module(load="imtcp")
+#input(type="imtcp" port="514")
+
+
+#########################
+### GLOBAL DIRECTIVES ###
+#########################
+
+# Where to place spool and state files
+$WorkDirectory /var/spool/rsyslog
+
+# Reduce repeating messages (default: off)
+#$RepeatedMsgReduction on
+
+# Set defaults for every output file
+$Umask 0022
+
+module(
+	load="builtin:omfile"
+	Template="RSYSLOG_TraditionalFileFormat"
+	FileCreateMode="0644"
+	DirCreateMode="0755"
+)
+
+
+# Include all conf files in /etc/rsyslog.d/
+$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd b/app-admin/rsyslog/files/8-stable/rsyslog.confd
new file mode 100644
index 000000000000..d8cbe875960a
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.confd
@@ -0,0 +1,30 @@
+# /etc/conf.d/rsyslog
+
+# Configuration file
+RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
+
+# PID file
+# If you should ever change this, remember to update
+# "/etc/logrotate.d/rsyslog", too.
+RSYSLOG_PIDFILE="/run/rsyslogd.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+RSYSLOG_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (60 + 5 seconds
+# per default) when you are stopping the service.
+# You need to increase the value when you are working with a large queue.
+# See http://www.rsyslog.com/doc/queues.html for further information.
+RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
+
+
+# Options to rsyslogd
+# See rsyslogd(8) for more details
+# Notes:
+# * Do not specify another PIDFILE but use the variable above to change the location
+# * Do not specify another CONFIGFILE but use the variable above to change the location
+RSYSLOG_OPTS=""
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd b/app-admin/rsyslog/files/8-stable/rsyslog.initd
new file mode 100644
index 000000000000..ec831d7f848c
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/8-stable/rsyslog.initd,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $
+
+RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
+RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
+
+command="/usr/sbin/rsyslogd"
+command_args="${RSYSLOG_OPTS} -f ${RSYSLOG_CONFIGFILE} -i ${RSYSLOG_PIDFILE}"
+start_stop_daemon_args="${RSYSLOG_SSDARGS}"
+pidfile="${RSYSLOG_PIDFILE}"
+retry="${RSYSLOG_TERMTIMEOUT}"
+
+required_files="${RSYSLOG_CONFIGFILE}"
+
+description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
+
+extra_commands="configtest"
+extra_started_commands="rotate"
+
+description_configtest="Run rsyslogd's internal config check."
+
+description_rotate="Sends rsyslogd a signal to re-open its log files."
+
+depend() {
+	need clock hostname localmount
+	provide logger
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	rm -f ${RSYSLOG_PIDFILE}
+}
+
+configtest() {
+	# This will currently only detect fatal errors
+	# See https://github.com/rsyslog/rsyslog/issues/79
+
+	local _test_command="${command} -N 999 -f ${RSYSLOG_CONFIGFILE}"
+	local _retval=0
+
+	ebegin "Checking rsyslogd's configuration"
+	${_test_command} >/dev/null 2>&1
+	_retval=$?
+
+	if [ ${_retval} -ne 0 ]; then
+		${_test_command}
+	fi
+
+	eend ${_retval} "failed, please correct errors above"
+}
+
+rotate() {
+	ebegin "Re-opening rsyslogd logs"
+	start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
+	eend $?
+}
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
new file mode 100644
index 000000000000..1eae30e0d741
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
@@ -0,0 +1,37 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#	rotate 7
+#	daily
+#	missingok
+#	notifempty
+#	delaycompress
+#	compress
+#	postrotate
+#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#	endscript
+#}
+
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+/var/log/debug.log
+/var/log/messages
+{
+	rotate 4
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+	endscript
+}
diff --git a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch b/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
deleted file mode 100644
index 3b000e868299..000000000000
--- a/app-admin/rsyslog/files/rsyslog-7.2.5-json-c-pkgconfig.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From edf9b718d3007bdb519b3d64cb1f8145bba8e15e Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 12 Feb 2013 11:55:17 +0100
-Subject: [PATCH] Use pkg-config to detect json or json-c
-
-There was a typo in the configure.ac which prevented correct usage of pkg-config
-to detect json-c.
-This patch corrects this typo and removes all paths from json.h in source files.
-Moreover, since json-c-0.11 the pkgconfig was renamed to json-c so the
-configure.ac file was modified to check for the new one if the old one was
-not found.
-
-Reported-by: Thomas D. <whissi@whissi.de>
-Tested-by: Thomas D. <whissi@whissi.de>
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
----
- action.c                          | 2 +-
- configure.ac                      | 2 +-
- plugins/imkmsg/kmsg.c             | 2 +-
- plugins/mmjsonparse/mmjsonparse.c | 2 +-
- plugins/mmnormalize/mmnormalize.c | 2 +-
- plugins/ommongodb/ommongodb.c     | 2 +-
- runtime/msg.c                     | 2 +-
- runtime/msg.h                     | 2 +-
- template.c                        | 2 +-
- template.h                        | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-
-Index: rsyslog-7.2.7/action.c
-===================================================================
---- rsyslog-7.2.7.orig/action.c
-+++ rsyslog-7.2.7/action.c
-@@ -98,7 +98,7 @@
- #include <strings.h>
- #include <time.h>
- #include <errno.h>
--#include <json/json.h>
-+#include <json.h>
- 
- #include "dirty.h"
- #include "template.h"
-Index: rsyslog-7.2.7/configure.ac
-===================================================================
---- rsyslog-7.2.7.orig/configure.ac
-+++ rsyslog-7.2.7/configure.ac
-@@ -34,7 +34,9 @@ PKG_PROG_PKG_CONFIG
- # modules we require
- PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.5)
- PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
--PKG_CHECK_MODULES([JSON_C], [json])
-+PKG_CHECK_MODULES([JSON_C], [json],, [
-+	PKG_CHECK_MODULES([JSON_C], [json-c])
-+])
- 
- case "${host}" in
-   *-*-linux*)
-@@ -764,7 +766,7 @@ if test "x$enable_rsyslogrt" = "xyes"; t
-   RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la"
- fi
- AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes)
--RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
-+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)"
- RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
- AC_SUBST(RSRT_CFLAGS1)
- AC_SUBST(RSRT_LIBS1)
-Index: rsyslog-7.2.7/plugins/imkmsg/kmsg.c
-===================================================================
---- rsyslog-7.2.7.orig/plugins/imkmsg/kmsg.c
-+++ rsyslog-7.2.7/plugins/imkmsg/kmsg.c
-@@ -35,7 +35,7 @@
- #ifdef  OS_LINUX
- #include <sys/klog.h>
- #endif
--#include <json/json.h>
-+#include <json.h>
- 
- #include "rsyslog.h"
- #include "srUtils.h"
-Index: rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
-===================================================================
---- rsyslog-7.2.7.orig/plugins/mmjsonparse/mmjsonparse.c
-+++ rsyslog-7.2.7/plugins/mmjsonparse/mmjsonparse.c
-@@ -36,7 +36,7 @@
- #include <unistd.h>
- #include <ctype.h>
- #include <libestr.h>
--#include <json/json.h>
-+#include <json.h>
- #include "conf.h"
- #include "syslogd-types.h"
- #include "template.h"
-Index: rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
-===================================================================
---- rsyslog-7.2.7.orig/plugins/mmnormalize/mmnormalize.c
-+++ rsyslog-7.2.7/plugins/mmnormalize/mmnormalize.c
-@@ -40,7 +40,7 @@
- #include <unistd.h>
- #include <libestr.h>
- #include <libee/libee.h>
--#include <json/json.h>
-+#include <json.h>
- #include <liblognorm.h>
- #include "conf.h"
- #include "syslogd-types.h"
-Index: rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
-===================================================================
---- rsyslog-7.2.7.orig/plugins/ommongodb/ommongodb.c
-+++ rsyslog-7.2.7/plugins/ommongodb/ommongodb.c
-@@ -33,7 +33,7 @@
- #include <stdint.h>
- #include <time.h>
- #include <mongo.h>
--#include <json/json.h>
-+#include <json.h>
- /* For struct json_object_iter, should not be necessary in future versions */
- #include <json/json_object_private.h>
- 
-Index: rsyslog-7.2.7/runtime/msg.c
-===================================================================
---- rsyslog-7.2.7.orig/runtime/msg.c
-+++ rsyslog-7.2.7/runtime/msg.c
-@@ -41,7 +41,7 @@
- #endif
- #include <netdb.h>
- #include <libestr.h>
--#include <json/json.h>
-+#include <json.h>
- /* For struct json_object_iter, should not be necessary in future versions */
- #include <json/json_object_private.h>
- #if HAVE_MALLOC_H
-Index: rsyslog-7.2.7/runtime/msg.h
-===================================================================
---- rsyslog-7.2.7.orig/runtime/msg.h
-+++ rsyslog-7.2.7/runtime/msg.h
-@@ -30,7 +30,7 @@
- 
- #include <pthread.h>
- #include <libestr.h>
--#include <json/json.h>
-+#include <json.h>
- #include "obj.h"
- #include "syslogd-types.h"
- #include "template.h"
-Index: rsyslog-7.2.7/template.c
-===================================================================
---- rsyslog-7.2.7.orig/template.c
-+++ rsyslog-7.2.7/template.c
-@@ -34,7 +34,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <assert.h>
--#include <json/json.h>
-+#include <json.h>
- #include "stringbuf.h"
- #include "syslogd-types.h"
- #include "template.h"
-Index: rsyslog-7.2.7/template.h
-===================================================================
---- rsyslog-7.2.7.orig/template.h
-+++ rsyslog-7.2.7/template.h
-@@ -30,7 +30,7 @@
- #ifndef	TEMPLATE_H_INCLUDED
- #define	TEMPLATE_H_INCLUDED 1
- 
--#include <json/json.h>
-+#include <json.h>
- #include <libestr.h>
- #include "regexp.h"
- #include "stringbuf.h"
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index df2c41bfbc21..af89009689f2 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 		<name>Ultrabug</name>
@@ -17,6 +16,7 @@
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="extras">Add support for the UDP spoofing module (omudpspoof) using <pkg>net-libs/libnet</pkg></flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
+		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
 		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-7.2.7.ebuild b/app-admin/rsyslog/rsyslog-7.2.7.ebuild
deleted file mode 100644
index a2d5c3d05721..000000000000
--- a/app-admin/rsyslog/rsyslog-7.2.7.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.2.7.ebuild,v 1.10 2014/04/16 16:14:41 maksbotan Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 ~arm hppa x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.5
-	dev-libs/libgcrypt:0
-	dev-libs/liblognorm
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.1 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.2.5-json-c-pkgconfig.patch
-
-	# Fix runtime UUID/JSON libs linking
-	"${FILESDIR}"/6-stable/${PN}-6.6.0-fix-runtime.patch
-
-	# Fix for #507730
-	"$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-)
-
-src_prepare() {
-	# Don't force '-g' CFLAG
-	sed -e 's/CFLAGS="\(.*\) -g"/CFLAGS="\1"/g' -i configure.ac || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	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
-}
-
-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="${ROOT}/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-7.4.10.ebuild b/app-admin/rsyslog/rsyslog-7.4.10.ebuild
deleted file mode 100644
index 1744fa9eaf7e..000000000000
--- a/app-admin/rsyslog/rsyslog-7.4.10.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.4.10.ebuild,v 1.2 2014/04/16 16:14:41 maksbotan Exp $
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils eutils systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-SLOT="0"
-IUSE="dbi debug doc extras kerberos mongodb mysql oracle postgres relp snmp ssl static-libs systemd zeromq zlib"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libee
-	>=dev-libs/libestr-0.1.9
-	dev-libs/libgcrypt:=
-	>=dev-libs/liblogging-1.0.1:=
-	<dev-libs/liblognorm-1.0.0:=
-	dbi? ( dev-db/libdbi )
-	extras? ( net-libs/libnet )
-	kerberos? ( virtual/krb5 )
-	mongodb? ( dev-libs/libmongo-client )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	relp? ( >=dev-libs/librelp-1.0.3 )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( net-libs/gnutls )
-	systemd? ( sys-apps/systemd )
-	zeromq? ( >=net-libs/zeromq-3 <net-libs/czmq-2 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BRANCH="7-stable"
-
-# need access to certain device nodes
-RESTRICT="test"
-
-# Maitainer note : open a bug to upstream
-# showing that building in a separate dir fails
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-DOCS=(AUTHORS ChangeLog doc/rsyslog-example.conf)
-
-src_prepare() {
-	epatch "$FILESDIR"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * rfc3195 needs a library and development of that library
-	#   is suspended, so we disable it
-	# * About the java GUI:
-	#   The maintainer says there is no real installation support
-	#   for the java GUI, so we disable it for now.
-	# * mongodb : doesnt work with mongo-c-driver ?
-	local myeconfargs=(
-		--enable-cached-man-pages
-		--disable-gui
-		--disable-rfc3195
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		--enable-largefile
-		--enable-mail
-		--enable-mmnormalize
-		--enable-mmjsonparse
-		--enable-mmaudit
-		--enable-mmanon
-		--enable-omprog
-		--enable-omstdout
-		--enable-omuxsock
-		--enable-pmlastmsg
-		--enable-pmrfc3164sd
-		--enable-pmcisconames
-		--enable-pmaixforwardedfrom
-		--enable-pmsnare
-		--enable-sm_cust_bindcdr
-		--enable-unlimited-select
-		--enable-uuid
-		$(use_enable dbi libdbi)
-		$(use_enable debug)
-		$(use_enable debug rtinst)
-		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
-		$(use_enable debug valgrind)
-		$(use_enable extras omudpspoof)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable oracle)
-		$(use_enable postgres pgsql)
-		$(use_enable relp)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
-		$(use_enable systemd omjournal)
-		$(use_enable zlib)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omzmq3)
-		"$(systemd_with_unitdir)"
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=(doc/)
-	autotools-utils_src_install
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}-gentoo.conf" ${PN}.conf
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		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
-}
-
-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="${ROOT}/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-7.6.3-r1.ebuild b/app-admin/rsyslog/rsyslog-8.4.1.ebuild
index ca923bbbaf1e..1bd885c739af 100644
--- a/app-admin/rsyslog/rsyslog-7.6.3-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3-r1.ebuild,v 1.2 2014/06/16 02:26:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.1.ebuild,v 1.1 2014/09/30 13:09:39 polynomial-c Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -9,12 +9,15 @@ inherit autotools-utils eutils systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz"
+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 )
+"
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 KEYWORDS="~amd64 ~arm ~hppa ~x86"
 SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
 
 RDEPEND="
 	>=dev-libs/json-c-0.11:=
@@ -24,13 +27,13 @@ RDEPEND="
 	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-0.3.1:=
-		!>=dev-libs/liblognorm-1.0.0
+		>=dev-libs/liblognorm-1.0.0:=
 	)
 	omudpspoof? ( >=net-libs/libnet-1.1.6 )
 	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
@@ -47,7 +50,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-BRANCH="7-stable"
+BRANCH="8-stable"
 
 # Test suite requires a special setup or will always fail
 RESTRICT="test"
@@ -61,16 +64,21 @@ AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
 DOCS=(
 	AUTHORS
 	ChangeLog
-	doc/rsyslog-example.conf
 	"${FILESDIR}"/${BRANCH}/README.gentoo
 )
 
-PATCHES=(
-	"${FILESDIR}"/${BRANCH}/${PN}-7.x-mmjsonparse.patch
-	"${FILESDIR}"/${BRANCH}/fix-omruleset-default-value.patch
-	"${FILESDIR}"/${BRANCH}/bugfix_52.patch
-	"${FILESDIR}"/${BRANCH}/bugfix_73.patch
-)
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	if use doc; then
+		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
+}
 
 src_configure() {
 	# Maintainer notes:
@@ -89,6 +97,7 @@ src_configure() {
 	fi
 
 	local myeconfargs=(
+		--disable-generate-man-pages
 		# Input Plugins without depedencies
 		--enable-imfile
 		--enable-impstats
@@ -97,7 +106,6 @@ src_configure() {
 		# Message Modificiation Plugins without depedencies
 		--enable-mmanon
 		--enable-mmaudit
-		--enable-mmcount
 		--enable-mmfields
 		--enable-mmjsonparse
 		--enable-mmpstrucdata
@@ -111,11 +119,11 @@ src_configure() {
 		--enable-omuxsock
 		# Misc
 		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
 		--enable-pmcisconames
 		--enable-pmlastmsg
 		--enable-pmrfc3164sd
 		--enable-pmsnare
-		--enable-sm_cust_bindcdr
 		# DB
 		$(use_enable dbi libdbi)
 		$(use_enable mongodb ommongodb)
@@ -133,6 +141,7 @@ src_configure() {
 		# Misc
 		$(use_enable elasticsearch)
 		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
 		$(use_enable kerberos gssapi-krb5)
 		$(use_enable normalize mmnormalize)
 		$(use_enable omudpspoof)
@@ -155,11 +164,11 @@ src_configure() {
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}"/doc/ )
+	use doc && HTML_DOCS=( "${S}/docs/build/" )
 	autotools-utils_src_install
 
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
 
 	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
@@ -173,7 +182,7 @@ src_install() {
 	doins "${FILESDIR}/${BRANCH}/50-default.conf"
 
 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate-r1" ${PN}
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql