gentoo resync : 24.12.2018

7 files changed, 58 insertions, 304 deletions

diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 08fbaeef8745..2ac66fa9e46d 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,20 +1,19 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
-AUX rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
 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
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
-DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 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-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
 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
-EBUILD rsyslog-8.35.0-r1.ebuild 11935 BLAKE2B 7676414e42d9bdb9ce830eb8a5ed9c1899ccdac7e02f3eebc07a577418d746444694708c54b60f8238675ff15759f9d3ddbfd955721f30c6376d4b598289f4db SHA512 59d1a05886ad9a11776018a10f6ffbabd34422f6d2b1818af8c0781bfa9a5d1576499ead1477840372f8d4e1e357bb5d48ad8696bc7994c29971e1547d58b0ba
-EBUILD rsyslog-8.38.0-r1.ebuild 12302 BLAKE2B 4075c44c01a73762edef1840d55de06ddb9a2b66be014f129ba1bbbfe57e8949420d2d337733ad66cf3b0e496c7c8eda1800eb930d0dd2561f5ba475e279f22f SHA512 cf553fee9df2725d694d07adab0781b48a7c25c6c775cfd79a148b8f72c31a97d56dd40d532160e92b8c82b1d09799023c2c08361f2e9ebeb959f72b33b85000
-EBUILD rsyslog-8.39.0.ebuild 12376 BLAKE2B 4ebe6f27923bbef93b9ce8350f233d752bd52bfa70b36160677be73d7afd88308cd7b5a25732f0f34a0c0de327fa99f0a6a6dfe076896f519de3eb4257a09e7d SHA512 dab6fd2e8f6ab9b4725b3d9a3068c3c450a7d40cfc52874b7218e8043d4f4edf6ca5261b1410926b311f5506d67d6ed58241410d68c739938968735f82d9ca8d
+DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
+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 12365 BLAKE2B 42ed5ce3711c1c6a938b8e04c1bc268ace156558e80f622eb9fc9c422735d33f37e700c029df9b4ab3ac2225da2b648a82061fca6edcceae0f414733f64b8157 SHA512 1e54fbddaabe60b97f83239e3b19b25add36ee90b84ffe5c603cbd7a87e8df01c0ff010472250970179335f959f47bc01dc66ffef26ce3d25b608a1756c10276
 MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
deleted file mode 100644
index 8996acd27e88..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Add missing files for mmkubernetes tests
-
-Upstream bug: https://github.com/rsyslog/rsyslog/pull/2719
-
---- /dev/null
-+++ b/tests/mmkubernetes-basic.out.json
-@@ -0,0 +1,110 @@
-+[{
-+  "kubernetes": {
-+    "namespace_id": "namespace-name2-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name2-id",
-+    "labels": {
-+      "custom_label": "pod-name2-label-value",
-+      "deploymentconfig": "pod-name2-dc",
-+      "component": "pod-name2-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name2-deployment"
-+    },
-+    "pod_name": "pod-name2",
-+    "namespace_name": "namespace-name2",
-+    "container_name": "container-name2",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id2"
-+  }
-+},
-+{
-+  "message": "a message from container 4",
-+  "CONTAINER_NAME": "some-prefix_container-name4_pod-name4_namespace-name4_unused4_unused44",
-+  "CONTAINER_ID_FULL": "id4",
-+  "kubernetes": {
-+    "namespace_id": "namespace-name4-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name4-id",
-+    "labels": {
-+      "custom_label": "pod-name4-label-value",
-+      "deploymentconfig": "pod-name4-dc",
-+      "component": "pod-name4-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name4-deployment"
-+    },
-+    "pod_name": "pod-name4",
-+    "namespace_name": "namespace-name4",
-+    "container_name": "container-name4",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id4"
-+  }
-+},
-+{
-+  "kubernetes": {
-+    "namespace_id": "namespace-name1-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name1-id",
-+    "labels": {
-+      "custom_label": "pod-name1-label-value",
-+      "deploymentconfig": "pod-name1-dc",
-+      "component": "pod-name1-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name1-deployment"
-+    },
-+    "pod_name": "pod-name1",
-+    "namespace_name": "namespace-name1",
-+    "container_name": "container-name1",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id1"
-+  }
-+},
-+{
-+  "message": "a message from container 3",
-+  "CONTAINER_NAME": "some-prefix_container-name3.container-hash3_pod-name3_namespace-name3_unused3_unused33",
-+  "CONTAINER_ID_FULL": "id3",
-+  "kubernetes": {
-+    "namespace_id": "namespace-name3-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name3-id",
-+    "labels": {
-+      "custom_label": "pod-name3-label-value",
-+      "deploymentconfig": "pod-name3-dc",
-+      "component": "pod-name3-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name3-deployment"
-+    },
-+    "pod_name": "pod-name3",
-+    "namespace_name": "namespace-name3",
-+    "container_name": "container-name3",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id3"
-+  }
-+}]
---- /dev/null
-+++ b/tests/mmkubernetes_test_server.py
-@@ -0,0 +1,121 @@
-+# Used by the mmkubernetes tests
-+# This is a simple http server which responds to kubernetes api requests
-+# and responds with kubernetes api server responses
-+# added 2018-04-06 by richm, released under ASL 2.0
-+import os
-+import json
-+import sys
-+
-+try:
-+    from http.server import HTTPServer, BaseHTTPRequestHandler
-+except ImportError:
-+    from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-+
-+ns_template = '''{{
-+  "kind": "Namespace",
-+  "apiVersion": "v1",
-+  "metadata": {{
-+    "name": "{namespace_name}",
-+    "selfLink": "/api/v1/namespaces/{namespace_name}",
-+    "uid": "{namespace_name}-id",
-+    "resourceVersion": "2988",
-+    "creationTimestamp": "2018-04-09T21:56:39Z",
-+    "labels": {{
-+      "label.1.key":"label 1 value",
-+      "label.2.key":"label 2 value",
-+      "label.with.empty.value":""
-+    }},
-+    "annotations": {{
-+      "k8s.io/description": "",
-+      "k8s.io/display-name": "",
-+      "k8s.io/node-selector": "",
-+      "k8s.io/sa.scc.mcs": "s0:c9,c4",
-+      "k8s.io/sa.scc.supplemental-groups": "1000080000/10000",
-+      "k8s.io/sa.scc.uid-range": "1000080000/10000",
-+      "quota.k8s.io/cluster-resource-override-enabled": "false"
-+    }}
-+  }},
-+  "spec": {{
-+    "finalizers": [
-+      "openshift.io/origin",
-+      "kubernetes"
-+    ]
-+  }},
-+  "status": {{
-+    "phase": "Active"
-+  }}
-+}}'''
-+
-+pod_template = '''{{
-+  "kind": "Pod",
-+  "apiVersion": "v1",
-+  "metadata": {{
-+    "name": "{pod_name}",
-+    "generateName": "{pod_name}-prefix",
-+    "namespace": "{namespace_name}",
-+    "selfLink": "/api/v1/namespaces/{namespace_name}/pods/{pod_name}",
-+    "uid": "{pod_name}-id",
-+    "resourceVersion": "3486",
-+    "creationTimestamp": "2018-04-09T21:56:39Z",
-+    "labels": {{
-+      "component": "{pod_name}-component",
-+      "deployment": "{pod_name}-deployment",
-+      "deploymentconfig": "{pod_name}-dc",
-+      "custom.label": "{pod_name}-label-value",
-+      "label.with.empty.value":""
-+    }},
-+    "annotations": {{
-+      "k8s.io/deployment-config.latest-version": "1",
-+      "k8s.io/deployment-config.name": "{pod_name}-dc",
-+      "k8s.io/deployment.name": "{pod_name}-deployment",
-+      "k8s.io/custom.name": "custom value",
-+      "annotation.with.empty.value":""
-+    }}
-+  }},
-+  "status": {{
-+    "phase": "Running",
-+    "hostIP": "172.18.4.32",
-+    "podIP": "10.128.0.14",
-+    "startTime": "2018-04-09T21:57:39Z"
-+  }}
-+}}'''
-+
-+class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
-+
-+    def do_GET(self):
-+        # "http://localhost:18443/api/v1/namespaces/namespace-name2"
-+        # parse url - either /api/v1/namespaces/$ns_name
-+        # or
-+        # /api/v1/namespaces/$ns_name/pods/$pod_name
-+        comps = self.path.split('/')
-+        status = 400
-+        if len(comps) >= 5 and comps[1] == 'api' and comps[2] == 'v1':
-+            if len(comps) == 5 and comps[3] == 'namespaces': # namespace
-+                resp = ns_template.format(namespace_name=comps[4])
-+                status = 200
-+            elif len(comps) == 7 and comps[3] == 'namespaces' and comps[5] == 'pods':
-+                resp = pod_template.format(namespace_name=comps[4], pod_name=comps[6])
-+                status = 200
-+            else:
-+                resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
-+        else:
-+            resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
-+        if not status == 200:
-+            self.log_error(resp)
-+        self.send_response(status)
-+        self.end_headers()
-+        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
-+
-+port = int(sys.argv[1])
-+
-+httpd = HTTPServer(('localhost', port), SimpleHTTPRequestHandler)
-+
-+# write "started" to file named in argv[3]
-+with open(sys.argv[3], "w") as ff:
-+    ff.write("started\n")
-+
-+# write pid to file named in argv[2]
-+with open(sys.argv[2], "w") as ff:
-+    ff.write('{0}\n'.format(os.getpid()))
-+
-+httpd.serve_forever()
diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
deleted file mode 100644
index eaec239c3839..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001
-From: Rich Megginson <rmeggins@redhat.com>
-Date: Thu, 17 May 2018 18:38:25 -0600
-Subject: [PATCH] mmkubernetes test python must encode response
-
-https://github.com/rsyslog/rsyslog/issues/2721
-Was not working on python3 - must use `encode()` to convert the
-string to a `bytes` object.
-Also run the server with python -u to make sure we get the log
-output from the kubernetes test server.
----
- tests/mmkubernetes-basic.sh       | 2 +-
- tests/mmkubernetes_test_server.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh
-index 0bbfd08ca..d320c343f 100755
---- a/tests/mmkubernetes-basic.sh
-+++ b/tests/mmkubernetes-basic.sh
-@@ -4,7 +4,7 @@
- . $srcdir/diag.sh init
- 
- testsrv=mmk8s-test-server
--python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
-+python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
- BGPROCESS=$!
- . $srcdir/diag.sh wait-startup $testsrv
- echo background mmkubernetes_test_server.py process id is $BGPROCESS
-diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py
-index 0de215603..24f4e1b0e 100644
---- a/tests/mmkubernetes_test_server.py
-+++ b/tests/mmkubernetes_test_server.py
-@@ -104,7 +104,7 @@ def do_GET(self):
-             self.log_error(resp)
-         self.send_response(status)
-         self.end_headers()
--        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
-+        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode())
- 
- port = int(sys.argv[1])
- 
diff --git a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
new file mode 100644
index 000000000000..9247d0b067f4
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
@@ -0,0 +1,13 @@
+https://github.com/rsyslog/rsyslog/issues/3346
+
+--- a/tools/omusrmsg.c
++++ b/tools/omusrmsg.c
+@@ -261,7 +261,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
+ 
+ 		/* compute the device name */
+ 		strcpy(p, _PATH_DEV);
+-		memcpy(p, ut.ut_line, UNAMESZ);
++		strncat(p, ut.ut_line, UNAMESZ);
+ 
+ 		/* we must be careful when writing to the terminal. A terminal may block
+ 		 * (for example, a user has pressed <ctl>-s). In that case, we can not
diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
index bd4d4f30836f..0433b628342d 100644
--- a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
@@ -16,14 +16,17 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	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 )
 	"
 
-	PATCHES=( "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch )
+	PATCHES=(
+		"${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch
+		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
+	)
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
index 71ff1a671915..1f68aea21c3b 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -24,20 +24,21 @@ else
 	"
 
 	PATCHES=(
-		"${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch
-		"${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch
+		"${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch
+		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
 	)
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
-IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libfastjson-0.99.8:=
 	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
 	>=sys-libs/zlib-1.2.5
 	curl? ( >=net-misc/curl-7.35.0 )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
@@ -60,16 +61,23 @@ RDEPEND="
 	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.14:= )
+	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? ( >=net-libs/gnutls-2.12.23:0= )
+	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
 	)"
@@ -77,12 +85,16 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
 	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
 		!jemalloc? ( sys-libs/libfaketime )
 		${PYTHON_DEPS}
 	)"
 
-REQUIRED_USE="kubernetes? ( normalize )"
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
 
 if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -157,7 +169,10 @@ src_configure() {
 		--disable-debug-symbols
 		--disable-generate-man-pages
 		--without-valgrind-testbench
+		--disable-liblogging-stdlog
 		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
 		# Input Plugins without depedencies
 		--enable-imdiag
 		--enable-imfile
@@ -180,10 +195,15 @@ src_configure() {
 		--enable-omstdout
 		--enable-omuxsock
 		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
 		--enable-pmaixforwardedfrom
 		--enable-pmciscoios
 		--enable-pmcisconames
 		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
 		--enable-pmsnare
 		# DB
 		$(use_enable dbi libdbi)
@@ -194,7 +214,6 @@ src_configure() {
 		# Debug
 		$(use_enable debug)
 		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
 		$(use_enable debug valgrind)
 		# Misc
 		$(use_enable curl fmhttp)
@@ -208,6 +227,7 @@ src_configure() {
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
 		$(use_enable grok mmgrok)
+		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
 		$(use_enable rabbitmq omrabbitmq)
@@ -216,7 +236,8 @@ src_configure() {
 		$(use_enable rfc5424hmac mmrfc5424addhmac)
 		$(use_enable snmp)
 		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
+		$(use_enable gnutls)
+		$(use_enable openssl)
 		$(use_enable systemd imjournal)
 		$(use_enable systemd omjournal)
 		$(use_enable usertools)
diff --git a/app-admin/rsyslog/rsyslog-8.39.0.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index 941114204018..b471841628fc 100644
--- a/app-admin/rsyslog/rsyslog-8.39.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -16,14 +16,14 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	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 )
 	"
 
-	PATCHES=( "${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch )
+	PATCHES=( "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"