diff -ur syslog-ng.old/Makefile syslog-ng/Makefile
--- syslog-ng.old/Makefile Wed Jun 9 20:54:01 2021
+++ syslog-ng/Makefile Mon Oct 4 11:39:55 2021
@@ -2,10 +2,9 @@
COMMENT= log management solution
-V = 3.32.1
-REL = 3.32.1
+V = 3.34.1
+REL = 3.34.1
DISTNAME = syslog-ng-$V
-REVISION = 0
CATEGORIES = sysutils
MAINTAINER = Steven Mestdagh <steven@openbsd.org>
@@ -22,13 +21,13 @@
MASTER_SITES = https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
SHARED_LIBS = evtlog 3.0 \
- evtlog-3.32 3.0 \
+ evtlog-3.34 3.0 \
syslog-ng 6.0 \
- syslog-ng-3.32 6.0 \
+ syslog-ng-3.34 6.0 \
loggen_helper 1.0 \
- loggen_helper-3.32 1.0 \
+ loggen_helper-3.34 1.0 \
loggen_plugin 1.0 \
- loggen_plugin-3.32 1.0 \
+ loggen_plugin-3.34 1.0 \
secret-storage 1.0
# needs a newer compiler due to libmaxminddb header
diff -ur syslog-ng.old/distinfo syslog-ng/distinfo
--- syslog-ng.old/distinfo Mon May 24 17:50:22 2021
+++ syslog-ng/distinfo Fri Oct 1 08:51:39 2021
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.32.1.tar.gz) = GeO3ZVLYLHHAQjBSaSVALJ8F+l5uoZuRKwYYUJKbcS0=
-SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
+SHA256 (syslog-ng-3.34.1.tar.gz) = zs457BxoyI1JNwXgpSi4PQONo4TonUg4OTzMdfYqLUw=
+SIZE (syslog-ng-3.34.1.tar.gz) = 5903489
diff -ur syslog-ng.old/files/syslog-ng.conf syslog-ng/files/syslog-ng.conf
--- syslog-ng.old/files/syslog-ng.conf Mon May 24 17:50:22 2021
+++ syslog-ng/files/syslog-ng.conf Mon Oct 4 11:39:55 2021
@@ -1,8 +1,9 @@
# syslog-ng configuration file for OpenBSD.
# This should provide behavior similar to OpenBSD's syslog.conf(5).
-@version: 3.32
+@version: 3.34
@requires openbsd
+@include "scl.conf"
options {
use_dns(no);
diff -ur syslog-ng.old/pkg/PLIST syslog-ng/pkg/PLIST
--- syslog-ng.old/pkg/PLIST Mon May 24 17:50:22 2021
+++ syslog-ng/pkg/PLIST Mon Oct 4 11:39:55 2021
@@ -205,6 +205,9 @@
include/syslog-ng/signal-slot-connector/
include/syslog-ng/signal-slot-connector/signal-slot-connector.h
include/syslog-ng/stats/
+include/syslog-ng/stats/aggregator/
+include/syslog-ng/stats/aggregator/stats-aggregator-registry.h
+include/syslog-ng/stats/aggregator/stats-aggregator.h
include/syslog-ng/stats/stats-cluster-logpipe.h
include/syslog-ng/stats/stats-cluster-single.h
include/syslog-ng/stats/stats-cluster.h
@@ -278,22 +281,22 @@
include/syslog-ng/value-pairs/value-pairs.h
include/syslog-ng/versioning.h
include/syslog-ng/window-size-counter.h
-@lib lib/libevtlog-3.32.so.${LIBevtlog-3.32_VERSION}
+@lib lib/libevtlog-3.34.so.${LIBevtlog-3.34_VERSION}
@static-lib lib/libevtlog.a
lib/libevtlog.la
@lib lib/libevtlog.so.${LIBevtlog_VERSION}
-@lib lib/libloggen_helper-3.32.so.${LIBloggen_helper-3.32_VERSION}
+@lib lib/libloggen_helper-3.34.so.${LIBloggen_helper-3.34_VERSION}
@static-lib lib/libloggen_helper.a
lib/libloggen_helper.la
@lib lib/libloggen_helper.so.${LIBloggen_helper_VERSION}
-@lib lib/libloggen_plugin-3.32.so.${LIBloggen_plugin-3.32_VERSION}
+@lib lib/libloggen_plugin-3.34.so.${LIBloggen_plugin-3.34_VERSION}
@static-lib lib/libloggen_plugin.a
lib/libloggen_plugin.la
@lib lib/libloggen_plugin.so.${LIBloggen_plugin_VERSION}
@static-lib lib/libsecret-storage.a
lib/libsecret-storage.la
@lib lib/libsecret-storage.so.${LIBsecret-storage_VERSION}
-@lib lib/libsyslog-ng-3.32.so.${LIBsyslog-ng-3.32_VERSION}
+@lib lib/libsyslog-ng-3.34.so.${LIBsyslog-ng-3.34_VERSION}
@static-lib lib/libsyslog-ng-native-connector.a
@static-lib lib/libsyslog-ng.a
lib/libsyslog-ng.la
@@ -327,6 +330,7 @@
@so lib/syslog-ng/libmap-value-pairs.so
@so lib/syslog-ng/libopenbsd.so
@so lib/syslog-ng/libpseudofile.so
+@so lib/syslog-ng/libregexp-parser.so
@so lib/syslog-ng/libsecure-logging.so
@so lib/syslog-ng/libstardate.so
@so lib/syslog-ng/libsyslogformat.so
@@ -361,6 +365,7 @@
@sample ${SYSCONFDIR}/
share/examples/syslog-ng/patterndb.d/
share/examples/syslog-ng/scl.conf
+@sample ${SYSCONFDIR}/scl.conf
share/examples/syslog-ng/syslog-ng.conf
share/examples/syslog-ng/syslog-ng.conf.openbsd
@sample ${SYSCONFDIR}/syslog-ng.conf
@@ -382,6 +387,8 @@
share/syslog-ng/include/scl/collectd/plugin.conf
share/syslog-ng/include/scl/default-network-drivers/
share/syslog-ng/include/scl/default-network-drivers/plugin.conf
+share/syslog-ng/include/scl/discord/
+share/syslog-ng/include/scl/discord/discord.conf
share/syslog-ng/include/scl/elasticsearch/
share/syslog-ng/include/scl/elasticsearch/elastic-http.conf
share/syslog-ng/include/scl/elasticsearch/elastic-java.conf
Hi,
Attached you will find a diff updating the syslog-ng port from 3.32 to 3.34. Along the way I also enabled SCL (syslog-ng configuration library) support, as many drivers in syslog-ng are actually configuration snippets, like the Elasticsearch or Telegram destinations are a wrapper around the http() destination, etc.
Thanks goes to Todd Miller, who helped me with some OpenBSD ports magic when I could not resolve something based on the documentation...
Let me know, if you need any help from syslog-ng upstream!
Peter
Peter Czanik (CzP) <peter.czanik@oneidentity.com>
Balabit (a OneIdentity company) / syslog-ng upstream
https://syslog-ng.com/community/
https://twitter.com/PCzanik
No comments:
Post a Comment