bump(app-admin/rsyslog): sync with upstream

This commit is contained in:
Nick Owens 2016-07-05 11:03:47 -07:00
parent 240059ca92
commit 428d68162b
15 changed files with 2182 additions and 17 deletions

View File

@ -157,3 +157,155 @@
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
*rsyslog-8.16.0-r1 (12 Mar 2016)
12 Mar 2016; Ian Delaney <idella4@gentoo.org>
+files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch,
+rsyslog-8.16.0-r1.ebuild:
Rev bump to fix a leap year issue
Bug: https://github.com/rsyslog/rsyslog/issues/830
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1034
12 Mar 2016; Ian Delaney <idella4@gentoo.org> -rsyslog-8.16.0.ebuild:
Remove old version affected by leap year issue
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1034
14 Mar 2016; Patrice Clement <monsieurp@gentoo.org>
rsyslog-8.16.0-r1.ebuild:
Remove elibtoolize call.
No need to manually call elibtoolize, eautoreconf already does it.
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1048
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.16.0-r1.ebuild:
amd64 stable wrt bug #577494
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.16.0-r1.ebuild:
x86 stable wrt bug #577494
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
21 Mar 2016; Anthony G. Basile <blueness@gentoo.org> rsyslog-8.13.0.ebuild,
rsyslog-8.16.0-r1.ebuild:
fix openssl and libressl slots
Package-Manager: portage-2.2.26
20 Apr 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Update postgresql-base -> postgresql
*rsyslog-8.18.0 (26 Apr 2016)
26 Apr 2016; Ian Delaney <idella4@gentoo.org>
+files/8-stable/50-rsyslog-8.18.0-issue963.patch,
+files/8-stable/50-rsyslog-8.18.0-issue964.patch, metadata.xml,
+rsyslog-8.18.0.ebuild:
Bump to v8.18.0
Keyword for hppa dropped because of unkeyworded deps
Use flag grok p-use masked under:
- profiles/arch/arm/package.use.mask
- profiles/default/linux/uclibc/arm/package.use.mask
Gentoo-bug: #577508, #577008, #577510, #581180
Signed-off-by: Ian Delaney <idella4@gentoo.org>
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1348
Signed-off-by: Ian Delaney <idella4@gentoo.org>
03 May 2016; Lars Wendler <polynomial-c@gentoo.org> rsyslog-8.18.0.ebuild:
Fix USE=doc
Bug: https://bugs.gentoo.org/581722
Package-Manager: portage-2.2.28
18 May 2016; Austin English <wizardedit@gentoo.org>
files/8-stable/rsyslog.initd-r1:
use #!/sbin/openrc-run instead of #!/sbin/runscript
19 May 2016; Jeroen Roovers <jer@gentoo.org> rsyslog-8.18.0.ebuild:
Mark ~hppa (bug #577008).
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches
23 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
bash syntax tidy
replace POSIX '[' with the bash '[[' in 8.18.0
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1511
Signed-off-by: Ian Delaney <idella4@gentoo.org>
23 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
use prune_libtool_files from eutils in 8.18.0
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1511
Signed-off-by: Ian Delaney <idella4@gentoo.org>
24 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
Revert "app-admin/rsyslog: use prune_libtool_files from eutils in 8.18.0"
This reverts commit 663fd153682eb51e2a89e87b52d9a3f25f28f742.
Change to use of prune_libtool_files in src_install reverted from
advice form a qa team member
26 May 2016; Jeroen Roovers <jer@gentoo.org> rsyslog-8.16.0-r1.ebuild:
Stable for HPPA (bug #577494).
Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org> rsyslog-8.18.0.ebuild:
Adjust sub-SLOT dependency
This commit also re-apply changes from the previous reverted
commit 663fd153682eb51e2a89e87b52d9a3f25f28f742:
The ebuild inherits linux-info eclass which already inherit
eutils eclass so we can use prune_libtool_files helper.
Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1659
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
*rsyslog-8.19.0 (12 Jun 2016)
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org> +rsyslog-8.19.0.ebuild:
Version bump to v8.19.0
Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1659
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org>
-files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch,
-files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch,
-rsyslog-8.13.0.ebuild:
Remove old
Package-Manager: portage-2.3.0_rc1
Closes: https://github.com/gentoo/gentoo/pull/1659
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

View File

@ -1,20 +1,24 @@
AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
AUX 8-stable/50-rsyslog-8.12.0-fix-re_extract.patch 4655 SHA256 4fb31dda010142ee8846d3e7f1be199675d9b3e0cb05b8839911e9ee61182c06 SHA512 529cfda94676d7c9697c4ff9838aee5eaee645852d0a352ae733d94c87d647b63c5a6dc9d8ba733b2d6807df10cca5d7954c8b163e83ab9ef14dc59754344c31 WHIRLPOOL e8272c74b08c8961821cd30371d0f2385040b68c272f2d3d2fd3086596775fae34ccfc9ac90e8a32c4e2003e4532188245ce685053af10607ce8a6a0f9d0bf38
AUX 8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch 5093 SHA256 9cb964f60c33ed9b8743b4b78ad2087b8570119b95c7b71f40834638924e685f SHA512 3afbea5af677a0f8ebb4c0a6361fefbc437d938ebe84666cb40d5a5f6572393bdb530be4bcd249d59f9bf7d111e96cc9ceaf0d529f2fbd3134156b96991bdc12 WHIRLPOOL 7fbf0ed2f4400bdc744fb202d34cfd57abcc1d8c7638e8c8a36b8d91179b2401987e5b2fc1c47dce3b57794aeba9770c6717613fd37c37718fb01a25acf00fec
AUX 8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch 989 SHA256 99220c0acf3ecbf4d130d10188059e9721297bc1ac6c020f55688db6bd83a036 SHA512 b28d90e7a0fdcac4596d6b0312e11ed3c82a061f56bc250b766c82bc84adbd4bcdc2febd1e90c2737a9eb1fa70bf951eb5957349b5dd8ac736432a5eb370aae5 WHIRLPOOL 2de5d540d40b4975d3aa8b6d571cfedcd7c1f67a0d8103939f587b1dd46b7ef283b87c6baea5343dea14254b8e45bf3c280a1d9a155652a762dd71a1c851e037
AUX 8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch 704 SHA256 4bc253e3c03a689171f5d22e9e700f3ae4c413a07e455ecd8fd36c141124410a SHA512 a87b5f451cb1134fde6749f612f948f6ee9fde5acbbd26a259d229f765987ac397285f0f56ba25ea348158421217018e77258b31cd20f64abc8377d3635be5bb WHIRLPOOL df8267969ee2fb461dd7dcac2b76c6b4ee540c21e6f55bba61cf85e2747870b633c87a49264e65de6627ed3f25874c684287d3163654acb3944972939e449ba9
AUX 8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch 3026 SHA256 e6381bb06ff95adfc2afe9fa3dcad20a25c2da60d65285e1d98230765c6d7c0d SHA512 d909b167d6c2d7674d719b105fc779f35337401f22969301c072b1536c17fef992ddd4f7c71a1d01d8d91405d60d84430b321174e01d2add35de9a0c0c8ef62f WHIRLPOOL c88f1801c4b2c9475f8cd3b8e39efa7b23eab8310a4877128aedd11ed6476c1a1ad7d0e16da0eae6f5676ebc24feb1c15325b92c1d16228e22e3b3adfed6b530
AUX 8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch 2072 SHA256 5746a9814b0031476a561cae3e69984aa71535fb3b9cd0f1398d464ca3c44618 SHA512 6012e09bca606e4aa9684083e246d8752b14141b9c1dbe4caab1fb4933e03b681820ef5eec1438ab26a7414ff7914113b7276296a915d4639bcbe3a0a3bc5774 WHIRLPOOL f2150928e51054d3f84a6f4e211287652d6e3cc9b10d2af0eae684a7eeade927a3eba3445523d38c31cec8ad381c3826c275718c8cadcc4809fb0c39480ba15e
AUX 8-stable/50-rsyslog-8.18.0-issue963.patch 18940 SHA256 0b0e9a1efa813cf2f8d80aa8bb81ba9336fadffb92e87b3daf9c69de2129a7df SHA512 f8f51fb5f72292477a5fba76429639fc38ea775f23c4515575fab77f2e9c62ca0af7a65bb05675104f42187026d69bc34d0210e42f8b35079369458860cbbb4b WHIRLPOOL 7983ef71d3f7e0dd206d8c5891e34f791c74b5f5370e8f59c6151b29efd69afd718798b73335c9618d079a299262b3aa08457da1c7fc5419cc5dcc813c6d6430
AUX 8-stable/50-rsyslog-8.18.0-issue964.patch 1514 SHA256 f638e49be23628b24136af6b9389d09eceac88b84c164f01854471f4c60ba749 SHA512 2fa141a224827d9bc4c6daafaf2266c7bacc3bd6590a2648e654dd9f6f6b4a3ae22176fdbd719255178d4530e2bb72a9318d28a2c94c3a1a9b489ef564500d85 WHIRLPOOL 35ddd2de3f1a8acc11c52ca3ed2c92e24c09e02cb02789d0d5373c8952a4b3038f072987281ead66ad43e266f75390e340287add4085641705e65a54782861af
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-r1 1145 SHA256 0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a WHIRLPOOL 05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
AUX 8-stable/rsyslog.initd-r1 1764 SHA256 9aa3b65bfc3f8cf2320a5bea7cc53a2ad744d8b5f42d8e3d0d2b30131a27af15 SHA512 3bf0fb41789529927ff7fff1863a5e745a6a00de4740dc7acbfc3689ebd7201623a189398c4b6d004b303267631341def6484d494f3fff22f5d1e4559db4dc76 WHIRLPOOL 01bbfa867ab0c866872520b8fd800858a9ce11d63d94e70eac5858c24e9be1d4e3924ccf19c6173f760627ab0a359cccd5ed6ceeceb12e0380864efcbf0685b8
AUX 8-stable/rsyslog.initd-r1 1765 SHA256 2c8800c31b8411899b49036bd51ed58a625ee8b7bd523b18d6ad8b7399da0324 SHA512 07a73ddd6e50b9d4ae7d9633c71b6e96e86f3348e242506d9f6a86a0f367e6bc671bed559f9d69232096e7dce7a062be7107794fc2564829d53f42d4d30d8daf WHIRLPOOL 734780723ae73f573c3104c35460e8ef9e5915433012c1a2ca987bea7de37a3a423315ca6f1da06dbf0af6fabc14051c89f7e682592d6ccaa1e39432d5648477
AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7
DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc WHIRLPOOL 809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa
DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead
DIST rsyslog-8.18.0.tar.gz 2261731 SHA256 94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7 WHIRLPOOL 8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196
DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 WHIRLPOOL 3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0 WHIRLPOOL ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b
EBUILD rsyslog-8.13.0.ebuild 11500 SHA256 85b5266c250144b8565fffd30e54b5b9ef2d978c5da2da05a804428adc5ffb09 SHA512 7a2398d3e6fdd6bb28b3be4b0b1181955c36caa9767f646976ec1ea9480f2d6cf9e363227fbf8b8ae33b51a0be636866648c5b7087a93e5502dafad84974f9fa WHIRLPOOL 3c16356ab15d0d31cf221d8954e13d8a5562ddeafebaf26bba3fc5aeefc7a6f55036492bda65cf54e949930219deb6418f2a299cd159c494f1d07a79aa0560cc
EBUILD rsyslog-8.16.0.ebuild 11629 SHA256 8200ced4edad2045d195d7436fc673aa2c2499653a947d9dc9b8a04293e712f5 SHA512 1033047aeb5e529b8a13ee82af051cf0a22d78d2193212bdf5ef79fa83efbe6aefb6813227191df06ed31a3e2be1d6aa82aeb4ae2abf26cf058ba3932d57a011 WHIRLPOOL b69aaad9debc2bbb1117318fdf2adcc532ec840743ac1d6e6e3c6ac453ccda871c3f28c8ca1a780b0008bafa247e18d500f509e39c546c9bcaa27040c1331a3c
MISC ChangeLog 5871 SHA256 c104814723e688ffb2c7ac64605e14088e1311f49f378ff466127483750a3ba1 SHA512 d75b42cd525b80d94fdf7b52cd140cba811ede1f6a7f646445bfe457b9173abc022317843d130f6e6c8b09da20568dea0e5f3bfc349f79daff10c9aa57dbe2c9 WHIRLPOOL ff3fc89391646ce35be92d92366558b2d55560d69d611b818fa57ae4ae1c17bfac0a5c8408aada7581266811e7244ab093be07befb490fd51c110370638ed81c
DIST rsyslog-docs-8.18.0.tar.gz 4269339 SHA256 8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2 WHIRLPOOL 2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff
DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e WHIRLPOOL fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
EBUILD rsyslog-8.16.0-r1.ebuild 11663 SHA256 92d15414b130eba1c3d25c4275e791fd29779055aa979fe52d85f70bd83bc11f SHA512 15a13dfd34e8cf9803d447b45aa8796fe73f2406b56446bd4428cc2c6be50a6feb78bdd9aae3c49971a4c4e13adab8d8fe2136168963796336a59acbba53cb83 WHIRLPOOL ce2c6534ee6cb4c1a17cb41ccb207c8e244e2581844aa61a85434f60221979fe99ad91f38e29306d7fd441ada0e0ce52acbf86522b5a2e57e9eba8fc78e4d726
EBUILD rsyslog-8.18.0.ebuild 12746 SHA256 e3444dd856933408f7842a669a804a8eb0c2e3c436981f0614d1fd1924174dda SHA512 6710558652dc241e764296059cef901da762405b40648a858dfdeca5f9b68531c4b12c724e817b93c0a1222ef753d549391a41a8e80d315fda9660db1cc35b66 WHIRLPOOL c912cbd644317b305fdda70cd853fc8badbfd72303f29fb7fa16a4c88246b7e445dd27cb9fe27946b0b1ae2fdef09c10e229d903661f9d47c8be21cb79e824f4
EBUILD rsyslog-8.19.0.ebuild 12569 SHA256 90252ae7efcb5b83c9ea9317a0c512435d4722e510bb841d806041dd11cb05a6 SHA512 6aa55802f60f478e49e3c7e70bec085540643f21f76ae364517376ad0c2ca16f93fef7bce79a19497159e06de490a372c8b9d3b64085bfc71101efc2f089f00d WHIRLPOOL 003ead4d0d608fdd42f4fe17ccdc9fc2c116204409034d1f1c99cdcdcdcd5a3bc1f904f41de777417cc5d0b041741ed4647a3b06b133c04863f596c132a20b72
MISC ChangeLog 10777 SHA256 0c4893557fff2beba430597398ca07157bcfdadab9579d9ede89a9020ee7bf9c SHA512 3ec460ddffee96e704c9ce5b0ab1612a2c4832f534777c8d04dc8bf39ef2e710ea1a1d439d013b4aa565844262db4b4a713ba2fab6df9fc1a00fa59b88232360 WHIRLPOOL 70784897007c9a53aaa059291a6faf8185f3a4814de2d4eb8f31a7989f764a72babcd9a35d508403ddd52fc49029ccfec9e195ae82785ecbb8a0adfb3c368b81
MISC ChangeLog-2015 26836 SHA256 00f62ec24e67a62edb77fa4d17812f6d736ac8ef3a20dce29bb2b78e575ece01 SHA512 bb52b5ffdfcbe0d1fc51a05dcacc042ff876b9669a875eafdd8e4c240c28a2902ef5200c4f8d31815ca45440f602fe85933d059b55b4f940e4b624c8340a6243 WHIRLPOOL 3f9e1c0cede4a17dbe03f1873fecbf0549a863800a80938723dd86214854f0e47c8d092c1ae381ee82644869ef72dd8915f1ceac5dc4676986128dca0e583bbc
MISC metadata.xml 2981 SHA256 e2b0c1f877dd92021beb9f2d950cc8d5449e2876808e9731d2d84da15b669d52 SHA512 eabad109334323b6edafb7f7b309e42b48a683a4e13a874efcae5db3403534572b723812a76c209f10b982c8a5987adf700e5d686e1299973c149d694e50f92f WHIRLPOOL 66417c0337f36789e4e1e546e49e8e090b4bf69fdaf60cb0b573165633f7abd65c198931305c214edd5b092e73bb8aa9a762e318badcc82381783afd6cc4c7f9
MISC metadata.xml 3271 SHA256 edcd6b6ba223e7554f978327122f7c6c136201ad910f56f9faeebd216588e67e SHA512 ea9e6b91463945b5f19d797e4351ab848ab40346afeac6eadaca9d35119d2475f328a6aa9bc0346d30f8470afd642c6317e527516694faa4f4494763b0598b52 WHIRLPOOL b3360489498bbfd485a3422549a8e9f1e5f9476bafb1ff288e26145d936ba0309df81e5ddd93801abd362511377aa3c27d65d96184a70f6f9ae2ac36387ff783

View File

@ -0,0 +1,86 @@
From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 2 Mar 2016 11:43:09 +0100
Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed
The problem happened in leap year from March til then end
of year and healed itself at the begining of the next year.
During the problem period, the timestamp was 24 hours too
low.
This is primarily a simple fix that can also be applied to
older rsyslog versions. However, we will see if we can
refactor the code to make use of mktime(). Originally, that
was not done for some issues seen, which may no longer
apply.
fixes https://github.com/rsyslog/rsyslog/issues/830
---
runtime/datetime.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/runtime/datetime.c b/runtime/datetime.c
index efb4c81..a07c1b7 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts)
MonthInDays = 0; /* any value fits ;) */
break;
}
+ /* adjust for leap years */
+ if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) {
+ if(ts->month > 2)
+ MonthInDays++;
+ }
/* 1) Counting how many Years have passed since 1970
@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
NumberOfYears = ts->year - yearInSec_startYear - 1;
NumberOfDays = MonthInDays + ts->day - 1;
- TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400;
+ TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 86400;
/*Add Hours, minutes and seconds */
TimeInUnixFormat += ts->hour*60*60;
From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 2 Mar 2016 15:58:18 +0100
Subject: [PATCH] timestamp handling: guard against invalid dates
We do not permit dates outside of the year 1970..2100
interval. Note that network-receivers do already guard
against this, so the new guard only guards against invalid
system time. Still good to have (especially when things are
extended...)
---
runtime/datetime.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/runtime/datetime.c b/runtime/datetime.c
index 9641363..87290c9 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts)
int utcOffset;
time_t TimeInUnixFormat;
+ if(ts->year < 1970 || ts->year > 2100) {
+ TimeInUnixFormat = 0;
+ errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
+ "in timestamp - returning 1970-01-01 instead", ts->year);
+ goto done;
+ }
+
/* Counting how many Days have passed since the 01.01 of the
* selected Year (Month level), according to the selected Month*/
@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
if(ts->OffsetMode == '+')
utcOffset *= -1; /* if timestamp is ahead, we need to "go back" to UTC */
TimeInUnixFormat += utcOffset;
+done:
return TimeInUnixFormat;
}

View File

@ -0,0 +1,482 @@
From b81d6dd36545f79c46e0a3488a9b26d0db75646a Mon Sep 17 00:00:00 2001
From: Thomas D.
Date: Tue, 19 Apr 2016 02:09:18 +0200
Subject: [PATCH 2/2] testbench: Use LD_PRELOAD=libfaketime.so instead of
faketime binary
Fixes: https://github.com/rsyslog/rsyslog/issues/963
---
tests/faketime_common.sh | 20 +++++++-------------
tests/now-utc-casecmp.sh | 2 +-
tests/now-utc-ymd.sh | 2 +-
tests/now-utc.sh | 2 +-
tests/now_family_utc.sh | 2 +-
tests/timegenerated-dateordinal-invld.sh | 8 ++++----
tests/timegenerated-dateordinal.sh | 28 ++++++++++++++--------------
tests/timegenerated-utc-legacy.sh | 2 +-
tests/timegenerated-utc.sh | 2 +-
tests/timegenerated-uxtimestamp-invld.sh | 8 ++++----
tests/timegenerated-uxtimestamp.sh | 26 ++++++++++++--------------
tests/timegenerated-ymd.sh | 2 +-
12 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/tests/faketime_common.sh b/tests/faketime_common.sh
index 10e0128..432ade6 100644
--- a/tests/faketime_common.sh
+++ b/tests/faketime_common.sh
@@ -4,26 +4,20 @@
# faketime is missing or the system isn't year-2038 complaint.
# This script can be sourced to prevent duplicated code.
-if ! hash faketime 2>/dev/null ; then
- echo "faketime command missing, skipping test"
+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="1991-08-25 20:57:08" TZ=GMT date +%s 2>/dev/null)
+if [ ${faketime_testtime} -ne 683153828 ] ; then
+ echo "libfaketime.so missing, skipping test"
exit 77
fi
-export TZ=UTC+01:00
-
-faketime -f '2016-03-11 16:00:00' date 1>/dev/null 2>&1
-if [ $? -ne 0 ]; then
- # Safe-guard -- should never happen!
- echo "faketime command not working as expected. Check faketime binary in path!"
- exit 1
-fi
-
-faketime '2040-01-01 16:00:00' date 1>/dev/null 2>&1
-if [ $? -ne 0 ]; then
+# GMT-1 (POSIX TIME) is GMT+1 in "Human Time"
+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="2040-01-01 16:00:00" TZ=GMT-1 date +%s 2>/dev/null)
+if [ ${faketime_testtime} -eq -1 ]; then
# System isn't year-2038 compatible
RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE="yes"
fi
+export LD_PRELOAD=libfaketime.so
rsyslog_testbench_require_y2k38_support() {
if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
diff --git a/tests/now-utc-casecmp.sh b/tests/now-utc-casecmp.sh
index 8f8d6a0..26bb7ee 100755
--- a/tests/now-utc-casecmp.sh
+++ b/tests/now-utc-casecmp.sh
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
file="rsyslog.out.log")
'
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
# what we send actually is irrelevant, as we just use system properties.
# but we need to send one message in order to gain output!
. $srcdir/diag.sh tcpflood -m1
diff --git a/tests/now-utc-ymd.sh b/tests/now-utc-ymd.sh
index c327983..6e2d183 100755
--- a/tests/now-utc-ymd.sh
+++ b/tests/now-utc-ymd.sh
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
file="rsyslog.out.log")
'
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
# what we send actually is irrelevant, as we just use system properties.
# but we need to send one message in order to gain output!
. $srcdir/diag.sh tcpflood -m1
diff --git a/tests/now-utc.sh b/tests/now-utc.sh
index ed83948..69fd4fd 100755
--- a/tests/now-utc.sh
+++ b/tests/now-utc.sh
@@ -9,7 +9,7 @@ echo \[now-utc\]: test \$NOW-UTC
export TZ=TEST-02:00
. $srcdir/diag.sh init
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf
# what we send actually is irrelevant, as we just use system properties.
# but we need to send one message in order to gain output!
. $srcdir/diag.sh tcpflood -m1
diff --git a/tests/now_family_utc.sh b/tests/now_family_utc.sh
index caba0f9..e791cbf 100755
--- a/tests/now_family_utc.sh
+++ b/tests/now_family_utc.sh
@@ -9,7 +9,7 @@ echo \[now_family_utc\]: test \$NOW family of system properties
export TZ=TEST+06:30
. $srcdir/diag.sh init
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf
# what we send actually is irrelevant, as we just use system properties.
# but we need to send one message in order to gain output!
. $srcdir/diag.sh tcpflood -m1
diff --git a/tests/timegenerated-dateordinal-invld.sh b/tests/timegenerated-dateordinal-invld.sh
index bac5d4e..dc5e14c 100755
--- a/tests/timegenerated-dateordinal-invld.sh
+++ b/tests/timegenerated-dateordinal-invld.sh
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
echo "***SUBTEST: check 1800-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -40,7 +40,7 @@ fi;
echo "***SUBTEST: check 1960-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -55,7 +55,7 @@ fi;
echo "***SUBTEST: check 2101-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -70,7 +70,7 @@ fi;
echo "***SUBTEST: check 2500-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-dateordinal.sh b/tests/timegenerated-dateordinal.sh
index ace1c16..1164e53 100755
--- a/tests/timegenerated-dateordinal.sh
+++ b/tests/timegenerated-dateordinal.sh
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
echo "***SUBTEST: check 1970-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -39,7 +39,7 @@ fi;
echo "***SUBTEST: check 2000-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -53,7 +53,7 @@ fi;
echo "***SUBTEST: check 2016-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -67,7 +67,7 @@ fi;
echo "***SUBTEST: check 2016-02-29"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -81,7 +81,7 @@ fi;
echo "***SUBTEST: check 2016-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -95,7 +95,7 @@ fi;
echo "***SUBTEST: check 2016-03-03"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -109,7 +109,7 @@ fi;
echo "***SUBTEST: check 2016-12-31"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -123,7 +123,7 @@ fi;
echo "***SUBTEST: check 2017-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -137,7 +137,7 @@ fi;
echo "***SUBTEST: check 2020-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -151,7 +151,7 @@ fi;
echo "***SUBTEST: check 2038-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -168,7 +168,7 @@ rsyslog_testbench_require_y2k38_support
echo "***SUBTEST: check 2038-12-31"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2038-12-31 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2038-12-31 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -182,7 +182,7 @@ fi;
echo "***SUBTEST: check 2040-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -196,7 +196,7 @@ fi;
echo "***SUBTEST: check 2040-12-31"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2040-12-31 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2040-12-31 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -210,7 +210,7 @@ fi;
echo "***SUBTEST: check 2100-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-utc-legacy.sh b/tests/timegenerated-utc-legacy.sh
index f893377..60296d3 100755
--- a/tests/timegenerated-utc-legacy.sh
+++ b/tests/timegenerated-utc-legacy.sh
@@ -26,7 +26,7 @@ template(name="outfmt" type="string"
echo "***SUBTEST: check 2016-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-utc.sh b/tests/timegenerated-utc.sh
index 651408c..5d32e36 100755
--- a/tests/timegenerated-utc.sh
+++ b/tests/timegenerated-utc.sh
@@ -28,7 +28,7 @@ template(name="outfmt" type="list") {
echo "***SUBTEST: check 2016-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-uxtimestamp-invld.sh b/tests/timegenerated-uxtimestamp-invld.sh
index 90bcf74..76a353c 100755
--- a/tests/timegenerated-uxtimestamp-invld.sh
+++ b/tests/timegenerated-uxtimestamp-invld.sh
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
echo "***SUBTEST: check 1800-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -40,7 +40,7 @@ fi;
echo "***SUBTEST: check 1960-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -55,7 +55,7 @@ fi;
echo "***SUBTEST: check 2101-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -70,7 +70,7 @@ fi;
echo "***SUBTEST: check 2500-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-uxtimestamp.sh b/tests/timegenerated-uxtimestamp.sh
index b24f9c7..0eb2812 100755
--- a/tests/timegenerated-uxtimestamp.sh
+++ b/tests/timegenerated-uxtimestamp.sh
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
echo "***SUBTEST: check 1970-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup
+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -40,7 +40,7 @@ fi;
echo "***SUBTEST: check 2000-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -55,7 +55,7 @@ fi;
echo "***SUBTEST: check 2016-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -70,7 +70,7 @@ fi;
echo "***SUBTEST: check 2016-02-29"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -85,7 +85,7 @@ fi;
echo "***SUBTEST: check 2016-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -100,7 +100,7 @@ fi;
echo "***SUBTEST: check 2016-03-03"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -115,7 +115,7 @@ fi;
echo "***SUBTEST: check 2016-12-31"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -130,7 +130,7 @@ fi;
echo "***SUBTEST: check 2017-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -145,7 +145,7 @@ fi;
echo "***SUBTEST: check 2020-03-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -160,7 +160,7 @@ fi;
echo "***SUBTEST: check 2038-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -172,13 +172,11 @@ if [ ! $? -eq 0 ]; then
exit 1
fi;
-
rsyslog_testbench_require_y2k38_support
-
echo "***SUBTEST: check 2040-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
@@ -193,7 +191,7 @@ fi;
echo "***SUBTEST: check 2100-01-01"
rm -f rsyslog.out.log # do cleanup of previous subtest
-faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup
+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1
. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
diff --git a/tests/timegenerated-ymd.sh b/tests/timegenerated-ymd.sh
index 66b364b..f5f9213 100755
--- a/tests/timegenerated-ymd.sh
+++ b/tests/timegenerated-ymd.sh
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
file="rsyslog.out.log")
'
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
# what we send actually is irrelevant, as we just use system properties.
# but we need to send one message in order to gain output!
. $srcdir/diag.sh tcpflood -m1
--
2.8.1

View File

@ -0,0 +1,46 @@
From 35b838b13e838cfe81bf565163bc892dd4347f68 Mon Sep 17 00:00:00 2001
From: Thomas D.
Date: Tue, 19 Apr 2016 00:00:00 +0200
Subject: [PATCH 1/2] testbench: Add missing exit calls to
{faketime,privdrop}_common.sh
"diag.sh exit" just cleans up so we still have to end the tests when skipping
with a real exit on our own.
---
tests/faketime_common.sh | 9 +++++----
tests/privdrop_common.sh | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/faketime_common.sh b/tests/faketime_common.sh
index 5e868bc..10e0128 100644
--- a/tests/faketime_common.sh
+++ b/tests/faketime_common.sh
@@ -26,8 +26,9 @@ fi
rsyslog_testbench_require_y2k38_support() {
- if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
- echo "Skipping further tests because system doesn't support year 2038 ..."
- . $srcdir/diag.sh exit
- fi
+ if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
+ echo "Skipping further tests because system doesn't support year 2038 ..."
+ . $srcdir/diag.sh exit
+ exit 0
+ fi
}
diff --git a/tests/privdrop_common.sh b/tests/privdrop_common.sh
index a0994ec..203a23b 100755
--- a/tests/privdrop_common.sh
+++ b/tests/privdrop_common.sh
@@ -52,6 +52,7 @@ rsyslog_testbench_setup_testuser() {
if [ -z "${testgroupname}" ]; then
echo "Skipping ... please set RSYSLOG_TESTUSER or make sure the user running the testbench has a primary group!"
. $srcdir/diag.sh exit
+ exit 0
else
has_testuser="${EUID}"
fi
--
2.8.1

View File

@ -1,4 +1,4 @@
#!/sbin/runscript
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

View File

@ -15,14 +15,17 @@
<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
<flag name="kafka">Build the Apache Kafka output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</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>
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
@ -32,7 +35,7 @@
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/zeromq</pkg>)</flag>
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
</use>
<upstream>
<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>

View File

@ -65,8 +65,8 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.5 )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? ( >=net-libs/gnutls-2.12.23 )

View File

@ -0,0 +1,432 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools eutils systemd
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
PATCHES=(
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
)
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
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 libressl mongodb mysql normalize omudpspoof"
IUSE+=" 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.1.2:=
)
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? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? ( >=net-libs/gnutls-2.12.23:0= )
systemd? ( >=sys-apps/systemd-208 )
zeromq? ( >=net-libs/czmq-1.2.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
if [[ ${PV} == "9999" ]]; then
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
DEPEND+=" >=sys-devel/bison-2.4.3"
DEPEND+=" >=dev-python/docutils-0.12"
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
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"
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() {
default
eautoreconf
}
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-debug-symbols
--disable-generate-man-pages
--without-valgrind-testbench
$(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
--disable-omkafka
--enable-pmaixforwardedfrom
--enable-pmciscoios
--enable-pmcisconames
--enable-pmlastmsg
--enable-pmsnare
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
# 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)
)
econf ${myeconfargs[@]}
}
src_compile() {
default
if use doc && [[ "${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=
# When adding new tests via patches we have to make them executable
einfo "Adjusting permissions of test scripts ..."
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
die "Failed to adjust test scripts permission"
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() {
default
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${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
use doc && dohtml -r "${S}/docs/build/"
}
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"
}

View File

@ -0,0 +1,463 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools eutils linux-info systemd
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
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
else
MY_PV=${PV%_rc*}
MY_FILENAME="${PN}-${PV}.tar.gz"
MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
# Upstream URL schema:
# RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
# http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
MY_URL_PREFIX=
if [[ ${PV} = *_rc* ]]; then
_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
if [[ ${_tmp_suffix} = *rc* ]]; then
MY_URL_PREFIX="${_tmp_suffix}/"
fi
# Cleaning up temporary variables
unset _tmp_last_index
unset _tmp_suffix
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi
SRC_URI="
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
"
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
RDEPEND="
>=dev-libs/libfastjson-0.99.2:=
>=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:= )
grok? ( >=dev-libs/grok-0.9.2 )
jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
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.1.2:=
)
omhttpfs? ( >=net-misc/curl-7.35.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? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? ( >=net-libs/gnutls-2.12.23:0= )
systemd? ( >=sys-apps/systemd-208 )
zeromq? (
>=net-libs/zeromq-4.1.1:=
>=net-libs/czmq-3.0.0
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( sys-libs/libfaketime )"
if [[ ${PV} == "9999" ]]; then
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
DEPEND+=" >=sys-devel/bison-2.4.3"
DEPEND+=" >=dev-python/docutils-0.12"
fi
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
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
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
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 ${MY_FILENAME_DOCS}
fi
fi
}
src_prepare() {
if [[ ! ${PV} == "9999" ]]; then
eapply -p1 "${FILESDIR}"/8-stable/50-rsyslog-8.18.0-issue964.patch
eapply -p1 "${FILESDIR}"/8-stable/50-rsyslog-8.18.0-issue963.patch
fi
default
eautoreconf
}
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-debug-symbols
--disable-generate-man-pages
--without-valgrind-testbench
$(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-mmcount
--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 kafka omkafka)
$(use_enable kerberos gssapi-krb5)
$(use_enable normalize mmnormalize)
$(use_enable grok mmgrok)
$(use_enable omhttpfs)
$(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 imczmq)
$(use_enable zeromq imzmq3)
$(use_enable zeromq omczmq)
$(use_enable zeromq omzmq3)
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
econf "${myeconfargs[@]}"
}
src_compile() {
default
if use doc && [[ "${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=
# Sometimes tests aren't executable (i.e. when added via patch)
einfo "Adjusting permissions of test scripts ..."
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
die "Failed to adjust test scripts permission"
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() {
local DOCS=(
AUTHORS
ChangeLog
"${FILESDIR}"/${BRANCH}/README.gentoo
)
use doc && local HTML_DOCS=( "${S}/docs/build/." )
default
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${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
prune_libtool_files --modules
}
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
local 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"
}

View File

@ -0,0 +1,458 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools eutils linux-info systemd
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
HOMEPAGE="http://www.rsyslog.com/"
BRANCH="8-stable"
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
else
MY_PV=${PV%_rc*}
MY_FILENAME="${PN}-${PV}.tar.gz"
MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
# Upstream URL schema:
# RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
# http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
MY_URL_PREFIX=
if [[ ${PV} = *_rc* ]]; then
_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
if [[ ${_tmp_suffix} = *rc* ]]; then
MY_URL_PREFIX="${_tmp_suffix}/"
fi
# Cleaning up temporary variables
unset _tmp_last_index
unset _tmp_suffix
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi
SRC_URI="
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
"
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
RDEPEND="
>=dev-libs/libfastjson-0.99.2:=
>=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:= )
grok? ( >=dev-libs/grok-0.9.2 )
jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
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.1.2:=
)
omhttpfs? ( >=net-misc/curl-7.35.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? (
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
libressl? ( dev-libs/libressl:= )
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? ( >=net-libs/gnutls-2.12.23:0= )
systemd? ( >=sys-apps/systemd-208 )
zeromq? (
>=net-libs/zeromq-4.1.1:=
>=net-libs/czmq-3.0.0
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( sys-libs/libfaketime )"
if [[ ${PV} == "9999" ]]; then
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
DEPEND+=" >=sys-devel/bison-2.4.3"
DEPEND+=" >=dev-python/docutils-0.12"
fi
CONFIG_CHECK="~INOTIFY_USER"
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
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
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
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 ${MY_FILENAME_DOCS}
fi
fi
}
src_prepare() {
default
eautoreconf
}
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-debug-symbols
--disable-generate-man-pages
--without-valgrind-testbench
$(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-mmcount
--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 kafka omkafka)
$(use_enable kerberos gssapi-krb5)
$(use_enable normalize mmnormalize)
$(use_enable grok mmgrok)
$(use_enable omhttpfs)
$(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 imczmq)
$(use_enable zeromq imzmq3)
$(use_enable zeromq omczmq)
$(use_enable zeromq omzmq3)
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
)
econf "${myeconfargs[@]}"
}
src_compile() {
default
if use doc && [[ "${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=
# Sometimes tests aren't executable (i.e. when added via patch)
einfo "Adjusting permissions of test scripts ..."
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
die "Failed to adjust test scripts permission"
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() {
local DOCS=(
AUTHORS
ChangeLog
"${FILESDIR}"/${BRANCH}/README.gentoo
)
use doc && local HTML_DOCS=( "${S}/docs/build/." )
default
newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${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
prune_libtool_files --modules
}
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
local 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"
}

View File

@ -1,13 +1,13 @@
DEFINED_PHASES=compile config configure install postinst prepare test unpack
DEPEND=>=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.1.2:= ) 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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) 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 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DEPEND=>=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.1.2:= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
EAPI=5
HOMEPAGE=http://www.rsyslog.com/
IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
KEYWORDS=amd64 ~arm hppa x86
LICENSE=GPL-3 LGPL-3 Apache-2.0
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.1.2:= ) 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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) 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 )
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.1.2:= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 )
SLOT=0
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.13.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.13.0.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=5cad272488884aff888d12ca02ed3300
_md5_=ad7430950157292d17d6558a007430ff

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile config configure install postinst prepare test unpack
DEPEND=>=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.1.2:= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
EAPI=6
HOMEPAGE=http://www.rsyslog.com/
IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
KEYWORDS=amd64 ~arm hppa x86
LICENSE=GPL-3 LGPL-3 Apache-2.0
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.1.2:= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 )
SLOT=0
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.16.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.16.0.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
_md5_=f2b66e41ab56e1fa3b0250ad10d12c0c

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
DEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) 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.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 ) virtual/pkgconfig test? ( sys-libs/libfaketime ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
EAPI=6
HOMEPAGE=http://www.rsyslog.com/
IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
KEYWORDS=~amd64 ~arm ~hppa ~x86
LICENSE=GPL-3 LGPL-3 Apache-2.0
RDEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) 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.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
SLOT=0
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz -> rsyslog-8.18.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.18.0.tar.gz -> rsyslog-docs-8.18.0.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=d1e752b52246fe99c16668d40bc569d3

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
DEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) 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.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 ) virtual/pkgconfig test? ( sys-libs/libfaketime ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
EAPI=6
HOMEPAGE=http://www.rsyslog.com/
IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
KEYWORDS=~amd64 ~arm ~hppa ~x86
LICENSE=GPL-3 LGPL-3 Apache-2.0
RDEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) 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.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
SLOT=0
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.19.0.tar.gz -> rsyslog-8.19.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.19.0.tar.gz -> rsyslog-docs-8.19.0.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 9d81603248f2ba3ec59124320d123e5e libtool b75230758539a7da029e24afdb693960 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=f54fe041ceb597b2e85f331c13b84022