app-admin/rsyslog: drop old

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

6 files changed, 0 insertions, 1241 deletions

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
deleted file mode 100644
index da9c79c68293..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch
+++ /dev/null
@@ -1,736 +0,0 @@
---- /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 <host>:<port>/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 <host>:<post>/post/endpoint responds with...
-+        ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]
-+    """
-+
-+    def validate_auth(self):
-+        # header format for basic authentication
-+        # 'Authorization: Basic <base 64 encoded uid:pwd>'
-+        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
deleted file mode 100644
index 6600c61666e9..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From c82b747eaf96cc77efa530ca5844ba01b91bfc88 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-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
deleted file mode 100644
index 615bb50bdb92..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f0847e46c148233b6ab5d6088ca4e1dc664e82a4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-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/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
deleted file mode 100644
index c78e0e502d46..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 0b0a1262f2b401ea16b7d0b36d8254c500cb9d8e Mon Sep 17 00:00:00 2001
-From: Joan Sala <jsiwrk@gmail.com>
-Date: Thu, 20 Sep 2018 22:37:58 +0200
-Subject: [PATCH] testbench: fix incompatibility of one omprog test with
- Python3
-
-Python3 writes to stderr immediately, and this caused the
-captured output to differ with respect to Python2. Simplified
-the test to do a single write to stderr. Also a cast to int
-was needed when calculating 'numRepeats'.
-
-closes #3030
----
- tests/omprog-output-capture-mt.sh               |  2 +-
- .../testsuites/omprog-output-capture-mt-bin.py  | 17 +++++++----------
- 2 files changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/tests/omprog-output-capture-mt.sh b/tests/omprog-output-capture-mt.sh
-index 50f5c6354..080fabd2a 100755
---- a/tests/omprog-output-capture-mt.sh
-+++ b/tests/omprog-output-capture-mt.sh
-@@ -24,7 +24,7 @@ else
-     LINE_LENGTH=511   # 512 minus 1 byte (for the newline char)
- fi
- 
--export command_line="/usr/bin/stdbuf -oL -eL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
-+export command_line="/usr/bin/stdbuf -oL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
- 
- check_command_available stdbuf
- generate_conf
-diff --git a/tests/testsuites/omprog-output-capture-mt-bin.py b/tests/testsuites/omprog-output-capture-mt-bin.py
-index 6c81da24b..03097f37b 100755
---- a/tests/testsuites/omprog-output-capture-mt-bin.py
-+++ b/tests/testsuites/omprog-output-capture-mt-bin.py
-@@ -10,7 +10,7 @@
- logLine = sys.stdin.readline()
- while logLine:
-     logLine = logLine.strip()
--    numRepeats = lineLength / len(logLine)
-+    numRepeats = int(lineLength / len(logLine))
-     lineToStdout = (linePrefix + "[stdout] " + logLine*numRepeats)[:lineLength]
-     lineToStderr = (linePrefix + "[stderr] " + logLine*numRepeats)[:lineLength]
- 
-@@ -22,16 +22,13 @@
-     # size of the block buffer is generally greater than PIPE_BUF).
-     sys.stdout.write(lineToStdout + "\n")
- 
--    # Write to stderr using two writes. Since stderr is unbuffered, each write will be written
--    # immediately to the pipe, and this will cause intermingled lines in the output file.
--    # However, we avoid this by executing this script with 'stdbuf -eL', which forces line
--    # buffering for stderr. We could alternatively do a single write.
--    sys.stderr.write(lineToStderr)
--    sys.stderr.write("\n")
-+    # Write to stderr using a single write. Since stderr is unbuffered, each write will be
-+    # written immediately (and atomically) to the pipe.
-+    sys.stderr.write(lineToStderr + "\n")
- 
--    # Note: In future versions of Python3, stderr will possibly be line buffered (see
--    # https://bugs.python.org/issue13601).
--    # Note: When writing to stderr using the Python logging module, it seems that line
-+    # Note (FTR): In future versions of Python3, stderr will possibly be line buffered (see
-+    # https://bugs.python.org/issue13601). The previous write will also be atomic in this case.
-+    # Note (FTR): When writing to stderr using the Python logging module, it seems that line
-     # buffering is also used (although this could depend on the Python version).
- 
-     logLine = sys.stdin.readline()
diff --git a/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch b/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch
deleted file mode 100644
index 6ccf8f0252da..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-https://github.com/rsyslog/rsyslog/pull/3240
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1436,6 +1436,12 @@ fi
- AM_CONDITIONAL(ENABLE_KSI_LS12, test x$enable_ksi_ls12 = xyes)
- 
- # liblogging-stdlog support
-+# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case
-+PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
-+	AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]),
-+	[AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])]
-+)
-+
- AC_ARG_ENABLE(liblogging-stdlog,
-         [AS_HELP_STRING([--enable-liblogging-stdlog],[Enable liblogging-stdlog support @<:@default=no@:>@])],
-         [case "${enableval}" in
-@@ -1445,18 +1451,15 @@ AC_ARG_ENABLE(liblogging-stdlog,
-          esac],
-         [enable_liblogging_stdlog=no]
- )
-+if test "x$enable_liblogging_stdlog" = "xyes" -a "x$HAVE_LIBLOGGING_STDLOG" != "x1"; then
-+	AC_MSG_ERROR(--enable-liblogging-stdlog set but liblogging was not found)
-+fi
-+AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, [test "x$enable_liblogging_stdlog" = "xyes"])
- if test "x$enable_liblogging_stdlog" = "xyes"; then
--	PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
--		AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.])
--	)
-+	AC_MSG_NOTICE(DEBUG: liblogging_stdlog enabled)
-+else
-+	AC_MSG_NOTICE(DEBUG: liblogging_stdlog disabled)
- fi
--AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, test x$enable_liblogging_stdlog = xyes)
--
--# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case
--PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
--	AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]),
--	[AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])]
--)
- 
- # RFC 3195 support
- AC_ARG_ENABLE(rfc3195,
---- a/plugins/imklog/Makefile.am
-+++ b/plugins/imklog/Makefile.am
-@@ -10,6 +10,11 @@ if ENABLE_IMKLOG_LINUX
- imklog_la_SOURCES += bsd.c
- endif
- 
--imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imklog_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imklog_la_LDFLAGS = -module -avoid-version
- imklog_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imklog_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imklog_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/immark/Makefile.am
-+++ b/plugins/immark/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = immark.la
- 
- immark_la_SOURCES = immark.c immark.h
--immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--immark_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS)
-+immark_la_LDFLAGS = -module -avoid-version
- immark_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+immark_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+immark_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imtcp/Makefile.am
-+++ b/plugins/imtcp/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imtcp.la
- 
- imtcp_la_SOURCES = imtcp.c
--imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imtcp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imtcp_la_LDFLAGS = -module -avoid-version
- imtcp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imtcp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imtcp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imudp/Makefile.am
-+++ b/plugins/imudp/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imudp.la
- 
- imudp_la_SOURCES = imudp.c
--imudp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imudp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imudp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imudp_la_LDFLAGS = -module -avoid-version
- imudp_la_LIBADD = $(IMUDP_LIBS)
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imudp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imudp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imuxsock/Makefile.am
-+++ b/plugins/imuxsock/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imuxsock.la
- 
- imuxsock_la_SOURCES = imuxsock.c
--imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imuxsock_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imuxsock_la_LDFLAGS = -module -avoid-version
- imuxsock_la_LIBADD =
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imuxsock_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imuxsock_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/mmexternal/Makefile.am
-+++ b/plugins/mmexternal/Makefile.am
-@@ -1,8 +1,13 @@
- pkglib_LTLIBRARIES = mmexternal.la
- 
- mmexternal_la_SOURCES = mmexternal.c
--mmexternal_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--mmexternal_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+mmexternal_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+mmexternal_la_LDFLAGS = -module -avoid-version
- mmexternal_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+mmexternal_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+mmexternal_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- EXTRA_DIST = 
---- a/plugins/omtesting/Makefile.am
-+++ b/plugins/omtesting/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = omtesting.la
- 
- omtesting_la_SOURCES = omtesting.c
--omtesting_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--omtesting_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+omtesting_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+omtesting_la_LDFLAGS = -module -avoid-version
- omtesting_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+omtesting_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+omtesting_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -112,8 +112,15 @@ else
- librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
- endif
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBUUID_CFLAGS) $(LIBFASTJSON_CFLAGS) ${LIBESTR_CFLAGS} ${LIBLOGGING_STDLOG_CFLAGS} -I\$(top_srcdir)/tools
--librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS) ${LIBESTR_LIBS} ${LIBLOGGING_STDLOG_LIBS}
-+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBUUID_CFLAGS) $(LIBFASTJSON_CFLAGS) ${LIBESTR_CFLAGS}
-+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS) ${LIBESTR_LIBS}
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+librsyslog_la_CPPFLAGS += ${LIBLOGGING_STDLOG_CFLAGS}
-+librsyslog_la_LIBADD += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
-+librsyslog_la_CPPFLAGS += -I\$(top_srcdir)/tools
- 
- #
- # regular expression support
-@@ -121,9 +128,15 @@ librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS
- if ENABLE_REGEXP
- pkglib_LTLIBRARIES += lmregexp.la
- lmregexp_la_SOURCES = regexp.c regexp.h
--lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmregexp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmregexp_la_LIBADD =
-+lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmregexp_la_LDFLAGS = -module -avoid-version
-+lmregexp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmregexp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmregexp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- endif
- 
- #
-@@ -131,9 +144,14 @@ endif
- # 
- pkglib_LTLIBRARIES += lmzlibw.la
- lmzlibw_la_SOURCES = zlibw.c zlibw.h
--lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmzlibw_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmzlibw_la_LIBADD =
-+lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmzlibw_la_LDFLAGS = -module -avoid-version
-+lmzlibw_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmzlibw_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmzlibw_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- 
- if ENABLE_INET
-@@ -142,18 +160,28 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrms.la
- # network support
- # 
- lmnet_la_SOURCES = net.c net.h
--lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnet_la_LDFLAGS = -module -avoid-version ../compat/compat_la-getifaddrs.lo $(LIBLOGGING_STDLOG_LIBS)
--lmnet_la_LIBADD =
-+lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnet_la_LDFLAGS = -module -avoid-version ../compat/compat_la-getifaddrs.lo
-+lmnet_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnet_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnet_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- # network stream master class and stream factory
- lmnetstrms_la_SOURCES = netstrms.c netstrms.h \
- 			netstrm.c netstrm.h \
- 			nssel.c nssel.h \
- 			nspoll.c nspoll.h
--lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnetstrms_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmnetstrms_la_LIBADD =
-+lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnetstrms_la_LDFLAGS = -module -avoid-version
-+lmnetstrms_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnetstrms_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnetstrms_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- # netstream drivers
- 
-@@ -162,9 +190,15 @@ pkglib_LTLIBRARIES += lmnsd_ptcp.la
- lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_ptcp.h \
- 		  	nsdsel_ptcp.c nsdsel_ptcp.h \
- 			nsdpoll_ptcp.c nsdpoll_ptcp.h
--lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnsd_ptcp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmnsd_ptcp_la_LIBADD =
-+lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnsd_ptcp_la_LDFLAGS = -module -avoid-version
-+lmnsd_ptcp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnsd_ptcp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnsd_ptcp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- endif # if ENABLE_INET
- 
- #
-@@ -226,20 +260,30 @@ lmtcpsrv_la_SOURCES = \
- 	tcps_sess.h \
- 	tcpsrv.c \
- 	tcpsrv.h
--lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmtcpsrv_la_LDFLAGS = -module -avoid-version
- lmtcpsrv_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+lmtcpsrv_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmtcpsrv_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- #
- # TCP (stream) client support
- #
- lmtcpclt_la_SOURCES = \
- 	tcpclt.c \
- 	tcpclt.h
--lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmtcpclt_la_LDFLAGS = -module -avoid-version
- lmtcpclt_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+lmtcpclt_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmtcpclt_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- 
- #
- # support library for Guardtime KSI-LS12
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -37,7 +37,14 @@ rsyslogd_SOURCES = \
- 	iminternal.h \
- 	\
- 	../dirty.h
--rsyslogd_CPPFLAGS =  $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) -DSD_EXPORT_SYMBOLS
-+rsyslogd_CPPFLAGS =  $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+rsyslogd_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+endif
-+
-+rsyslogd_CPPFLAGS += -DSD_EXPORT_SYMBOLS
-+
- # note: it looks like librsyslog.la must be explicitely given on LDDADD,
- # otherwise dependencies are not properly calculated (resulting in a
- # potentially incomplete build, a problem we had several times...)
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
deleted file mode 100644
index 9247d0b067f4..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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