From nobody Fri Sep 05 13:52:53 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cJHqB1jwCz67cVv; Fri, 05 Sep 2025 13:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJHqB19nhz3j3P; Fri, 05 Sep 2025 13:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757080374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzOIp34+SJv4Bl7oroeINMI0q2jsAH9pEDSjdtX56Oo=; b=gFuueSDkQ7DonjMbohgYfhvYxcmmqSaeyARYpuHMq0vz5ZX7X5awHX8UmpnQ0u6de4N0l7 II9lWNExo1yyCE6XYuZSwBEDF3BIRcVFo1xw5w9wwkCfVqCW6x9fPekgUeiQVHT/55A9/Z X5d2EBl2nT9N/ZvA+kawu/YHALsiUSv7D2QFVtDmPu4HJKjnF+qzejETzbis3wmqc7cA5u Ccyjc2h+Kgw7U+c9UN22aLcETNCtmqJcatEChP6PyYNRrc50O/x4FH5cBCyWOD7MP6guSJ G/aLn7SG+T8zUQriqY0ZVtNjkU77lRp7pH1kPphhtNhe8Pmd6d9yrtFoja4IYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757080374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GzOIp34+SJv4Bl7oroeINMI0q2jsAH9pEDSjdtX56Oo=; b=CwLDXkUNRTlhlGv382wyf7kvE28hXGOG9zNTWrHfa+NRnxwDICgJskfw7Ge+i/DZv8mEhI qXSEuMXKvHTJ8hdQXRvpXF2kHW7XBvnGgrJqZ2cRVXpIPEk3uhoI2fWUc1E7QWiuiEyPnB Et6Piqn2xeqT7Lph2onVXw2dmv6nI2+aIytf8cAYJgcYhphXn6fZh3jCTg3wNk+DcdOgV6 XertOkPfNsk61MYm35FUquYCqNdVEjYUNl0eQqMM4gIt9P2/C9SAozUVQ+4egR6/3WAZNE zT5XQHi18njhhJ01uBTifIxOL9bRJz78eMF/r321NNEtFec2hvr9pDwDoFC2DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757080374; a=rsa-sha256; cv=none; b=pkD6vZhf3AY+IdmGdornnr+mH6whfZY4lnWjvELjTKheBw6wFurn1nSES15noxqhEQwBez drT79yiIwOQ3l7FLbASbYgfEfAI1XKJemUn1FET8DF9yLJH7MeWvKjc8RdvHfSC9+VReKK ZRSqs+ZeydALX7Tn3VAxjmhDAQq9fDGzE8zHPU1fyhYgKJKguNZmFkxK+yj6a5iBBYaXHR HmGWHPcMWPTYYqapVrK8anOpfwDonlYxA66iAo3j2wb2BTrTQhuHi4mlRJoaeDoxuxMCou w6ul4Q3thmrAemfXyGbDbEqOQUOsUva8krkSnv3Md4+1d4p23pKqcYTGJEHLDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cJHqB0Bqxzrt7; Fri, 05 Sep 2025 13:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585Dqr8h049645; Fri, 5 Sep 2025 13:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585DqrAk049642; Fri, 5 Sep 2025 13:52:53 GMT (envelope-from git) Date: Fri, 5 Sep 2025 13:52:53 GMT Message-Id: <202509051352.585DqrAk049642@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 8992e2f3e2af - main - sysutils/rsyslog8: update to 8.2508.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8992e2f3e2af6d032214f8ce46d22fb5f4108128 Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=8992e2f3e2af6d032214f8ce46d22fb5f4108128 commit 8992e2f3e2af6d032214f8ce46d22fb5f4108128 Author: Matthew Seaman AuthorDate: 2025-09-05 13:50:13 +0000 Commit: Matthew Seaman CommitDate: 2025-09-05 13:52:49 +0000 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 --- sysutils/rsyslog8/Makefile | 6 +----- sysutils/rsyslog8/distinfo | 6 +++--- sysutils/rsyslog8/files/patch-runtime_net__ossl.c | 18 ------------------ sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 16 ++++++++-------- 4 files changed, 12 insertions(+), 34 deletions(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 1bf063135d65..2c04586393fc 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -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 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,