From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- app-admin/rsyslog/Manifest | 17 +- .../files/rsyslog-8.1903.0-add-missing-tests.patch | 736 +++++++++++++++++++++ ...g-8.1903.0-add-py3-support-to-omhttp-test.patch | 83 +++ ...8.1903.0-fix-py3-compatibility-in-diag.sh.patch | 22 + app-admin/rsyslog/rsyslog-8.1901.0.ebuild | 2 +- app-admin/rsyslog/rsyslog-8.1903.0.ebuild | 465 +++++++++++++ app-admin/rsyslog/rsyslog-8.1904.0.ebuild | 465 +++++++++++++ app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild | 2 +- app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild | 2 +- app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild | 2 +- 10 files changed, 1788 insertions(+), 8 deletions(-) create mode 100644 app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch create mode 100644 app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch create mode 100644 app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch create mode 100644 app-admin/rsyslog/rsyslog-8.1903.0.ebuild create mode 100644 app-admin/rsyslog/rsyslog-8.1904.0.ebuild (limited to 'app-admin/rsyslog') diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 2d7c189f3963..201a849b4eeb 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,5 +1,8 @@ AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 +AUX rsyslog-8.1903.0-add-missing-tests.patch 17584 BLAKE2B 7c2c67d50d10d228e7378a58e7a2df3fae2447202e11001f20d486aec576ac3b3079003ea8ad12078f90d4af1953ee4082e9e1f26ce8b7381a818bd4d31051ec SHA512 ff195e7447d565f9ef7cf8a8a2c731ab178639f4e15810e638c4a916417639cf054840d760967d91de068f23d9edf25cde38af21f27a0ba08e206f3395720e9f +AUX rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch 3199 BLAKE2B e415e5fbbe62b8fc8ffd67bffe75402e472207559e9e4a58e4087f2844325cd6ff4ac07f00c7db99a2a1071342b89a936782484cfa4a98109a98d0498cb0a208 SHA512 874531950df2d754535f37f8b1c81fd584ceab9e80483011fd7aa3e04e04110b3f751ff534c425ef1017a78e72f2845bf8cae7da5cec204ad0df61462b272d42 +AUX rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch 677 BLAKE2B b90627a0d9affb8afe18ef9fb4377c791796c4f345fd8d5226544e3488661908d25651339377aaa5ff2c876e9090133ea7109d44772d9d6b0209861f0732a12e SHA512 dbd032c42edc5a1a9c67d806298ad3230dff9c13d209f014b45c78675f62cec613ca1989f3f73da40faf8a1990453a4b32433db14566f6b99048caf4dc2d6499 AUX rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch 3181 BLAKE2B 13b155367c6b7fed4f82505a884ed23e32223567e5086cb91f733d20c43aa101bbeb169f36f34ed0dff8815687cc5dfe942ec248024aa29a0a07c1eb3ca3e0f4 SHA512 dfc980492bdd3fb7fafedbbde4e79e61d7fb78665f8f0654a877de4f2f4fa93ce2d23051617f90d9712ef795d8164e1d610321b0dd27164d0cb425c8f1a77720 AUX rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch 12038 BLAKE2B 4fe26dc0d8e60e2b37272aa0743fadf8d3ceef6937028d8990b84c936efc289948f2c98312c14296c3b5d43966982edfee9bbc53b17df22487fd2711147e2a1a SHA512 580b65c1eb4d551d48203720e9621d7b1371145bdc3c6e8c0d638c686038cb43d436e42ccc5b4223e2b16db040eabcecbd71288f99c90698636d6b6be1517308 AUX rsyslog-8.40.0-fix-omusrmsg.patch 455 BLAKE2B 6933dccfbd3eeed4ed00f08d9bc748428e705c3caad04e783664cc46103f0e4b40d96ac9e82f93e9083484c4bc58a683c52d46f6ce6ec74f0d12a58331f77920 SHA512 7164572c35fe28aab9767291456fb403b0e9d047c64df8c6a5a11c62a06269a4d2450d531dc0dfdc184f0ebda61ba4589c1d719d801633c2903a349bddae21da @@ -8,15 +11,21 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3 DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb +DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9 +DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98 +DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d +DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f -EBUILD rsyslog-8.1901.0.ebuild 12425 BLAKE2B 25fe698ba545032ec0c9c75b0ada6c7008b26e1899aa653cae923a66cd1763736b2e773f2f414f3ec1dd097cc187a8179caaffa0cf171aa7b6faed3f619a5534 SHA512 814e3dbfa4d3422370f7bdac9e6f2bf9cfeefac2f302d27517be6b44b6fdd0d6974deef3f888222d63706bb8982a0633f7e99e2eaba0f5ccf87e94389a8471bc -EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af -EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf -EBUILD rsyslog-8.40.0-r1.ebuild 12407 BLAKE2B fb4b459cd731ccdce9ac784cb11a618c19a0bba94711d079e1ec9d846f459949603b2c93d74dd316a72a10e00ffea64dd5ceee216ed29c2f826d30e02909e9dc SHA512 22b89e3194f4bc2419f9aafbdaf1aea548747c80790b33feddcde09f06721538e41aaa3bf7c9b190841ebe780d82b48783dad467b40b05edf56d4d05675492aa +EBUILD rsyslog-8.1901.0.ebuild 12421 BLAKE2B 6471892b10047479030a9847b12913e1d221dd101a715073ced6e174dd6068802bdd43f9ac8591e2329497fc9b2161f47b73599fd26ed1f2e68bc05ce07051f1 SHA512 d50d564268dfc5da2b6cd2d9470263809fe7a24fcea5c267e1874cd9aec1face83a2ea74e5d3fb2db84b9a9f9dd78b7a9f3f5caf2acc1f34f53b3858139bdfcf +EBUILD rsyslog-8.1903.0.ebuild 12597 BLAKE2B e6364510c324afbb669d3d18bc66c424df2f76f5130d57dccfe908d89d5964656c9442a80fd8e3e1f478f3e9ffe528e29b7a89a44997757f12d104b652a24217 SHA512 ff16046287166c33452930a187c700f43f3fccdd626d017b14f8abf2da0204b2a3948c8d66b13ddaf47d314ac00aceb58cccde036634d19c4872f5624536fcae +EBUILD rsyslog-8.1904.0.ebuild 12637 BLAKE2B 1d672fdaf283a4e1075c8f808e66e5de7f1683b75b56b1a69d62c3612432ad70d3f0eabd5b8dfd2eee3ec039c2e9343c16da28cc0d01019398ce05ebc6534637 SHA512 8e178e705cccdfcaad23633c74f4cc096516f12b8c128e4f85a16568b2254b69d38b7fa13ecd110d4d8cb8b83c5c1b27cb6c460592f9315f351a16f2e353156e +EBUILD rsyslog-8.38.0-r2.ebuild 12347 BLAKE2B 9bc6a630bc12aa5f845b9d670262da7294fc7ac63ec29f4103a8b6fff0381a1d5f6f6dcf5e9c8a507941b11319b237a305698959f0a4f3d9411751352b443d51 SHA512 6f8c55fdb321a645528ca20e4a73fae9c4bb4593c10a45a115a8d2cc4f2e0ab295d5e596b6a4533571d3bca56f82cc278dacfb3e1a491c7a7ff6243dcd869a63 +EBUILD rsyslog-8.39.0-r1.ebuild 12423 BLAKE2B 11ee03f97ee8d3645be49cad381f441e2b57341a8d27e6af59d5c3233acedc1835b9ddfe2d1879e20e0565951ff5aeb60b8f52848a5de422f58e37219c0aa5f2 SHA512 beeb8b579c68c2f2684bc9d0d004998ea056868a280b6921dce969001b8cb48ea4aaa8945e13972605ae30ec7a9051c931441580190a569f83be8e63aec305de +EBUILD rsyslog-8.40.0-r1.ebuild 12403 BLAKE2B d8e8b83bf59dcd2c6c23fd13cef0487def056c703d84b845eeb17ed2016a474a570c647b4dc4d5295c56228ae2e02279e0c7b062708a3e409d1cf9790f09be57 SHA512 f3d1d9107d5c756034ab70294404dbddb0534b5168471bb9401085c05582cd5d58c933a053c875318a3d54fa9ab8cd9e8a52c42bfbc3ac845c6f29d423b5f4da MISC metadata.xml 3967 BLAKE2B 1d88f39cd9c9f88b19d2b029afd3b3f80aa40b76661936f8981d2929136d918fc3f89c91d58b5aee4bdb97e648d7b2d24852f899badc576a5f5fa01b4246f79b SHA512 8a4a1e46d5aa71ef24a7dcece46d0902ba69abbd616a1c55d5a8709f64beea1fc1b0a2d12ebe5292f6f0a0b0199925ae64b321fae291c83cec43f346f90a019d diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch new file mode 100644 index 000000000000..da9c79c68293 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch @@ -0,0 +1,736 @@ +--- /dev/null ++++ b/tests/omhttp-auth-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-auth.sh +--- /dev/null ++++ b/tests/omhttp-auth.sh +@@ -0,0 +1,45 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=100 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --userpwd="bob:bobbackwards" ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ uid="bob" ++ pwd="bobbackwards" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-basic-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-basic.sh +--- /dev/null ++++ b/tests/omhttp-basic.sh +@@ -0,0 +1,43 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=10000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-fail-with-400.sh +@@ -0,0 +1,52 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-with-400-after 1000 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Wrap message as a single batch for retry ++template(name="tpl_retry" type="string" string="[%msg%]") ++ ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ retry="on" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg 0 10000 ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check 0 999 ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-compress-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray-compress.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-compress.sh +@@ -0,0 +1,48 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --decompress ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="jsonarray" ++ batch.maxsize="1000" ++ compress="on" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray-retry.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-retry.sh +@@ -0,0 +1,78 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 100 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Echo message as-is for retry ++template(name="tpl_echo" type="string" string="%msg%") ++ ++ruleset(name="ruleset_omhttp_retry") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl_echo" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="jsonarray" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="jsonarray" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="jsonarray" ++ batch.maxsize="1000" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-kafkarest-retry.sh +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest-retry.sh +@@ -0,0 +1,78 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 100 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Echo message as-is for retry ++template(name="tpl_echo" type="string" string="%msg%") ++ ++ruleset(name="ruleset_omhttp_retry") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl_echo" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="kafkarest" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="kafkarest" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint kafkarest ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="kafkarest" ++ batch.maxsize="100" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint kafkarest ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-newline.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="newline" ++ batch.maxsize="100" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint newline ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-retry.sh +--- /dev/null ++++ b/tests/omhttp-retry.sh +@@ -0,0 +1,46 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=10000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 1000 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ action.resumeRetryCount="-1" ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp_server.py +@@ -0,0 +1,130 @@ ++#!/usr/bin/env python ++ ++import argparse ++import json ++import os ++import zlib ++import base64 ++ ++try: ++ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer # Python 2 ++except ImportError: ++ from http.server import BaseHTTPRequestHandler, HTTPServer # Python 3 ++ ++# Keep track of data received at each path ++data = {} ++ ++metadata = {'posts': 0, 'fail_after': 0, 'fail_every': -1, 'decompress': False, 'userpwd': ''} ++ ++ ++class MyHandler(BaseHTTPRequestHandler): ++ """ ++ POST'd data is kept in the data global dict. ++ Keys are the path, values are the raw received data. ++ Two post requests to :/post/endpoint means data looks like... ++ {"/post/endpoint": ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]} ++ ++ GET requests return all data posted to that endpoint as a json list. ++ Note that rsyslog usually sends escaped json data, so some parsing may be needed. ++ A get request for :/post/endpoint responds with... ++ ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"] ++ """ ++ ++ def validate_auth(self): ++ # header format for basic authentication ++ # 'Authorization: Basic ' ++ if 'Authorization' not in self.headers: ++ self.send_response(401) ++ self.end_headers() ++ self.wfile.write('missing "Authorization" header') ++ return False ++ ++ auth_header = self.headers['Authorization'] ++ _, b64userpwd = auth_header.split() ++ userpwd = base64.b64decode(b64userpwd) ++ if userpwd != metadata['userpwd']: ++ self.send_response(401) ++ self.end_headers() ++ self.wfile.write('invalid auth: {0}'.format(userpwd)) ++ return False ++ ++ return True ++ ++ def do_POST(self): ++ metadata['posts'] += 1 ++ ++ if metadata['userpwd']: ++ if not self.validate_auth(): ++ return ++ ++ if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']: ++ self.send_response(400) ++ self.end_headers() ++ self.wfile.write('BAD REQUEST') ++ return ++ ++ if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0: ++ self.send_response(500) ++ self.end_headers() ++ self.wfile.write('INTERNAL ERROR') ++ return ++ ++ content_length = int(self.headers['Content-Length']) ++ raw_data = self.rfile.read(content_length) ++ ++ if metadata['decompress']: ++ post_data = zlib.decompress(raw_data, 31) ++ else: ++ post_data = raw_data ++ ++ if self.path not in data: ++ data[self.path] = [] ++ data[self.path].append(post_data) ++ ++ res = json.dumps({'msg': 'ok'}) ++ ++ self.send_response(200) ++ self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Length', len(res)) ++ self.end_headers() ++ ++ self.wfile.write(res) ++ return ++ ++ def do_GET(self): ++ if self.path in data: ++ result = data[self.path] ++ else: ++ result = [] ++ ++ res = json.dumps(result) ++ ++ self.send_response(200) ++ self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Length', len(res)) ++ self.end_headers() ++ ++ self.wfile.write(res) ++ return ++ ++ ++if __name__ == '__main__': ++ parser = argparse.ArgumentParser(description='Archive and delete core app log files') ++ parser.add_argument('-p', '--port', action='store', type=int, default=8080, help='port') ++ parser.add_argument('-i', '--interface', action='store', type=str, default='localhost', help='port') ++ parser.add_argument('--fail-after', action='store', type=int, default=0, help='start failing after n posts') ++ parser.add_argument('--fail-every', action='store', type=int, default=-1, help='fail every n posts') ++ parser.add_argument('--fail-with-400-after', action='store', type=int, default=-1, help='fail with 400 after n posts') ++ parser.add_argument('--decompress', action='store_true', default=False, help='decompress posted data') ++ parser.add_argument('--userpwd', action='store', default='', help='only accept this user:password combination') ++ args = parser.parse_args() ++ metadata['fail_after'] = args.fail_after ++ metadata['fail_every'] = args.fail_every ++ metadata['fail_with_400_after'] = args.fail_with_400_after ++ metadata['decompress'] = args.decompress ++ metadata['userpwd'] = args.userpwd ++ server = HTTPServer((args.interface, args.port), MyHandler) ++ pid = os.getpid() ++ print('starting omhttp test server at {interface}:{port} with pid {pid}' ++ .format(interface=args.interface, port=args.port, pid=pid)) ++ server.serve_forever() diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch new file mode 100644 index 000000000000..6600c61666e9 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch @@ -0,0 +1,83 @@ +From c82b747eaf96cc77efa530ca5844ba01b91bfc88 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sat, 6 Apr 2019 00:28:54 +0200 +Subject: [PATCH] tests: omhttp: add Python 3 compatibility + +Fixes: https://github.com/rsyslog/rsyslog/issues/3599 +--- + tests/omhttp_server.py | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/tests/omhttp_server.py b/tests/omhttp_server.py +index 6962138fa..d3fdb3a9a 100644 +--- a/tests/omhttp_server.py ++++ b/tests/omhttp_server.py +@@ -36,16 +36,16 @@ def validate_auth(self): + if 'Authorization' not in self.headers: + self.send_response(401) + self.end_headers() +- self.wfile.write('missing "Authorization" header') ++ self.wfile.write(b'missing "Authorization" header') + return False + + auth_header = self.headers['Authorization'] + _, b64userpwd = auth_header.split() +- userpwd = base64.b64decode(b64userpwd) ++ userpwd = base64.b64decode(b64userpwd).decode('utf-8') + if userpwd != metadata['userpwd']: + self.send_response(401) + self.end_headers() +- self.wfile.write('invalid auth: {0}'.format(userpwd)) ++ self.wfile.write(b'invalid auth: {0}'.format(userpwd)) + return False + + return True +@@ -60,16 +60,16 @@ def do_POST(self): + if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']: + self.send_response(400) + self.end_headers() +- self.wfile.write('BAD REQUEST') ++ self.wfile.write(b'BAD REQUEST') + return + + if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0: + self.send_response(500) + self.end_headers() +- self.wfile.write('INTERNAL ERROR') ++ self.wfile.write(b'INTERNAL ERROR') + return + +- content_length = int(self.headers['Content-Length']) ++ content_length = int(self.headers['Content-Length'] or 0) + raw_data = self.rfile.read(content_length) + + if metadata['decompress']: +@@ -79,12 +79,12 @@ def do_POST(self): + + if self.path not in data: + data[self.path] = [] +- data[self.path].append(post_data) ++ data[self.path].append(post_data.decode('utf-8')) + +- res = json.dumps({'msg': 'ok'}) ++ res = json.dumps({'msg': 'ok'}).encode('utf8') + + self.send_response(200) +- self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Type', 'application/json; charset=utf-8') + self.send_header('Content-Length', len(res)) + self.end_headers() + +@@ -97,10 +97,10 @@ def do_GET(self): + else: + result = [] + +- res = json.dumps(result) ++ res = json.dumps(result).encode('utf8') + + self.send_response(200) +- self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Type', 'application/json; charset=utf-8') + self.send_header('Content-Length', len(res)) + self.end_headers() + diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch new file mode 100644 index 000000000000..615bb50bdb92 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch @@ -0,0 +1,22 @@ +From f0847e46c148233b6ab5d6088ca4e1dc664e82a4 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Sat, 6 Apr 2019 02:07:51 +0200 +Subject: [PATCH] testbench: fix Python 3 compatibility + +--- + tests/diag.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/diag.sh b/tests/diag.sh +index 5b4b3df46..2926e6ac2 100755 +--- a/tests/diag.sh ++++ b/tests/diag.sh +@@ -1334,7 +1334,7 @@ get_inode() { + printf 'FAIL: file "%s" does not exist in get_inode\n' "$1" + error_exit 100 + fi +- python -c 'import os; import stat; print os.lstat("'$1'")[stat.ST_INO]' ++ python -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])' + } + + diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild index 7a95b8997577..9a3428ea917a 100644 --- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit autotools eutils linux-info python-any-r1 systemd diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild new file mode 100644 index 000000000000..c2d6e8145cbf --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild @@ -0,0 +1,465 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) + +inherit autotools eutils linux-info python-any-r1 systemd + +DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" +HOMEPAGE="https://www.rsyslog.com/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" + + DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" + + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + + SRC_URI=" + https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz + doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + " +fi + +LICENSE="GPL-3 LGPL-3 Apache-2.0" +SLOT="0" +IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" +IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres" +IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libfastjson-0.99.8:= + >=dev-libs/libestr-0.1.9 + >=sys-libs/zlib-1.2.5 + curl? ( >=net-misc/curl-7.35.0 ) + 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 ) + kubernetes? ( >=net-misc/curl-7.35.0 ) + mdblookup? ( dev-libs/libmaxminddb:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) + mysql? ( virtual/libmysqlclient:= ) + normalize? ( + >=dev-libs/libee-0.4.0 + >=dev-libs/liblognorm-2.0.3:= + ) + clickhouse? ( >=net-misc/curl-7.35.0 ) + 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.17:= ) + 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? ( + gnutls? ( >=net-libs/gnutls-2.12.23:0= ) + openssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + systemd? ( >=sys-apps/systemd-234 ) + uuid? ( sys-apps/util-linux:0= ) + xxhash? ( dev-libs/xxhash:= ) + zeromq? ( + >=net-libs/czmq-3.0.2 + )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-archive-2015.02.24 + virtual/pkgconfig + elibc_musl? ( sys-libs/queue-standalone ) + test? ( + >=dev-libs/liblogging-1.0.1[stdlog] + jemalloc? ( /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 " https://www.rsyslog.com/doc/rsyslog_tls.html" +} diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild new file mode 100644 index 000000000000..c745aa8c5169 --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild @@ -0,0 +1,465 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) + +inherit autotools eutils linux-info python-any-r1 systemd + +DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" +HOMEPAGE="https://www.rsyslog.com/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" + + DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" + + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + + SRC_URI=" + https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz + doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + " +fi + +LICENSE="GPL-3 LGPL-3 Apache-2.0" +SLOT="0" +IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" +IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres" +IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libfastjson-0.99.8:= + >=dev-libs/libestr-0.1.9 + >=sys-libs/zlib-1.2.5 + curl? ( >=net-misc/curl-7.35.0 ) + 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 ) + kubernetes? ( >=net-misc/curl-7.35.0 ) + mdblookup? ( dev-libs/libmaxminddb:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) + mysql? ( virtual/libmysqlclient:= ) + normalize? ( + >=dev-libs/libee-0.4.0 + >=dev-libs/liblognorm-2.0.3:= + ) + clickhouse? ( >=net-misc/curl-7.35.0 ) + 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.17:= ) + 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? ( + gnutls? ( >=net-libs/gnutls-2.12.23:0= ) + openssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + systemd? ( >=sys-apps/systemd-234 ) + uuid? ( sys-apps/util-linux:0= ) + xxhash? ( dev-libs/xxhash:= ) + zeromq? ( + >=net-libs/czmq-3.0.2 + )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-archive-2015.02.24 + virtual/pkgconfig + elibc_musl? ( sys-libs/queue-standalone ) + test? ( + >=dev-libs/liblogging-1.0.1[stdlog] + jemalloc? ( /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 " https://www.rsyslog.com/doc/rsyslog_tls.html" +} diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild index 0433b628342d..a14e94d609f6 100644 --- a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild +++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit autotools eutils linux-info python-any-r1 systemd diff --git a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild index 1f68aea21c3b..50df01153629 100644 --- a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit autotools eutils linux-info python-any-r1 systemd diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild index 93fad0de32f8..80b404d34555 100644 --- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild +++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit autotools eutils linux-info python-any-r1 systemd -- cgit v1.2.3