qiurui
/
freebsd-ports
mirror of https://git.FreeBSD.org/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sysutils/rsyslog8: update to 8.2508.0 

Delete files/patch-runtime_net__ossl.c and the additional patch
72b8bcc05318f0a72ec828d1a5329fa98c021eb8.patch from upstream: these
are both incorporated in this release.

Regenerate patches.

Changes:	https://github.com/rgerhards/rsyslog/blob/v8.2508.0/ChangeLog
Reported by:	repology
This commit is contained in:
Matthew Seaman 2025-09-05 14:50:13 +01:00
parent c34a9f743f
commit 8992e2f3e2
No known key found for this signature in database
GPG Key ID: A1F1BCBD112C170E
4 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/rsyslog8/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= rsyslog
PORTVERSION= 8.2506.0
PORTREVISION= 2
PORTVERSION= 8.2508.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
@ -8,9 +7,6 @@ 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

6
sysutils/rsyslog8/distinfo
View File

@ -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

18
sysutils/rsyslog8/files/patch-runtime_net__ossl.c
View File

@ -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

16
sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c
View File

@ -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,