aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2023-03-10 17:00:00 +0000
committerCy Schubert <cy@FreeBSD.org>2023-03-11 03:44:50 +0000
commit643e6a9acd438ee9657fc440c796df4cb51e7b01 (patch)
treef5ff48e93e5a5da741bb4be45040651da7cbaca0
parent9b1ec8e9ffb47040ea0da88c5e8d3904264c0128 (diff)
downloadports-643e6a9acd438ee9657fc440c796df.tar.gz
ports-643e6a9acd438ee9657fc440c796df.zip
sysutils/syslog-ng: Update to 3.38.1
Patch was created and tested by our upstream representative Peter Czanik. Syslog-ng developers develop for and test on Linux. The Syslog-ng has been broken since 4.X. Peter Czanik, a Balabit employee, has been maintaining a separate syslog-ng repo for FreeBSD until his patches have been accepted by their development team. He will be using the repo pointed to by the port until the FreeBSD issues are resolved. Peter's extra effort is appreciated by the FreeBSD community. Submitted by: Peter Czanik (CzP) <peter.czanik@oneidentity.com> Balabit (a OneIdentity company) / syslog-ng upstream
-rw-r--r--sysutils/syslog-ng/Makefile38
-rw-r--r--sysutils/syslog-ng/distinfo6
-rw-r--r--sysutils/syslog-ng/files/syslog-ng.conf.sample2
-rw-r--r--sysutils/syslog-ng/pkg-plist35
4 files changed, 61 insertions, 20 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 0b96b3bb46b4..1575366f08ee 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,7 +1,10 @@
PORTNAME= syslog-ng
-DISTVERSION= 3.38.1
+DISTVERSION= 4.1.1
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
MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
+# MASTER_SITES= https://peter.czanik.hu/freebsd/
MAINTAINER= cy@FreeBSD.org
COMMENT= Powerful syslogd replacement
@@ -51,6 +54,7 @@ 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
@@ -58,7 +62,7 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --enable-manpages \
--disable-linux-caps \
--datadir=${PREFIX}/share/ \
- --with-python=${PYTHON_VER}
+ --with-python=${PYTHON_VER} --with-python-packages=none
CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
@@ -148,7 +152,35 @@ PYTHON_USES= python:3.5+
PYTHON_CONFIGURE_ON= --enable-python
PYTHON_CONFIGURE_OFF= --disable-python
PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so \
- lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info \
+ etc/python/README.md \
+ lib/syslog-ng/python/requirements.txt \
+ lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/requires.txt \
+ lib/syslog-ng/python/syslogng/__pycache__/confgen%%PYTHON_EXT_SUFFIX%%.pyc \
+ lib/syslog-ng/python/syslogng/confgen.py \
+ lib/syslog-ng/python/syslogng/modules/kubernetes/__init__.py \
+ lib/syslog-ng/python/syslogng/modules/kubernetes/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
+ lib/syslog-ng/python/syslogng/modules/kubernetes/scl/kubernetes.conf \
+ lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO \
+ lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt \
+ lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt \
+ lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/top_level.txt \
+ lib/syslog-ng/python/syslogng/__pycache__/dest%%PYTHON_EXT_SUFFIX%%.pyc \
+ lib/syslog-ng/python/syslogng/__pycache__/logger%%PYTHON_EXT_SUFFIX%%.pyc \
+ lib/syslog-ng/python/syslogng/__pycache__/message%%PYTHON_EXT_SUFFIX%%.pyc \
+ lib/syslog-ng/python/syslogng/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.pyc \
+ 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/dest.py \
+ lib/syslog-ng/python/syslogng/logger.py \
+ lib/syslog-ng/python/syslogng/message.py \
+ 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/parser.py \
+ 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/__init__.py \
lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
lib/syslog-ng/python/syslogng/debuggercli/__init__.py \
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index bd3fc44e643b..a09ef74e3fa7 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661790871
-SHA256 (syslog-ng-3.38.1.tar.gz) = 5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7
-SIZE (syslog-ng-3.38.1.tar.gz) = 5405048
+TIMESTAMP = 1678471064
+SHA256 (syslog-ng-4.1.1.tar.gz) = d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e
+SIZE (syslog-ng-4.1.1.tar.gz) = 5556174
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 1cac741f4ec2..9eab94704515 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,4 +1,4 @@
-@version:3.38
+@version:4.1
@include "scl.conf"
#
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index b518237524b9..203f2e196b5f 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -6,6 +6,7 @@ bin/slogencrypt
bin/slogkey
bin/slogverify
bin/update-patterndb
+bin/syslog-ng-update-virtualenv
@sample etc/scl.conf.sample
etc/syslog-ng.conf.dist
include/syslog-ng/ack-tracker/ack_tracker.h
@@ -140,11 +141,9 @@ include/syslog-ng/logproto/logproto-client.h
include/syslog-ng/logproto/logproto-dgram-server.h
include/syslog-ng/logproto/logproto-framed-client.h
include/syslog-ng/logproto/logproto-framed-server.h
-include/syslog-ng/logproto/logproto-indented-multiline-server.h
include/syslog-ng/logproto/logproto-multiline-server.h
include/syslog-ng/logproto/logproto-proxied-text-server.h
include/syslog-ng/logproto/logproto-record-server.h
-include/syslog-ng/logproto/logproto-regexp-multiline-server.h
include/syslog-ng/logproto/logproto-server.h
include/syslog-ng/logproto/logproto-text-client.h
include/syslog-ng/logproto/logproto-text-server.h
@@ -169,6 +168,10 @@ include/syslog-ng/ml-batched-timer.h
include/syslog-ng/module-config.h
include/syslog-ng/msg-format.h
include/syslog-ng/msg-stats.h
+include/syslog-ng/multi-line/indented-multi-line.h
+include/syslog-ng/multi-line/multi-line-factory.h
+include/syslog-ng/multi-line/multi-line-logic.h
+include/syslog-ng/multi-line/regexp-multi-line.h
include/syslog-ng/nondumpable-allocator.h
include/syslog-ng/parse-number.h
include/syslog-ng/parser/parser-expr-parser.h
@@ -226,6 +229,7 @@ include/syslog-ng/stats/stats-query-commands.h
include/syslog-ng/stats/stats-query.h
include/syslog-ng/stats/stats-registry.h
include/syslog-ng/stats/stats.h
+include/syslog-ng/stats/stats-prometheus.h
include/syslog-ng/str-format.h
include/syslog-ng/str-repr/decode.h
include/syslog-ng/str-repr/encode.h
@@ -258,7 +262,9 @@ include/syslog-ng/timeutils/zonecache.h
include/syslog-ng/timeutils/zonedb.h
include/syslog-ng/timeutils/zoneinfo.h
include/syslog-ng/tls-support.h
-include/syslog-ng/tlscontext.h
+include/syslog-ng/transport/tls-context.h
+include/syslog-ng/transport/tls-session.h
+include/syslog-ng/transport/tls-verifier.h
include/syslog-ng/transport/logtransport.h
include/syslog-ng/transport/multitransport.h
include/syslog-ng/transport/transport-aux-data.h
@@ -284,20 +290,21 @@ include/syslog-ng/value-pairs/value-pairs.h
include/syslog-ng/versioning.h
include/syslog-ng/window-size-counter.h
include/syslog-ng/mainloop-threaded-worker.h
-lib/libevtlog-3.38.so.0
-lib/libevtlog-3.38.so.0.0.0
+include/syslog-ng/metrics-pipe.h
+lib/libevtlog-4.1.so.0
+lib/libevtlog-4.1.so.0.0.0
lib/libevtlog.so
-lib/libloggen_helper-3.38.so.0
-lib/libloggen_helper-3.38.so.0.0.0
+lib/libloggen_helper-4.1.so.0
+lib/libloggen_helper-4.1.so.0.0.0
lib/libloggen_helper.so
-lib/libloggen_plugin-3.38.so.0
-lib/libloggen_plugin-3.38.so.0.0.0
+lib/libloggen_plugin-4.1.so.0
+lib/libloggen_plugin-4.1.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-3.38.so.0
-lib/libsyslog-ng-3.38.so.0.0.0
+lib/libsyslog-ng-4.1.so.0
+lib/libsyslog-ng-4.1.so.0.0.0
lib/libsyslog-ng-native-connector.a
lib/libsyslog-ng.so
lib/syslog-ng/libadd-contextual-data.so
@@ -313,7 +320,7 @@ lib/syslog-ng/libcef.so
lib/syslog-ng/libconfgen.so
lib/syslog-ng/libcryptofuncs.so
lib/syslog-ng/libcsvparser.so
-lib/syslog-ng/libdbparser.so
+lib/syslog-ng/libcorrelation.so
lib/syslog-ng/libdisk-buffer.so
lib/syslog-ng/libexamples.so
lib/syslog-ng/libgraphite.so
@@ -321,6 +328,7 @@ lib/syslog-ng/libhook-commands.so
lib/syslog-ng/libkvformat.so
lib/syslog-ng/liblinux-kmsg-format.so
lib/syslog-ng/libmap-value-pairs.so
+lib/syslog-ng/libmetrics-probe.so
lib/syslog-ng/libpseudofile.so
lib/syslog-ng/libregexp-parser.so
lib/syslog-ng/libsecure-logging.so
@@ -371,7 +379,6 @@ share/syslog-ng/include/scl/iptables/iptables.conf
share/syslog-ng/include/scl/junos/plugin.conf
share/syslog-ng/include/scl/kafka/kafka-java.conf
share/syslog-ng/include/scl/kafka/kafka.conf
-share/syslog-ng/include/scl/kubernetes/kubernetes.conf
share/syslog-ng/include/scl/linux-audit/linux-audit.conf
share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
share/syslog-ng/include/scl/loadbalancer/plugin.conf
@@ -383,6 +390,7 @@ share/syslog-ng/include/scl/nodejs/plugin.conf
share/syslog-ng/include/scl/osquery/plugin.conf
share/syslog-ng/include/scl/pacct/plugin.conf
share/syslog-ng/include/scl/paloalto/panos.conf
+share/syslog-ng/include/scl/python/python-modules.conf
share/syslog-ng/include/scl/rewrite/cc-mask.conf
share/syslog-ng/include/scl/slack/slack.conf
share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
@@ -407,6 +415,7 @@ share/syslog-ng/xsd/patterndb-2.xsd
share/syslog-ng/xsd/patterndb-3.xsd
share/syslog-ng/xsd/patterndb-4.xsd
share/syslog-ng/xsd/patterndb-5.xsd
+share/syslog-ng/xsd/patterndb-6.xsd
@sample etc/syslog-ng.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING