From nobody Sun Mar 31 22:36:06 2024 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 4V78BH1WkGz5GZqc; Sun, 31 Mar 2024 22:36:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V78BH1460z4s68; Sun, 31 Mar 2024 22:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711924567; 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=ZBxY5/IkncPRjcB49G4h5F5bfnuK8LBmjpzXLlPiqCs=; b=QSwKtNk/2RhADCf5gkqU1aRbZRLIKrgCV4ycm3twcpDeQkyllJ68Ue0ZYqeYvQIrY5Hsal 1MrWSOXJI8Mg22JKGN+IUrJ49j7daainkmqjzMMP5FPidTQue6TLllFyHPELiLQJ9G8bxb oUX7eWX/YJ3WN34EzXb+gL/1PITHWR4p3GcbIv/eFaxyKw59hBF4wTRmj1VDLDY1lSNYag QSa4QvLOCV85hAaLLjHgz++I2bTYbOjGzdc6dDdV/TgLczhol1PHaPqtpci9ngWW0VQ45t dmDGcqbVDJAD0MXxW7jaBOstEs8uHCkflG3+UyTRasa2A+aJXN18YHenwfLOAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711924567; a=rsa-sha256; cv=none; b=xh3jBn2eNvU+v54Uhoyf09a4V4N+75/yiTwjlODg/Eb86ZtTZWHoFDL0QQdcJ/J7LSozMB mlSc/W9VFEghgWCtEErw/JnjSQJtHIgy602CyKIIfde0wFcjxiC0mP9zUGcklwqpYOKRlA b3b4A3hOrwpjF/X3pLVxddupGHtWq7KdQq8VgA+XeZ8YVlPdHWO60BgHQcXbjgGXFTLuUU yHppPVqJ0wbbP+H+j3eZ1jygAm9XTJNegkhHuzOmaoZB5foIq03bBvBD9noOx2WRh3AehJ AS5benWgQEOnZtjxGGABXdXVLoH0a3OJnKNzAM2wmeQYyoescJo6zhxvGAezsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711924567; 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=ZBxY5/IkncPRjcB49G4h5F5bfnuK8LBmjpzXLlPiqCs=; b=DuOUWky6Ts3T1J+OOJ/MI2hv0ZKeh63xFEVoHrUoS59EJm00kM/vG0s8q/ERNprSM5NzUj v2+nY4bUI8riJ500rk6NPoiQmzooh0AJvtDZl55cQ1MJgr3MoxOxydGKD0ZP21EgC07m0f 0qnMDF4teqn/7NkX/vd1e4vOgscDgrjLIa7feFZ2pdgNdVuht3dp9QI2Qq+aRmqaTh3On3 gQMZKeAa/4+u0eEl/jDHkC8J+hKfuwZi+Eg/AaIZCX1dEMErQWN8V0EZ8YTi91XQVzbmgx wjcR+/9Hws2Ool0e60iu+bN4T00KtH8whO4/u9W0IAAca80McNOFLNRJYfYSlA== 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 4V78BH0gZTzwRV; Sun, 31 Mar 2024 22:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42VMa6uI022376; Sun, 31 Mar 2024 22:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42VMa60F022373; Sun, 31 Mar 2024 22:36:06 GMT (envelope-from git) Date: Sun, 31 Mar 2024 22:36:06 GMT Message-Id: <202403312236.42VMa60F022373@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: 04edb069f969 - main - sysutils/rsyslog8: fix build with libressl, add DTLS option 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 04edb069f969257247955cca1d9eefd2b359e2c7 Auto-Submitted: auto-generated The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=04edb069f969257247955cca1d9eefd2b359e2c7 commit 04edb069f969257247955cca1d9eefd2b359e2c7 Author: Matthew Seaman AuthorDate: 2024-03-31 22:18:21 +0000 Commit: Matthew Seaman CommitDate: 2024-03-31 22:36:04 +0000 sysutils/rsyslog8: fix build with libressl, add DTLS option rsyslog8 fails to build with libressl due to lack of support of the SSL_CONF_CTX type. This occurs in a block of code only used by the DTLS input and output modules, which are not enabled by default in the FreeBSD port. Therefore solve the build failure by making the problematic function dependant on LIBRESSL_VERSION_NUMBER being defined (via files/patch-runtime_net__ossl.c, obtained from github issue 5342 for rsyslog). This is similar to previous libressl compatability fixes from PR 254864. While here, add a DTLS option to enable building the imdtls and omdtls modules -- this does require linkage against openssl to compile successfully. Additionally required patches are to add the necessary header files for the pthread_kill(3) and close(2) prototypes. I have not been able to test the functionality of the DTLS modules very effectively and would be glad to hear of anyone's experiences with them. PR: 278018 Reported by: Dave Hayes Obtained from: (partly) https://github.com/rsyslog/rsyslog/issues/5342 --- sysutils/rsyslog8/Makefile | 8 +++++++- sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c | 10 ++++++++++ sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c | 10 ++++++++++ sysutils/rsyslog8/files/patch-runtime_net__ossl.c | 18 ++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index b0b93fe0daa4..40dfc8a7c457 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,6 @@ PORTNAME= rsyslog PORTVERSION= 8.2402.0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -21,7 +22,7 @@ USES= cpe libtool pkgconfig autoreconf python:env PORTSCOUT= limit:^8\. -OPTIONS_DEFINE= DBI DOCS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \ +OPTIONS_DEFINE= DBI DOCS DTLS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \ MYSQL NORMALIZE PGSQL RABBITMQ RELP SNMP OPTIONS_RADIO= SSLLIB OPTIONS_RADIO_SSLLIB= GNUTLS OPENSSL @@ -33,6 +34,11 @@ DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_ENABLE= libdbi DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so +DTLS_DESC= DTLS input/output modules +DTLS_CONFIGURE_ENABLE= imdtls omdtls +DTLS_PLIST_FILES= lib/rsyslog/imdtls.so \ + lib/rsyslog/omdtls.so + ELASTIC_DESC= Elasticsearch module for rsyslog ELASTIC_CONFIGURE_ENABLE= elasticsearch ELASTIC_PLIST_FILES= lib/rsyslog/omelasticsearch.so diff --git a/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c b/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c new file mode 100644 index 000000000000..3d1f95b3447d --- /dev/null +++ b/sysutils/rsyslog8/files/patch-plugins_imdtls_imdtls.c @@ -0,0 +1,10 @@ +--- plugins/imdtls/imdtls.c.orig 2024-03-31 11:10:07 UTC ++++ plugins/imdtls/imdtls.c +@@ -23,6 +23,7 @@ + */ + #include "config.h" + ++#include + #include + #include + #include diff --git a/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c b/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c new file mode 100644 index 000000000000..cd4447416a9a --- /dev/null +++ b/sysutils/rsyslog8/files/patch-plugins_omdtls_omdtls.c @@ -0,0 +1,10 @@ +--- plugins/omdtls/omdtls.c.orig 2024-02-26 08:24:02 UTC ++++ plugins/omdtls/omdtls.c +@@ -43,6 +43,7 @@ + #endif + #include + #include ++#include + + // --- Include openssl headers as well + #include diff --git a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c new file mode 100644 index 000000000000..22e76aeebaef --- /dev/null +++ b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c @@ -0,0 +1,18 @@ +--- 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