diff options
Diffstat (limited to 'sysutils/rsyslog8')
| -rw-r--r-- | sysutils/rsyslog8/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/rsyslog8/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_net__ossl.c | 18 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 16 |
4 files changed, 13 insertions, 35 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index b6af2312b2a5..2c04586393fc 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,6 +1,5 @@ PORTNAME= rsyslog -PORTVERSION= 8.2506.0 -PORTREVISION= 1 +PORTVERSION= 8.2508.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -8,16 +7,13 @@ 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 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 02313e502df5..7939be646afb 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1749886759 -SHA256 (rsyslog-8.2506.0.tar.gz) = 6d6fd0257c95e756765d4d585a833d54dd3a0e5eeb8308b862a81b368a74bb7b -SIZE (rsyslog-8.2506.0.tar.gz) = 3484506 +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-runtime_net__ossl.c b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c deleted file mode 100644 index a16b3734ad98..000000000000 --- a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c +++ /dev/null @@ -1,18 +0,0 @@ ---- runtime/net_ossl.c.orig 2025-03-05 18:14:51 UTC -+++ runtime/net_ossl.c -@@ -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; -@@ -630,6 +631,7 @@ finalize_it: - } - RETiRet; - } -+#endif - - - diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c index cc4fbf8037d8..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 2025-06-10 09:49:19 UTC +--- runtime/nsd_ossl.c.orig 2025-09-05 13:46:02 UTC +++ runtime/nsd_ossl.c -@@ -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); +@@ -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, |