pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Update sysutils/syslog-ng* to 3.13.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/25425b1af9f4
branches: trunk
changeset: 372615:25425b1af9f4
user: fhajny <fhajny%pkgsrc.org@localhost>
date: Mon Dec 11 14:45:11 2017 +0000
description:
Update sysutils/syslog-ng* to 3.13.2.
- Remove separate sysutils/syslog-ng-json package, it is now a core
module/dependency.
3.13.2
Fixes
- Missing manpages from release tarball
- Package syslog-ng-mod-json is removed from
- Drop syslog-ng-abi virtual packages
3.13.1
Features
- Add app-parser() framework (automatic parsing of log messages)
- Support microseconds in Riemann destination
- Add osquery destination as an SCL plugin
- Add network load balancer destination
- Add possibility to only signal re-open of file handles (SIGUSR1)
- It is possible from now to limit the number of registered dynamic
counters
- Add $(binary) template function
- Add experimental transport for transferring messages in whole
between syslog-ng instances (EWMM)
- Docker based build and debian package generation
- Add auto-parse(yes/no) to app-paser(), system() and
default-network-drivers()
- Add Graylog2 destination and $(format-gelf) template function
Bugfixes
- Exit when a read fails on an included config file instead of
starting up with an empty configuration.
- Fix double free
- Add missing discarded counter to groupingby
- Fix a reference leak in Python destination
- Fix timezone issue in snmptrapd parser
- Fix potential crash in stdin driver
- Fix a crash when initializing new config fails for socket with
keep_alive off
- Fix filter evaluation in case of contexts with multiple elements
- Various grouping-by fixes
- Fix potential use after free around dns-cache during shutdown
- Fix access to indirect values within Java destination
- Fix a crash in affile
- Fix a memory leak
- Fix a crash when getent is used empty group
- Fix jvm-options()
- Fix a crash in Python language binding
- Fix a crash in afmongodb
- Fix a memory leak in afmongodb
- Fix name-to-GID calculation in the $(getent) template function
- Fix a crash when redis is configured without the command() option
- Fix a race condition in kv-parser()
Other changes
- Cleanup diskq related warning messages
- Provide tls block for tls options in amqp(), http(), riemann()
destination drivers
- It it possible from now to register blocks and generators as plugins
- Drop compatiblity with configurations below 3.0
- Do not change permissions of a file by default
- Allow source files to specify permissions locally
- Minor performance improvement
- The current config version can be queried with "--version"
- Increase the performance of kv-parser()
diffstat:
sysutils/syslog-ng-json/DESCR | 6 --
sysutils/syslog-ng-json/Makefile | 12 -----
sysutils/syslog-ng-json/PLIST | 2 -
sysutils/syslog-ng/Makefile | 8 +--
sysutils/syslog-ng/Makefile.common | 10 ++-
sysutils/syslog-ng/Makefile.module | 3 +-
sysutils/syslog-ng/PLIST | 16 ++++++-
sysutils/syslog-ng/distinfo | 13 ++---
sysutils/syslog-ng/patches/patch-modules_afstreams_afstreams.c | 16 ------
sysutils/syslog-ng/patches/patch-modules_getent_getent-protocols.c | 24 ----------
sysutils/syslog-ng/patches/patch-modules_getent_getent-services.c | 24 ----------
11 files changed, 30 insertions(+), 104 deletions(-)
diffs (296 lines):
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng-json/DESCR
--- a/sysutils/syslog-ng-json/DESCR Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Syslog-ng tries to fill the gaps original syslogd's were lacking:
- * powerful configurability
- * filtering based on message content
- * message integrity, message encryption
- * portability
- * better network forwarding
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng-json/Makefile
--- a/sysutils/syslog-ng-json/Makefile Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
-
-SYSLOG_MOD= json
-SYSLOG_MOD_TARGET= json-plugin
-COMMENT= Syslog-ng JSON module
-
-.include "../../sysutils/syslog-ng/Makefile.module"
-
-CONFIGURE_ARGS+= --with-jsonc=${BUILDLINK_PREFIX.jsonc}
-
-.include "../../textproc/json-c/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng-json/PLIST
--- a/sysutils/syslog-ng-json/PLIST Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
-lib/syslog-ng/libjson-plugin.la
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/Makefile
--- a/sysutils/syslog-ng/Makefile Mon Dec 11 13:37:43 2017 +0000
+++ b/sysutils/syslog-ng/Makefile Mon Dec 11 14:45:11 2017 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2017/08/31 12:53:50 fhajny Exp $
+# $NetBSD: Makefile,v 1.31 2017/12/11 14:45:11 fhajny Exp $
.include "../../sysutils/syslog-ng/Makefile.common"
CONFIGURE_ARGS+= --enable-ssl
CONFIGURE_ARGS+= --enable-stomp
CONFIGURE_ARGS+= --enable-tcp-wrapper
+CONFIGURE_ARGS+= --with-jsonc=system
CONFIGURE_ARGS.SunOS+= --enable-dynamic-linking
CONFIGURE_ARGS.SunOS+= --enable-sun-streams
@@ -12,9 +13,6 @@
.include "options.mk"
-PYTHON_VERSIONS_ACCEPTED= 27
-REPLACE_PYTHON+= lib/merge-grammar.py
-
BUILD_DEFS+= VARBASE
PKG_SYSCONFSUBDIR= syslog-ng
@@ -49,6 +47,6 @@
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin
-.include "../../lang/python/application.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/Makefile.common
--- a/sysutils/syslog-ng/Makefile.common Mon Dec 11 13:37:43 2017 +0000
+++ b/sysutils/syslog-ng/Makefile.common Mon Dec 11 14:45:11 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2017/10/02 15:16:27 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/12/11 14:45:11 fhajny Exp $
# used by sysutils/syslog-ng/Makefile
# used by sysutils/syslog-ng/Makefile.module
-DISTNAME= syslog-ng-3.12.1
+DISTNAME= syslog-ng-3.13.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=balabit/}
@@ -28,7 +28,6 @@
CONFIGURE_ARGS+= --disable-http
CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --disable-java
-CONFIGURE_ARGS+= --disable-json
CONFIGURE_ARGS+= --disable-mongodb
CONFIGURE_ARGS+= --disable-python
CONFIGURE_ARGS+= --disable-redis
@@ -41,7 +40,6 @@
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/syslog-ng
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-ivykis=${BUILDLINK_PREFIX.ivykis}
-CONFIGURE_ARGS+= --with-jsonc=no
CONFIGURE_ARGS+= --with-mongoc=no
CONFIGURE_ARGS+= --with-librabbitmq-client=no
CONFIGURE_ARGS+= --with-pidfile-dir=${VARBASE}/run
@@ -54,12 +52,16 @@
SUBST_FILES.unamepath= contrib/syslog2ng
SUBST_VARS.unamepath= UNAME
+PYTHON_VERSIONS_ACCEPTED= 27
+
REPLACE_AWK+= contrib/syslog2ng
+REPLACE_PYTHON+= lib/merge-grammar.py
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/ivykis/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/application.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/Makefile.module
--- a/sysutils/syslog-ng/Makefile.module Mon Dec 11 13:37:43 2017 +0000
+++ b/sysutils/syslog-ng/Makefile.module Mon Dec 11 14:45:11 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.module,v 1.3 2017/08/31 12:53:50 fhajny Exp $
+# $NetBSD: Makefile.module,v 1.4 2017/12/11 14:45:11 fhajny Exp $
# used by sysutils/py-syslog-ng/Makefile
# used by sysutils/syslog-ng-amqp/Makefile
# used by sysutils/syslog-ng-curl/Makefile
# used by sysutils/syslog-ng-geoip/Makefile
-# used by sysutils/syslog-ng-json/Makefile
# used by sysutils/syslog-ng-mongodb/Makefile
# used by sysutils/syslog-ng-redis/Makefile
# used by sysutils/syslog-ng-smtp/Makefile
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/PLIST
--- a/sysutils/syslog-ng/PLIST Mon Dec 11 13:37:43 2017 +0000
+++ b/sysutils/syslog-ng/PLIST Mon Dec 11 14:45:11 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2017/10/02 15:16:27 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/12/11 14:45:11 fhajny Exp $
bin/dqtool
bin/loggen
bin/pdbtool
@@ -13,6 +13,8 @@
include/syslog-ng/bookmark.h
include/syslog-ng/cache.h
include/syslog-ng/cfg-args.h
+include/syslog-ng/cfg-block-generator.h
+include/syslog-ng/cfg-block.h
include/syslog-ng/cfg-grammar.h
include/syslog-ng/cfg-lexer-subst.h
include/syslog-ng/cfg-lexer.h
@@ -21,6 +23,8 @@
include/syslog-ng/cfg.h
include/syslog-ng/children.h
include/syslog-ng/compat/compat.h
+include/syslog-ng/compat/getent-bb.h
+include/syslog-ng/compat/getent.h
include/syslog-ng/compat/getutent.h
include/syslog-ng/compat/glib.h
include/syslog-ng/compat/lfs.h
@@ -215,6 +219,7 @@
lib/syslog-ng/libafsocket.la
lib/syslog-ng/libafstomp.la
lib/syslog-ng/libafuser.la
+lib/syslog-ng/libappmodel.la
lib/syslog-ng/libbasicfuncs.la
lib/syslog-ng/libcef.la
lib/syslog-ng/libconfgen.la
@@ -224,6 +229,7 @@
lib/syslog-ng/libdbparser.la
lib/syslog-ng/libdisk-buffer.la
lib/syslog-ng/libgraphite.la
+lib/syslog-ng/libjson-plugin.la
lib/syslog-ng/libkvformat.la
lib/syslog-ng/liblinux-kmsg-format.la
lib/syslog-ng/libmap-value-pairs.la
@@ -247,13 +253,20 @@
share/examples/syslog-ng/syslog-ng.conf.RedHat
share/examples/syslog-ng/syslog-ng.conf.SunOS
share/syslog-ng/include/scl/apache/apache.conf
+share/syslog-ng/include/scl/cim/adapter.conf
share/syslog-ng/include/scl/cim/template.conf
share/syslog-ng/include/scl/cisco/plugin.conf
+share/syslog-ng/include/scl/default-network-drivers/plugin.conf
share/syslog-ng/include/scl/elasticsearch/plugin.conf
+share/syslog-ng/include/scl/ewmm/ewmm.conf
share/syslog-ng/include/scl/graphite/README
share/syslog-ng/include/scl/graphite/plugin.conf
+share/syslog-ng/include/scl/graylog2/plugin.conf
share/syslog-ng/include/scl/hdfs/plugin.conf
+share/syslog-ng/include/scl/iptables/iptables.conf
share/syslog-ng/include/scl/kafka/plugin.conf
+share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh
+share/syslog-ng/include/scl/loadbalancer/plugin.conf
share/syslog-ng/include/scl/loggly/loggly.conf
share/syslog-ng/include/scl/logmatic/logmatic.conf
share/syslog-ng/include/scl/mbox/mbox.conf
@@ -263,6 +276,7 @@
share/syslog-ng/include/scl/rewrite/cc-mask.conf
share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
share/syslog-ng/include/scl/solaris/plugin.conf
+share/syslog-ng/include/scl/sudo/sudo.conf
share/syslog-ng/include/scl/syslogconf/README
share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
share/syslog-ng/include/scl/syslogconf/plugin.conf
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/distinfo
--- a/sysutils/syslog-ng/distinfo Mon Dec 11 13:37:43 2017 +0000
+++ b/sysutils/syslog-ng/distinfo Mon Dec 11 14:45:11 2017 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.10 2017/10/02 15:16:27 fhajny Exp $
+$NetBSD: distinfo,v 1.11 2017/12/11 14:45:11 fhajny Exp $
-SHA1 (syslog-ng-3.12.1.tar.gz) = cc96df76ef2dd9b59a752463eca2a5370c9b3a23
-RMD160 (syslog-ng-3.12.1.tar.gz) = 84783e0bf8ec4ae5daa57867ac24bee7cc3fff28
-SHA512 (syslog-ng-3.12.1.tar.gz) = 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
-Size (syslog-ng-3.12.1.tar.gz) = 8905646 bytes
+SHA1 (syslog-ng-3.13.2.tar.gz) = 702a5ab2f5ef05d5852e3fe25f1354aab62ca576
+RMD160 (syslog-ng-3.13.2.tar.gz) = 8786e7b37be10383173b7846b3d9fb6d9da7cc33
+SHA512 (syslog-ng-3.13.2.tar.gz) = fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
+Size (syslog-ng-3.13.2.tar.gz) = 9047998 bytes
SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
SHA1 (patch-configure) = 2d8ef2285de44de016f44e51be47cd4c1178dfdb
-SHA1 (patch-modules_afstreams_afstreams.c) = f783ace8aa1b1f538f9753b3ff6505b9c7662106
-SHA1 (patch-modules_getent_getent-protocols.c) = 43f16088a5303b6d61a1a9342a3b4f076a87b96d
-SHA1 (patch-modules_getent_getent-services.c) = d8121893407f10e0fb0a38b766eb0360717604d1
SHA1 (patch-modules_system-source_system-source.c) = f51ed8d2e6d603744b3e6636eeb9c68382e5cda6
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/patches/patch-modules_afstreams_afstreams.c
--- a/sysutils/syslog-ng/patches/patch-modules_afstreams_afstreams.c Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-modules_afstreams_afstreams.c,v 1.1 2017/10/02 15:16:27 fhajny Exp $
-
-Fix a mistake in the upstream commit.
-
---- modules/afstreams/afstreams.c.orig 2017-09-20 19:02:23.000000000 +0000
-+++ modules/afstreams/afstreams.c
-@@ -275,7 +275,7 @@ afstreams_sd_new(gchar *filename, Global
- log_reader_options_defaults(&self->reader_options);
- self->reader_options.parse_options.flags |= LP_LOCAL;
- self->reader_options.parse_options.flags &= ~LP_EXPECT_HOSTNAME;
-- self->reader_options.stats_level = STATS_LEVEL1;
-- self->reader_options.stats_source = SCS_SUN_STREAMS;
-+ self->reader_options.super.stats_level = STATS_LEVEL1;
-+ self->reader_options.super.stats_source = SCS_SUN_STREAMS;
- return &self->super.super;
- }
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/patches/patch-modules_getent_getent-protocols.c
--- a/sysutils/syslog-ng/patches/patch-modules_getent_getent-protocols.c Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_getent_getent-protocols.c,v 1.1 2017/08/31 12:53:50 fhajny Exp $
-
-Different arg count on SunOS (at least).
-
---- modules/getent/getent-protocols.c.orig 2017-07-31 10:40:19.000000000 +0000
-+++ modules/getent/getent-protocols.c
-@@ -29,9 +29,17 @@ tf_getent_protocols(gchar *key, gchar *m
- char buf[4096];
-
- if ((is_num = parse_number(key, &d)) == TRUE)
-+#if defined(__sun)
-+ res = getprotobynumber_r((int) d, &proto, buf, sizeof(buf));
-+#else
- getprotobynumber_r((int) d, &proto, buf, sizeof(buf), &res);
-+#endif
- else
-+#if defined(__sun)
-+ res = getprotobyname_r(key, &proto, buf, sizeof(buf));
-+#else
- getprotobyname_r(key, &proto, buf, sizeof(buf), &res);
-+#endif
-
- if (res == NULL)
- return TRUE;
diff -r d41f991ee506 -r 25425b1af9f4 sysutils/syslog-ng/patches/patch-modules_getent_getent-services.c
--- a/sysutils/syslog-ng/patches/patch-modules_getent_getent-services.c Mon Dec 11 13:37:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-modules_getent_getent-services.c,v 1.1 2017/08/31 12:53:50 fhajny Exp $
-
-Different arg count on SunOS (at least).
-
---- modules/getent/getent-services.c.orig 2017-07-31 10:40:19.000000000 +0000
-+++ modules/getent/getent-services.c
-@@ -29,9 +29,17 @@ tf_getent_services(gchar *key, gchar *me
- char buf[4096];
-
- if ((is_num = parse_number(key, &d)) == TRUE)
-+#if defined(__sun)
-+ res = getservbyport_r((int)ntohs(d), NULL, &serv, buf, sizeof(buf));
-+#else
- getservbyport_r((int)ntohs(d), NULL, &serv, buf, sizeof(buf), &res);
-+#endif
- else
-+#if defined(__sun)
-+ res = getservbyname_r(key, NULL, &serv, buf, sizeof(buf));
-+#else
- getservbyname_r(key, NULL, &serv, buf, sizeof(buf), &res);
-+#endif
-
- if (res == NULL)
- return TRUE;
Home |
Main Index |
Thread Index |
Old Index