diff options
Diffstat (limited to 'sysutils/rsyslog8')
| -rw-r--r-- | sysutils/rsyslog8/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/rsyslog8/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c | 10 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c | 10 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_net__ossl.c | 18 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 16 |
6 files changed, 15 insertions, 51 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index fe5d1acbb833..2c04586393fc 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,5 @@ PORTNAME= rsyslog -PORTVERSION= 8.2502.0 +PORTVERSION= 8.2508.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -13,7 +13,7 @@ LICENSE_COMB= multi LIB_DEPENDS= libestr.so:devel/libestr \ libfastjson.so:devel/libfastjson \ liblogging-rfc3195.so:devel/liblogging \ - libuuid.so:misc/e2fsprogs-libuuid \ + libuuid.so:misc/libuuid \ libcurl.so:ftp/curl BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index b0933afbd160..7939be646afb 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1740086065 -SHA256 (rsyslog-8.2502.0.tar.gz) = 02fa197d21d519f5a25a928deb9397cd387ba7382b9b449782ba31d8f3118206 -SIZE (rsyslog-8.2502.0.tar.gz) = 3470593 +TIMESTAMP = 1757077726 +SHA256 (rsyslog-8.2508.0.tar.gz) = c89b1e74d36d0ca4a95b74a1abe36ed0b1faac8b7c8be471a8415cfa776206fd +SIZE (rsyslog-8.2508.0.tar.gz) = 4344195 +SHA256 (72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch) = f3cb29a469e28678086a81906fe823045563f9132c0a6f97bf887eba7fd1d31d +SIZE (72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch) = 2585 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, |