From nobody Tue Oct 8 14:38:59 2024 X-Original-To: dev-commits-ports-all@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 4XNJYb2GKqz5ZTNW; Tue, 08 Oct 2024 14:38:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XNJYb1mRlz4mJh; Tue, 8 Oct 2024 14:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728398339; 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=yYeCn3Z2zbcSUOj4PwFeBRQaPrLUQ9bSQ42Kbatu9ns=; b=T1oxCqNeXDYS2MaqR3GvDVSpphKX+eClwJUeJ+NKIncOc0Tv1nqHbxWLdQZUFZGQghe5LH U/i3siOZKyeVoifOKkgWDhyxfesBj9IM5K92IuvXDD9Rxom/RXc7o5eIzKnBEJjVXk1rUm zgZp/YN3YTRhytLtq4O7ddKIfsYBINj94maTNzCNf3HqYOeA2jARkqRbCGLX51rlnK/PWe waBvfMe1WlBNpQzj7zAKarB9nn0vsh54hZsjWq35/qDAFuhUo+vKX4Ig8Hv+dOjaV50kbf bka7djY7X4LB5kW6gMFxzyP4mwKMzvG68roT5T+mdHUEQrZDqXASLEBalp7mSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728398339; 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=yYeCn3Z2zbcSUOj4PwFeBRQaPrLUQ9bSQ42Kbatu9ns=; b=XoeYIRRyrrP9KUu1MmLIEKcPB7iNVw1/cUQdl2+kGAUv+wZYIrzdMTHU56/sz7GNFWWdHa Rrf0M51TyDJ8ir1ghRkALsfCcKAQdoNycVi59FS8IvLUI5/dEVl6LyJmn+HblsQLoveHGw gmX1orVaWHAqNwU67qyiIDc927VCntrxYcdRbraM4RhIEIBDNORII1MB8u5t1qxVV+l12T cE/9aKw5Tclreqfm2rLoJW3UlINVPVhqSIKIPR/1qijWLz+qSJjh4wU7iIis+lf91AnYrB 2VTO9dKpITr45jvP01iRiOjzEhtlFxhCLv9aggmp6FOZ0kO/TSYgDrs1XfgQ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728398339; a=rsa-sha256; cv=none; b=T8l1Li7aJ1QPq9FPMkElAtdqbF85l+ZUx7BWkA8I6BKqHSQZN7h9vyAIgS82wko2aM/7X6 ERj1Bekma5nKiYT4Xow/5a0Vah7FWCkhVzlR8goz2EC6bKqmN0xGzZaSUj5/1yykx1HwXw rr1ONIE0vkRQ6Y/2gbiQdUBbnpL0XwVZdtanz9lPLNkicr+Q5igv+4gpGnXvUT60ckE5vB bWmdAWdrz105PsUpYsfiRL3BBHy3KhlfwwjhLL5ARAGhW1/fZW4rIggeO7MjzDWlQIwbAL gT4f4uDF6CNrNu5eP6Uj8KDbe7SB/RnjkgwQyHeTBAzwx+6uGRqoO2wXTFujvA== 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 4XNJYb1MJyzZYq; Tue, 8 Oct 2024 14:38:59 +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 498Ecxpq017610; Tue, 8 Oct 2024 14:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 498EcxLO017607; Tue, 8 Oct 2024 14:38:59 GMT (envelope-from git) Date: Tue, 8 Oct 2024 14:38:59 GMT Message-Id: <202410081438.498EcxLO017607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 462d7cafddf1 - main - sysutils/syslog-ng: Update to 4.8.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 462d7cafddf1d0895473bed09365122bf191300e Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=462d7cafddf1d0895473bed09365122bf191300e commit 462d7cafddf1d0895473bed09365122bf191300e Author: Cy Schubert AuthorDate: 2024-10-08 14:32:39 +0000 Commit: Cy Schubert CommitDate: 2024-10-08 14:38:54 +0000 sysutils/syslog-ng: Update to 4.8.1 Updating to 4.8.1 brought in MQTT support. This broke packaging, requring the addition of an MQTT option. The patch in its entirety was provided by our upstream who maintains packaging for various Linux distros and FreeBSD. Submitted by: Peter Czanik (CzP) Balabit (a OneIdentity company) / syslog-ng upstream --- sysutils/syslog-ng/Makefile | 52 +++++++++++++++++++++++--------------------- sysutils/syslog-ng/distinfo | 6 ++--- sysutils/syslog-ng/pkg-plist | 8 ++++++- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ef53688b379b..54a8b9853297 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,6 +1,5 @@ PORTNAME= syslog-ng -DISTVERSION= 4.8.0 -PORTREVISION= 2 +DISTVERSION= 4.8.1 CATEGORIES= sysutils # official master site: MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ @@ -30,7 +29,7 @@ CONFLICTS?= syslog-ng syslog-ng[0-9] \ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST GRPC +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST GRPC MQTT OPTIONS_DEFAULT= CURL JSON TCP_WRAPPERS_DESC= Build with TCP Wrappers SQL_DESC= Build with database (libdbi) support @@ -49,6 +48,7 @@ RIEMANN_DESC= Build with Riemann support KAFKA_DESC= Build with Kafka (librdkafka) support SNMPDEST_DESC= Build with SNMP destination (net-snmp) support GRPC_DESC= Build with experimental GRPC-based modules (OpenTelemetry, Loki, etc.) +MQTT_DESC= Build with MQTT support USE_LDCONFIG= yes USE_RC_SUBR= syslog-ng @@ -169,7 +169,7 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ lib/syslog-ng/python/syslogng/__pycache__/persist%%PYTHON_EXT_SUFFIX%%.pyc \ lib/syslog-ng/python/syslogng/__pycache__/source%%PYTHON_EXT_SUFFIX%%.pyc \ lib/syslog-ng/python/syslogng/__pycache__/template%%PYTHON_EXT_SUFFIX%%.pyc \ - lib/syslog-ng/python/syslogng/__pycache__/reloc%%PYTHON_EXT_SUFFIX%%.pyc \ + lib/syslog-ng/python/syslogng/__pycache__/reloc%%PYTHON_EXT_SUFFIX%%.pyc \ lib/syslog-ng/python/syslogng/dest.py \ lib/syslog-ng/python/syslogng/logger.py \ lib/syslog-ng/python/syslogng/message.py \ @@ -177,7 +177,7 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ lib/syslog-ng/python/syslogng/persist.py \ lib/syslog-ng/python/syslogng/source.py \ lib/syslog-ng/python/syslogng/template.py \ - lib/syslog-ng/python/syslogng/reloc.py \ + lib/syslog-ng/python/syslogng/reloc.py \ lib/syslog-ng/python/syslogng/__init__.py \ lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \ lib/syslog-ng/python/syslogng/debuggercli/__init__.py \ @@ -186,9 +186,9 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \ lib/syslog-ng/python/syslogng/debuggercli/commandlinelexer.py \ lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \ - lib/syslog-ng/python/syslogng/debuggercli/completer.py \ + lib/syslog-ng/python/syslogng/debuggercli/completer.py \ lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \ - lib/syslog-ng/python/syslogng/debuggercli/completerlang.py \ + lib/syslog-ng/python/syslogng/debuggercli/completerlang.py \ lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \ lib/syslog-ng/python/syslogng/debuggercli/debuggercli.py \ lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \ @@ -232,15 +232,15 @@ PYTHON_MOD_PLIST_FILES= lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg- lib/syslog-ng/python/syslogng/modules/hypr/__init__.py \ lib/syslog-ng/python/syslogng/modules/hypr/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \ lib/syslog-ng/python/syslogng/modules/hypr/scl/hypr.conf \ - lib/syslog-ng/python/syslogng/modules/s3/__init__.py \ - lib/syslog-ng/python/syslogng/modules/s3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \ - lib/syslog-ng/python/syslogng/modules/s3/__pycache__/compressable_file_buffer%%PYTHON_EXT_SUFFIX%%.pyc \ - lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_destination%%PYTHON_EXT_SUFFIX%%.pyc \ - lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_object%%PYTHON_EXT_SUFFIX%%.pyc \ - lib/syslog-ng/python/syslogng/modules/s3/compressable_file_buffer.py \ - lib/syslog-ng/python/syslogng/modules/s3/s3_destination.py \ - lib/syslog-ng/python/syslogng/modules/s3/s3_object.py \ - lib/syslog-ng/python/syslogng/modules/s3/scl/s3.conf + lib/syslog-ng/python/syslogng/modules/s3/__init__.py \ + lib/syslog-ng/python/syslogng/modules/s3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \ + lib/syslog-ng/python/syslogng/modules/s3/__pycache__/compressable_file_buffer%%PYTHON_EXT_SUFFIX%%.pyc \ + lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_destination%%PYTHON_EXT_SUFFIX%%.pyc \ + lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_object%%PYTHON_EXT_SUFFIX%%.pyc \ + lib/syslog-ng/python/syslogng/modules/s3/compressable_file_buffer.py \ + lib/syslog-ng/python/syslogng/modules/s3/s3_destination.py \ + lib/syslog-ng/python/syslogng/modules/s3/s3_object.py \ + lib/syslog-ng/python/syslogng/modules/s3/scl/s3.conf CURL_CONFIGURE_OFF= --with-libcurl=off @@ -263,13 +263,19 @@ GRPC_CONFIGURE_ON= --enable-cpp GRPC_CONFIGURE_OFF= --disable-cpp GRPC_LIB_DEPENDS= libgrpc.so:devel/grpc GRPC_PLIST_FILES= lib/libgrpc-protos.so \ - lib/libgrpc-protos.so.0 \ - lib/libgrpc-protos.so.0.0.0 \ - lib/syslog-ng/libloki.so \ - lib/syslog-ng/libotel.so \ - lib/syslog-ng/libbigquery.so \ + lib/libgrpc-protos.so.0 \ + lib/libgrpc-protos.so.0.0.0 \ + lib/syslog-ng/libloki.so \ + lib/syslog-ng/libotel.so \ + lib/syslog-ng/libbigquery.so \ lib/syslog-ng/libcloud_auth.so +MQTT_CONFIGURE_ON= --enable-mqtt --with-libpaho-mqtt=${PREFIX} +MQTT_CONFIGURE_OFF= --disable-mqtt +MQTT_LIB_DEPENDS= libpaho-mqtt3cs.so:net/libpaho-mqtt3 +MQTT_PLIST_FILES= lib/syslog-ng/libmqtt.so + + .include @@ -277,10 +283,6 @@ GRPC_PLIST_FILES= lib/libgrpc-protos.so \ BROKEN= Default configuration does not currently support non-JSON builds .endif -.if ${PORT_OPTIONS:MJAVA_MOD} -BROKEN= Java modules do not build currently -.endif - post-patch: @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist touch -r ${WRKSRC}/lib/cfg-grammar.y ${WRKSRC}/lib/merge-grammar.py diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index 6c89f7067d24..bced22602d6a 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721745834 -SHA256 (syslog-ng-4.8.0.tar.gz) = f2035546af5fcc0c03a8d03f5f0e929ce19131a428d611c982a5fea608a5d9d6 -SIZE (syslog-ng-4.8.0.tar.gz) = 6934068 +TIMESTAMP = 1728033948 +SHA256 (syslog-ng-4.8.1.tar.gz) = e8b8b98c60a5b68b25e3462c4104c35d05b975e6778d38d8a81b8ff7c0e64c5b +SIZE (syslog-ng-4.8.1.tar.gz) = 6956412 diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index a5c159d0a728..6215673e9c77 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -54,6 +54,7 @@ include/syslog-ng/compat/time.h include/syslog-ng/compat/un.h include/syslog-ng/compat/cpp-end.h include/syslog-ng/compat/cpp-start.h +include/syslog-ng/compat/inttypes.h include/syslog-ng/control/control-commands.h include/syslog-ng/control/control-main.h include/syslog-ng/control/control-server.h @@ -158,7 +159,10 @@ include/syslog-ng/mainloop.h include/syslog-ng/memtrace.h include/syslog-ng/messages.h include/syslog-ng/metrics/label-template.h -include/syslog-ng/metrics/metrics-template.h +include/syslog-ng/metrics/dyn-metrics-cache.h +include/syslog-ng/metrics/dyn-metrics-store.h +include/syslog-ng/metrics/dyn-metrics-template.h +include/syslog-ng/metrics/metrics.h include/syslog-ng/misc.h include/syslog-ng/ml-batched-timer.h include/syslog-ng/module-config.h @@ -302,6 +306,7 @@ include/syslog-ng/multi-line/smart-multi-line.h include/syslog-ng/stats/stats-compat.h include/syslog-ng/on-error.h include/syslog-ng/compat/json.h +include/syslog-ng/cfg-helpers.h include/syslog-ng/filterx/expr-assign.h include/syslog-ng/filterx/expr-boolalg.h include/syslog-ng/filterx/expr-comparison.h @@ -418,6 +423,7 @@ share/syslog-ng/include/scl/default-network-drivers/plugin.conf share/syslog-ng/include/scl/discord/discord.conf share/syslog-ng/include/scl/elasticsearch/elastic-http.conf share/syslog-ng/include/scl/elasticsearch/elastic-java.conf +share/syslog-ng/include/scl/elasticsearch/elastic-datastream.conf share/syslog-ng/include/scl/ewmm/ewmm.conf share/syslog-ng/include/scl/fortigate/fortigate.conf share/syslog-ng/include/scl/graphite/README