diff options
Diffstat (limited to 'sysutils/rsyslog8')
| -rw-r--r-- | sysutils/rsyslog8/Makefile | 6 | ||||
| -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 | 12 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 4 |
6 files changed, 18 insertions, 32 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index e28485f11fac..b6af2312b2a5 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,6 @@ PORTNAME= rsyslog -PORTVERSION= 8.2504.0 +PORTVERSION= 8.2506.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -7,6 +8,9 @@ MAINTAINER= matthew@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS WWW= https://www.rsyslog.com/ +PATCH_SITES= https://github.com/rgerhards/${PORTNAME}/commit/ +PATCHFILES= 72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch:-p1 + LICENSE= GPLv3 LGPL3 APACHE20 LICENSE_COMB= multi diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index e6940d40aa99..02313e502df5 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1746644321 -SHA256 (rsyslog-8.2504.0.tar.gz) = 5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab -SIZE (rsyslog-8.2504.0.tar.gz) = 3468108 +TIMESTAMP = 1749886759 +SHA256 (rsyslog-8.2506.0.tar.gz) = 6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b +SIZE (rsyslog-8.2506.0.tar.gz) = 3484506 +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 index 22e76aeebaef..a16b3734ad98 100644 --- a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c +++ b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c @@ -1,18 +1,18 @@ ---- runtime/net_ossl.c.orig 2024-02-26 08:24:02 UTC +--- runtime/net_ossl.c.orig 2025-03-05 18:14:51 UTC +++ runtime/net_ossl.c -@@ -460,6 +460,7 @@ void net_ossl_lastOpenSSLErrorMsg - +@@ -514,6 +514,7 @@ void net_ossl_lastOpenSSLErrorMsg + #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) /* 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: +@@ -630,6 +631,7 @@ 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..cc4fbf8037d8 100644 --- a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c +++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c @@ -1,6 +1,6 @@ ---- runtime/nsd_ossl.c.orig 2024-02-26 08:24:02 UTC +--- runtime/nsd_ossl.c.orig 2025-06-10 09:49:19 UTC +++ runtime/nsd_ossl.c -@@ -798,7 +798,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) +@@ -854,7 +854,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); |