commit
b31fa893c4
@ -0,0 +1,3 @@
|
|||||||
|
SOURCES/qpid-proton-0.39.0.tar.gz
|
||||||
|
SOURCES/rsyslog-8.2408.0.tar.gz
|
||||||
|
SOURCES/rsyslog-doc-8.2408.0.tar.gz
|
@ -0,0 +1,3 @@
|
|||||||
|
de593ff72792d70b9027dd67aaa2b830dc148574 SOURCES/qpid-proton-0.39.0.tar.gz
|
||||||
|
83dd5ab9a5ca60b96eba1b01850ef2904b5f8639 SOURCES/rsyslog-8.2408.0.tar.gz
|
||||||
|
b2d852706e9a1029ee20adf4ecaab42865301b56 SOURCES/rsyslog-doc-8.2408.0.tar.gz
|
@ -0,0 +1,72 @@
|
|||||||
|
diff -up rsyslog-8.2408.0/runtime/net_ossl.c.orig rsyslog-8.2408.0/runtime/net_ossl.c
|
||||||
|
--- rsyslog-8.2408.0/runtime/net_ossl.c.orig 2024-08-21 12:20:02.634846602 +0200
|
||||||
|
+++ rsyslog-8.2408.0/runtime/net_ossl.c 2024-08-21 12:23:59.487229756 +0200
|
||||||
|
@@ -223,6 +223,7 @@ osslGlblInit(void)
|
||||||
|
PRAGMA_DIAGNOSTIC_PUSH
|
||||||
|
PRAGMA_IGNORE_Wdeprecated_declarations
|
||||||
|
|
||||||
|
+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM
|
||||||
|
// Initialize OpenSSL engine library
|
||||||
|
ENGINE_load_builtin_engines();
|
||||||
|
/* Register all of them for every algorithm they collectively implement */
|
||||||
|
@@ -243,6 +244,7 @@ PRAGMA_IGNORE_Wdeprecated_declarations
|
||||||
|
}
|
||||||
|
// Free the engine reference when done
|
||||||
|
ENGINE_free(osslEngine);
|
||||||
|
+#endif
|
||||||
|
PRAGMA_DIAGNOSTIC_POP
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -251,7 +253,10 @@ void
|
||||||
|
osslGlblExit(void)
|
||||||
|
{
|
||||||
|
DBGPRINTF("openssl: entering osslGlblExit\n");
|
||||||
|
+
|
||||||
|
+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM
|
||||||
|
ENGINE_cleanup();
|
||||||
|
+#endif
|
||||||
|
ERR_free_strings();
|
||||||
|
EVP_cleanup();
|
||||||
|
CRYPTO_cleanup_all_ex_data();
|
||||||
|
@@ -638,7 +643,7 @@ net_ossl_chkonepeername(net_ossl_t *pThi
|
||||||
|
#endif
|
||||||
|
char *x509name = NULL;
|
||||||
|
DEFiRet;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
if (certpeer == NULL) {
|
||||||
|
ABORT_FINALIZE(RS_RET_TLS_NO_CERT);
|
||||||
|
}
|
||||||
|
@@ -1151,6 +1156,8 @@ net_ossl_init_engine(__attribute__((unus
|
||||||
|
|
||||||
|
PRAGMA_DIAGNOSTIC_PUSH
|
||||||
|
PRAGMA_IGNORE_Wdeprecated_declarations
|
||||||
|
+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM
|
||||||
|
+
|
||||||
|
// Get the default RSA engine
|
||||||
|
ENGINE *default_engine = ENGINE_get_default_RSA();
|
||||||
|
if (default_engine) {
|
||||||
|
@@ -1188,6 +1195,7 @@ PRAGMA_IGNORE_Wdeprecated_declarations
|
||||||
|
} else {
|
||||||
|
DBGPRINTF("net_ossl_init_engine: use openssl default Engine");
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
PRAGMA_DIAGNOSTIC_POP
|
||||||
|
|
||||||
|
RETiRet;
|
||||||
|
diff -up rsyslog-8.2408.0/runtime/net_ossl.h.orig rsyslog-8.2408.0/runtime/net_ossl.h
|
||||||
|
--- rsyslog-8.2408.0/runtime/net_ossl.h.orig 2024-08-21 12:19:42.902648065 +0200
|
||||||
|
+++ rsyslog-8.2408.0/runtime/net_ossl.h 2024-08-21 12:23:14.053772607 +0200
|
||||||
|
@@ -31,7 +31,11 @@
|
||||||
|
#if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
# include <openssl/bioerr.h>
|
||||||
|
#endif
|
||||||
|
-#include <openssl/engine.h>
|
||||||
|
+
|
||||||
|
+#ifdef ENABLE_OPENSSL_ENGINES_DOWNSTREAM
|
||||||
|
+# include <openssl/engine.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <openssl/rand.h>
|
||||||
|
#include <openssl/evp.h>
|
||||||
|
|
@ -0,0 +1,80 @@
|
|||||||
|
# rsyslog configuration file
|
||||||
|
|
||||||
|
# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
|
||||||
|
# or latest version online at http://www.rsyslog.com/doc/rsyslog_conf.html
|
||||||
|
# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
|
||||||
|
|
||||||
|
#### GLOBAL DIRECTIVES ####
|
||||||
|
|
||||||
|
# Where to place auxiliary files
|
||||||
|
global(workDirectory="/var/lib/rsyslog")
|
||||||
|
|
||||||
|
#### MODULES ####
|
||||||
|
|
||||||
|
# Use default timestamp format
|
||||||
|
module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat")
|
||||||
|
|
||||||
|
module(load="imuxsock" # provides support for local system logging (e.g. via logger command)
|
||||||
|
SysSock.Use="off") # Turn off message reception via local log socket;
|
||||||
|
# local messages are retrieved through imjournal now.
|
||||||
|
module(load="imjournal" # provides access to the systemd journal
|
||||||
|
StateFile="imjournal.state") # File to store the position in the journal
|
||||||
|
|
||||||
|
# Include all config files in /etc/rsyslog.d/
|
||||||
|
include(file="/etc/rsyslog.d/*.conf" mode="optional")
|
||||||
|
|
||||||
|
#module(load="imklog") # reads kernel messages (the same are read from journald)
|
||||||
|
#module(load="immark") # provides --MARK-- message capability
|
||||||
|
|
||||||
|
# Provides UDP syslog reception
|
||||||
|
# for parameters see http://www.rsyslog.com/doc/imudp.html
|
||||||
|
#module(load="imudp") # needs to be done just once
|
||||||
|
#input(type="imudp" port="514")
|
||||||
|
|
||||||
|
# Provides TCP syslog reception
|
||||||
|
# for parameters see http://www.rsyslog.com/doc/imtcp.html
|
||||||
|
#module(load="imtcp") # needs to be done just once
|
||||||
|
#input(type="imtcp" port="514")
|
||||||
|
|
||||||
|
#### RULES ####
|
||||||
|
|
||||||
|
# Log all kernel messages to the console.
|
||||||
|
# Logging much else clutters up the screen.
|
||||||
|
#kern.* /dev/console
|
||||||
|
|
||||||
|
# Log anything (except mail) of level info or higher.
|
||||||
|
# Don't log private authentication messages!
|
||||||
|
*.info;mail.none;authpriv.none;cron.none /var/log/messages
|
||||||
|
|
||||||
|
# The authpriv file has restricted access.
|
||||||
|
authpriv.* /var/log/secure
|
||||||
|
|
||||||
|
# Log all the mail messages in one place.
|
||||||
|
mail.* -/var/log/maillog
|
||||||
|
|
||||||
|
|
||||||
|
# Log cron stuff
|
||||||
|
cron.* /var/log/cron
|
||||||
|
|
||||||
|
# Everybody gets emergency messages
|
||||||
|
*.emerg :omusrmsg:*
|
||||||
|
|
||||||
|
# Save news errors of level crit and higher in a special file.
|
||||||
|
uucp,news.crit /var/log/spooler
|
||||||
|
|
||||||
|
# Save boot messages also to boot.log
|
||||||
|
local7.* /var/log/boot.log
|
||||||
|
|
||||||
|
|
||||||
|
# ### sample forwarding rule ###
|
||||||
|
#action(type="omfwd"
|
||||||
|
# # An on-disk queue is created for this action. If the remote host is
|
||||||
|
# # down, messages are spooled to disk and sent when it is up again.
|
||||||
|
#queue.filename="fwdRule1" # unique name prefix for spool files
|
||||||
|
#queue.maxdiskspace="1g" # 1gb space limit (use as much as possible)
|
||||||
|
#queue.saveonshutdown="on" # save messages to disk on shutdown
|
||||||
|
#queue.type="LinkedList" # run asynchronously
|
||||||
|
#action.resumeRetryCount="-1" # infinite retries if host is down
|
||||||
|
# # Remote Logging (we use TCP for reliable delivery)
|
||||||
|
# # remote_host is: name/ip, e.g. 192.168.0.1, port optional e.g. 10514
|
||||||
|
#Target="remote_host" Port="XXX" Protocol="tcp")
|
@ -0,0 +1,12 @@
|
|||||||
|
/var/log/cron
|
||||||
|
/var/log/maillog
|
||||||
|
/var/log/messages
|
||||||
|
/var/log/secure
|
||||||
|
/var/log/spooler
|
||||||
|
{
|
||||||
|
missingok
|
||||||
|
sharedscripts
|
||||||
|
postrotate
|
||||||
|
/usr/bin/systemctl reload rsyslog.service >/dev/null 2>&1 || true
|
||||||
|
endscript
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=System Logging Service
|
||||||
|
;Requires=syslog.socket
|
||||||
|
Documentation=man:rsyslogd(8)
|
||||||
|
Documentation=https://www.rsyslog.com/doc/
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=notify
|
||||||
|
EnvironmentFile=-/etc/sysconfig/rsyslog
|
||||||
|
ExecStart=/usr/sbin/rsyslogd -n $SYSLOGD_OPTIONS
|
||||||
|
ExecReload=/usr/bin/kill -HUP $MAINPID
|
||||||
|
UMask=0066
|
||||||
|
StandardOutput=null
|
||||||
|
Restart=on-failure
|
||||||
|
|
||||||
|
# Increase the default a bit in order to allow many simultaneous
|
||||||
|
# files to be monitored, we might need a lot of fds.
|
||||||
|
LimitNOFILE=16384
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
;Alias=syslog.service
|
@ -0,0 +1,5 @@
|
|||||||
|
# Options for rsyslogd
|
||||||
|
# Syslogd options are deprecated since rsyslog v3.
|
||||||
|
# If you want to use them, switch to compatibility mode 2 by "-c 2"
|
||||||
|
# See rsyslogd(8) for more details
|
||||||
|
SYSLOGD_OPTIONS=""
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue