From nobody Thu May 11 23:14:32 2023 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 4QHSQd1xZ3z4B9lJ; Thu, 11 May 2023 23:14:33 +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 4QHSQd0cKPz3FvW; Thu, 11 May 2023 23:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846873; 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=qqVo4JBlN+xVCaLV76ynOFbv8gwZ6t5M1GAuqY3k13Y=; b=TG9/vXsBr9QkEzdFJOmUcm8uG4xXxB5kY6+ExnYWNNzYfF9XGz7H7d4YmYoMufb0s1Bf+b sxz8fA7kEz/t78Qz55RYp9eVKupdfHEzVtOF1RjJfWL+qgWfMPNOaZ7ffYkEyqyv8Wdvl1 B6L2+6hpf05lGZTebsv71aI/07kiXEfj89XPgBd5CIDC4Yx2VSNreThWwy3kZOdLueKAjd WrDBdmvzzc22w9Xh93v3sMxxuHpteWODnkMQUVOq9DbmmuBiyQ6HnICRMNzy4cKyWa2FEK QZc5TN1K2hNMkAFzbrDJyAUyljOKIhj3rygeJKxFgLhogxEi5zjasMzGbepWrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846873; 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=qqVo4JBlN+xVCaLV76ynOFbv8gwZ6t5M1GAuqY3k13Y=; b=AMenJ37icRqSMv/UdRd7lUZpcaAdRZy9hNy7eO2bvBL4fl2CJaBVBK7+ag2Io1Api1ssdw KWVNEhOZOolUfpEXTs1JGKtbcmXtwA/qnpayD+Gof7qdErQenee0i4TFG8v9p39mbkHWb+ Vsak5zld+0SV1fcHWMwUGueqgDysUPsFdi11tmwtaAAy2u4IBqTc2ijrpl2YjGIPtt0/6t yFxsQvZ9Ix0eZXQy/qIToIpfl3R1zul6Hwy1A/t7YSmxrm3YTNpTRl7FzLV75PoaUcaAPv spJU0c0XMo9H9UrPKjNyiQWW1xyvcUIclTDbvgW0Csd39KpuR81btCOJL9V53A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683846873; a=rsa-sha256; cv=none; b=yjuvsFxsoCwUP5to4kMlXwuVmSiyOgkZ+omSw6Tg/G5JUv2hSEOVewSmzHrxNjJ+ykT0fd ZDZZpaKf44d8L38hvM2dVigzrJ87sQzagq70M9r6bqQmtp5jwe/qrf9aZCy62MbLbG0GF8 mAJtRDjnJE6QQXZsIDDgnegZlFw8Efxe2+p4GQRPhTBq75GM8jNzpS74ykfTDV4iEzLCMT kluyzZAWDrki05twhx85n24GEXUsrVC/ooQxeHYL2cdxCJwHjCtXdwHPXKmT8x/iqS/kox KECwIAo/TfI6GFZA9Rkm+jSAFP1+6KWJu/06ibRSyZuxKfjxTIXBdSlW/pHceQ== 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 4QHSQc6pgRz1BV1; Thu, 11 May 2023 23:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34BNEWtc032042; Thu, 11 May 2023 23:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BNEWAt032041; Thu, 11 May 2023 23:14:32 GMT (envelope-from git) Date: Thu, 11 May 2023 23:14:32 GMT Message-Id: <202305112314.34BNEWAt032041@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: d47448c7fc0c - main - sysutils/syslog-ng: Update to 4.2.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: 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d47448c7fc0cb5808819d5ac1c94bfe3a3e8268f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d47448c7fc0cb5808819d5ac1c94bfe3a3e8268f commit d47448c7fc0cb5808819d5ac1c94bfe3a3e8268f Author: Cy Schubert AuthorDate: 2023-05-11 23:12:21 +0000 Commit: Cy Schubert CommitDate: 2023-05-11 23:12:21 +0000 sysutils/syslog-ng: Update to 4.2.0 Patch was created and tested by our upstream Balabit representative Peter Czanik. Submitted by: Peter Czanik (CzP) Balabit (a OneIdentity company) / syslog-ng upstream --- sysutils/syslog-ng/Makefile | 12 ++++++----- sysutils/syslog-ng/distinfo | 6 +++--- sysutils/syslog-ng/files/syslog-ng.conf.sample | 2 +- sysutils/syslog-ng/pkg-plist | 28 ++++++++++++++++++-------- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 8b5fb0ac6303..fabab3d4e6b1 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,9 +1,9 @@ PORTNAME= syslog-ng -DISTVERSION= 4.1.1 +DISTVERSION= 4.2.0 CATEGORIES= sysutils -# using a self generated release tgz as upstream 4.0.1 tgz is broken on FreeBSD -# see: https://github.com/syslog-ng/syslog-ng/issues/4275 +# official master site: MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ +# for development snapshots: # MASTER_SITES= https://peter.czanik.hu/freebsd/ MAINTAINER= cy@FreeBSD.org @@ -54,7 +54,6 @@ SHEBANG_FILES= lib/merge-grammar.py GNU_CONFIGURE= yes # Note: Even if PYTHON is deselected, glib20 will install python. USE_GNOME= glib20 -# USE_PYTHON= allflavors SUB_FILES= pkg-message INSTALL_TARGET= install-strip @@ -148,8 +147,8 @@ JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-api-2.17.2.jar \ lib/syslog-ng/java-modules/http.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar -PYTHON_USES= python:3.5+ PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +PYTHON_USES= python:3.5+ PYTHON_CONFIGURE_ON= --enable-python PYTHON_CONFIGURE_OFF= --disable-python PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ @@ -178,6 +177,9 @@ PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \ lib/syslog-ng/python/syslogng/modules/example/__init__.py \ lib/syslog-ng/python/syslogng/modules/example/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \ lib/syslog-ng/python/syslogng/modules/example/scl/example.conf \ + 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/parser.py \ lib/syslog-ng/python/syslogng/persist.py \ lib/syslog-ng/python/syslogng/source.py \ diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo index a09ef74e3fa7..1206123a311e 100644 --- a/sysutils/syslog-ng/distinfo +++ b/sysutils/syslog-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678471064 -SHA256 (syslog-ng-4.1.1.tar.gz) = d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e -SIZE (syslog-ng-4.1.1.tar.gz) = 5556174 +TIMESTAMP = 1683789671 +SHA256 (syslog-ng-4.2.0.tar.gz) = 092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda +SIZE (syslog-ng-4.2.0.tar.gz) = 5763000 diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample index 9eab94704515..17d3ab40c1d0 100644 --- a/sysutils/syslog-ng/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample @@ -1,4 +1,4 @@ -@version:4.1 +@version:4.2 @include "scl.conf" # diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist index 203f2e196b5f..af3ecaddda61 100644 --- a/sysutils/syslog-ng/pkg-plist +++ b/sysutils/syslog-ng/pkg-plist @@ -291,20 +291,31 @@ include/syslog-ng/versioning.h include/syslog-ng/window-size-counter.h include/syslog-ng/mainloop-threaded-worker.h include/syslog-ng/metrics-pipe.h -lib/libevtlog-4.1.so.0 -lib/libevtlog-4.1.so.0.0.0 +include/syslog-ng/cfg-persist.h +include/syslog-ng/healthcheck/healthcheck-control.h +include/syslog-ng/healthcheck/healthcheck-stats.h +include/syslog-ng/healthcheck/healthcheck.h +include/syslog-ng/healthcheck/stopwatch.h +include/syslog-ng/stats/stats-cluster-key-builder.h +include/syslog-ng/cfg-monitor.h +include/syslog-ng/multi-line/multi-line-pattern.h +include/syslog-ng/multi-line/smart-multi-line.h +include/syslog-ng/stats/stats-compat.h +share/syslog-ng/smart-multi-line.fsm +lib/libevtlog-4.2.so.0 +lib/libevtlog-4.2.so.0.0.0 lib/libevtlog.so -lib/libloggen_helper-4.1.so.0 -lib/libloggen_helper-4.1.so.0.0.0 +lib/libloggen_helper-4.2.so.0 +lib/libloggen_helper-4.2.so.0.0.0 lib/libloggen_helper.so -lib/libloggen_plugin-4.1.so.0 -lib/libloggen_plugin-4.1.so.0.0.0 +lib/libloggen_plugin-4.2.so.0 +lib/libloggen_plugin-4.2.so.0.0.0 lib/libloggen_plugin.so lib/libsecret-storage.so lib/libsecret-storage.so.0 lib/libsecret-storage.so.0.0.0 -lib/libsyslog-ng-4.1.so.0 -lib/libsyslog-ng-4.1.so.0.0.0 +lib/libsyslog-ng-4.2.so.0 +lib/libsyslog-ng-4.2.so.0.0.0 lib/libsyslog-ng-native-connector.a lib/libsyslog-ng.so lib/syslog-ng/libadd-contextual-data.so @@ -406,6 +417,7 @@ share/syslog-ng/include/scl/websense/plugin.conf share/syslog-ng/include/scl/windowseventlog/plugin.conf share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml share/syslog-ng/include/scl/mariadb/audit.conf +share/syslog-ng/include/scl/splunk/splunk.conf share/syslog-ng/tools/cfg-grammar.y share/syslog-ng/tools/lex-rules.am share/syslog-ng/tools/merge-grammar.py