Update sysutils/syslog-ng to 3.12.1.

# Features

- HDFS: support macro in filename
- HDFS: add append support
- Java: allow to use sequence numbers in templates
- TLS improvements
    - Add PKCS 12 support with the new `pkcs12-file()` TLS option
    - startup time `ssl-options()` and `peer-verify()` check
    - startup time `key_file`, `cert_file`, `ca_dir`, `crl_dir` and
      `cipher_suite` check
    - ECDH  cipher support (OpenSSL 1.0.1, 1.0.2, 1.1.0) with the
      `ecdh-curve-list()` option (only available >= 1.0.2)
        - for < 1.0.2, a hard-coded curve is used
        - for >= 1.0.2, automatic curve selection is used (the
          `ecdh-curve-list()` option can restrict this list)
    - DH cipher support with the `dhparam-file()` option
        - if the option is not specified, fallback RFC 3526 parameters
          are used
    - minor fixes
- `stdin()` source driver
- Implement `read_old_records` option for systemd-journal source
- Add tags-parser: a new module to parse $TAGS values
- Add a Windows eventlog parser scl module
- Add XML parser module

# Bugfixes

- Fix cannot parse ipv6 into hostname
- Speedup add-contextual-data by making ordering optional
- Fix `monitor-method()` option not working for `wildcard-file()` source
- Sanitize SDATA keys in syslog-protocol messages to avoid generating
  non-valid messages
- Fix memory leaks reported using Valgrind
- Fix memory leak related to cloning pipes and reload
- Fix getent protocol number returns incorrect value
- Fix elasticsearch2 destination flush mechanism
- Fix file destination related memory leak
- Fix a possible memory leak around affile destination

# Other changes

- Improve syslog-ng debun functionality
- Java: allow to set JVM options form global syslog-ng options
- Do steps towards Python 3 support:
    - Fix string compatibility for Python 3
    - Improve Python version auto detection
- HTTP destination: display verbose logs on debug level
- Improvements for Solaris packing

sysutils/syslog-ng/Makefile.common

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2017/08/31 12:53:50 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.7 2017/10/02 15:16:27 fhajny Exp $
 # used by sysutils/syslog-ng/Makefile
 # used by sysutils/syslog-ng/Makefile.module
 
-DISTNAME=	syslog-ng-3.11.1
+DISTNAME=	syslog-ng-3.12.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=balabit/}
 

sysutils/syslog-ng/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/08/31 12:53:50 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/10/02 15:16:27 fhajny Exp $
 bin/dqtool
 bin/loggen
 bin/pdbtool
@@ -91,6 +91,7 @@ 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-record-server.h
 include/syslog-ng/logproto/logproto-regexp-multiline-server.h
 include/syslog-ng/logproto/logproto-server.h
@@ -188,7 +189,6 @@ include/syslog-ng/tls-support.h
 include/syslog-ng/tlscontext.h
 include/syslog-ng/transport/logtransport.h
 include/syslog-ng/transport/transport-aux-data.h
-include/syslog-ng/transport/transport-device.h
 include/syslog-ng/transport/transport-file.h
 include/syslog-ng/transport/transport-pipe.h
 include/syslog-ng/transport/transport-socket.h
@@ -233,8 +233,10 @@ lib/syslog-ng/libsnmptrapd-parser.la
 lib/syslog-ng/libstardate.la
 lib/syslog-ng/libsyslogformat.la
 lib/syslog-ng/libsystem-source.la
+lib/syslog-ng/libtags-parser.la
 lib/syslog-ng/libtest/libsyslog-ng-test.a
 lib/syslog-ng/libtfgetent.la
+lib/syslog-ng/libxml.la
 sbin/syslog-ng
 sbin/syslog-ng-ctl
 sbin/syslog-ng-debun
@@ -265,6 +267,8 @@ share/syslog-ng/include/scl/syslogconf/README
 share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
 share/syslog-ng/include/scl/syslogconf/plugin.conf
 share/syslog-ng/include/scl/system/plugin.conf
+share/syslog-ng/include/scl/windowseventlog/plugin.conf
+share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/merge-grammar.py

sysutils/syslog-ng/distinfo

@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2017/08/31 12:53:50 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2017/10/02 15:16:27 fhajny Exp $
 
-SHA1 (syslog-ng-3.11.1.tar.gz) = 81bb726c9823a3af9701a4297311e71f68050ccb
-RMD160 (syslog-ng-3.11.1.tar.gz) = 0a83af1872e993991ae19d14c6b73f0abbf2bc9a
-SHA512 (syslog-ng-3.11.1.tar.gz) = 780fa81daaf4cf327e2b8203e89dca6a8dcf51bf01a16eab672c536eae9e28bac6d5e19c46630806b6c7ea6f3fdcfb625e733be092a360897b234f46f9ae8c51
-Size (syslog-ng-3.11.1.tar.gz) = 8523684 bytes
+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 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
 SHA1 (patch-configure) = 2d8ef2285de44de016f44e51be47cd4c1178dfdb
-SHA1 (patch-lib_ivykis_src_iv__fd__port.c) = a6b1feafd7c8031a1ed7d2cb0abc57ca3633fb5a
+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

sysutils/syslog-ng/patches/patch-lib_ivykis_src_iv__fd__port.c

@@ -1,16 +0,0 @@
-$NetBSD: patch-lib_ivykis_src_iv__fd__port.c,v 1.1 2015/10/29 16:34:13 fhajny Exp $
-
-Need sys/poll.h on SunOS.
-
---- lib/ivykis/src/iv_fd_port.c.orig	2014-12-15 14:49:36.000000000 +0000
-+++ lib/ivykis/src/iv_fd_port.c
-@@ -23,6 +23,9 @@
- #include <fcntl.h>
- #include <port.h>
- #include <string.h>
-+#ifdef __sun
-+#include <sys/poll.h>
-+#endif
- #include "iv_private.h"
- #include "iv_fd_private.h"
- 

sysutils/syslog-ng/patches/patch-modules_afstreams_afstreams.c

@@ -0,0 +1,16 @@
+$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;
+ }