summaryrefslogtreecommitdiff
path: root/sysutils/rsyslog8/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/rsyslog8/files')
-rw-r--r--sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c10
-rw-r--r--sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c10
-rw-r--r--sysutils/rsyslog8/files/patch-runtime_net__ossl.c18
-rw-r--r--sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c16
4 files changed, 8 insertions, 46 deletions
diff --git a/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c b/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c
deleted file mode 100644
index 3d1f95b3447d..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/imdtls/imdtls.c.orig 2024-03-31 11:10:07 UTC
-+++ plugins/imdtls/imdtls.c
-@@ -23,6 +23,7 @@
- */
- #include "config.h"
-
-+#include <signal.h>
- #include <stdio.h>
- #include <arpa/inet.h>
- #include <fcntl.h>
diff --git a/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c b/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c
deleted file mode 100644
index cd4447416a9a..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/omdtls/omdtls.c.orig 2024-02-26 08:24:02 UTC
-+++ plugins/omdtls/omdtls.c
-@@ -43,6 +43,7 @@
- #endif
- #include <sys/time.h>
- #include <time.h>
-+#include <unistd.h>
-
- // --- Include openssl headers as well
- #include <openssl/ssl.h>
diff --git a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c
deleted file mode 100644
index 22e76aeebaef..000000000000
--- a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- runtime/net_ossl.c.orig 2024-02-26 08:24:02 UTC
-+++ runtime/net_ossl.c
-@@ -460,6 +460,7 @@ void net_ossl_lastOpenSSLErrorMsg
-
- /* initialize tls config commands in openssl context
- */
-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd)
- {
- DEFiRet;
-@@ -543,6 +544,7 @@ finalize_it:
- finalize_it:
- RETiRet;
- }
-+#endif
-
-
- /* Convert a fingerprint to printable data. The conversion is carried out
diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c
index 8fad7d5c40e8..8fd03819cdb5 100644
--- a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c
+++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c
@@ -1,11 +1,11 @@
---- runtime/nsd_ossl.c.orig 2024-02-26 08:24:02 UTC
+--- runtime/nsd_ossl.c.orig 2025-09-05 13:46:02 UTC
+++ runtime/nsd_ossl.c
-@@ -798,7 +798,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd)
- if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl,szDbg, sizeof szDbg) != NULL)
- dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg);
+@@ -803,7 +803,7 @@ rsRetVal osslPostHandshakeCheck(nsd_ossl_t *pNsd) {
+ if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl, szDbg, sizeof szDbg) != NULL)
+ dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg);
-- #if OPENSSL_VERSION_NUMBER >= 0x10002000L
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- if(SSL_get_shared_curve(pNsd->pNetOssl->ssl, -1) == 0) {
- // This is not a failure
- LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: "
+ if (SSL_get_shared_curve(pNsd->pNetOssl->ssl, -1) == 0) {
+ // This is not a failure
+ LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO,