update to 3.34
enable SCL (syslog-ng configuration library) support from Peter Czanik, with some tweaks
This commit is contained in:
parent
362bf3068f
commit
7c6d15fe02
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.72 2021/06/09 18:54:01 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.73 2021/11/13 09:55:42 steven Exp $
|
||||
|
||||
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>
|
||||
@ -21,15 +20,15 @@ WANTLIB += ssl z
|
||||
|
||||
MASTER_SITES = https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
|
||||
|
||||
SHARED_LIBS = evtlog 3.0 \
|
||||
evtlog-3.32 3.0 \
|
||||
syslog-ng 6.0 \
|
||||
syslog-ng-3.32 6.0 \
|
||||
loggen_helper 1.0 \
|
||||
loggen_helper-3.32 1.0 \
|
||||
loggen_plugin 1.0 \
|
||||
loggen_plugin-3.32 1.0 \
|
||||
secret-storage 1.0
|
||||
SHARED_LIBS = evtlog 4.0 \
|
||||
evtlog-3.34 4.0 \
|
||||
syslog-ng 7.0 \
|
||||
syslog-ng-3.34 7.0 \
|
||||
loggen_helper 2.0 \
|
||||
loggen_helper-3.34 2.0 \
|
||||
loggen_plugin 2.0 \
|
||||
loggen_plugin-3.34 2.0 \
|
||||
secret-storage 2.0
|
||||
|
||||
# needs a newer compiler due to libmaxminddb header
|
||||
COMPILER = base-clang ports-gcc
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.13 2021/05/24 15:50:22 millert Exp $
|
||||
$OpenBSD: patch-Makefile_in,v 1.14 2021/11/13 09:55:42 steven Exp $
|
||||
- temporary hack until libtool is fixed.
|
||||
- avoid GNU tar-specific option
|
||||
|
||||
Index: Makefile.in
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -10001,11 +10001,7 @@ modules_test_subdirs = \
|
||||
@@ -10234,11 +10234,7 @@ modules_test_subdirs = \
|
||||
|
||||
syslog_ng_syslog_ng_SOURCES = syslog-ng/main.c
|
||||
|
||||
@ -18,7 +18,7 @@ Index: Makefile.in
|
||||
|
||||
syslog_ng_syslog_ng_LINK = @SYSLOGNG_LINK@
|
||||
syslog_ng_syslog_ng_DEPENDENCIES = lib/libsyslog-ng.la
|
||||
@@ -28362,7 +28358,7 @@ scl-install-data-local:
|
||||
@@ -28960,7 +28956,7 @@ scl-install-data-local:
|
||||
fi; \
|
||||
done
|
||||
$(mkinstalldirs) $(DESTDIR)/$(scldir)
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.26 2021/05/24 15:50:22 millert Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.27 2021/11/13 09:55:42 steven Exp $
|
||||
@conflict eventlog-*
|
||||
@pkgpath sysutils/eventlog
|
||||
@rcscript ${RCDIR}/syslog_ng
|
||||
@ -205,6 +205,9 @@ include/syslog-ng/signal-handler.h
|
||||
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/transforms.h
|
||||
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 @@ lib/syslog-ng/
|
||||
@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 @@ share/examples/syslog-ng/
|
||||
@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/
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user