On Mon, 17 May 2021 13:36:42 -0600, "Todd C. Miller" wrote: > Newer versions of syslog-ng have an "openbsd" module that supports > sendsyslog() and /dev/klog. This makes it possible to use syslog-ng > as a replacement for the stock OpenBSD syslog daemon. > > I've also upstreamed some OpenBSD compilation fixes that landed in > version 3.32.1. As a result, we can drop all of our patches except > for a few minor tweaks to Makefile.in. I had a problem with our > libtool linking in the old libsyslog-ng version at build time if > an old package was installed. Removing a hack from Makefile.in > that wasn't using libtool for linking syslog-ng fixed that.
Updated diff that syncs the installed syslog-ng.conf with our current syslog.conf. - todd Index: sysutils/syslog-ng/Makefile =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v retrieving revision 1.70 diff -u -p -u -r1.70 Makefile --- sysutils/syslog-ng/Makefile 14 May 2021 20:49:05 -0000 1.70 +++ sysutils/syslog-ng/Makefile 16 May 2021 12:22:26 -0000 @@ -2,11 +2,10 @@ COMMENT= log management solution -V = 3.12.1 -REL = 3.12 +V = 3.32.1 +REL = 3.32.1 DISTNAME = syslog-ng-$V CATEGORIES = sysutils -REVISION = 9 MAINTAINER = Steven Mestdagh <ste...@openbsd.org> @@ -21,15 +20,21 @@ WANTLIB += ssl z MASTER_SITES = http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/ -SHARED_LIBS = evtlog 2.0 \ - evtlog-${REL} 2.0 \ - syslog-ng 5.0 \ - syslog-ng-${REL} 5.0 +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 # needs a newer compiler due to libmaxminddb header COMPILER = base-clang ports-gcc COMPILER_LANGS = c +BUILD_DEPENDS= devel/bison>=3.4.2 LIB_DEPENDS = devel/glib2 \ devel/json-c \ devel/libivykis \ @@ -58,12 +63,9 @@ CONFIGURE_ARGS += --disable-tcp-wrapper --enable-sql \ --enable-manpages -CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \ - OPENSSL_LIBS="-lssl -lcrypto" \ - LDFLAGS="-L${LOCALBASE}/lib" -# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc -CONFIGURE_ENV += JSON_C_CFLAGS="`pkg-config json-c --cflags`" \ - JSON_C_LIBS="`pkg-config json-c --libs`" +CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" + +YACC = bison -y USE_GMAKE = Yes Index: sysutils/syslog-ng/distinfo =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v retrieving revision 1.26 diff -u -p -u -r1.26 distinfo --- sysutils/syslog-ng/distinfo 10 Nov 2017 21:58:26 -0000 1.26 +++ sysutils/syslog-ng/distinfo 10 May 2021 14:39:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M= -SIZE (syslog-ng-3.12.1.tar.gz) = 8905646 +SHA256 (syslog-ng-3.32.1.tar.gz) = GeO3ZVLYLHHAQjBSaSVALJ8F+l5uoZuRKwYYUJKbcS0= +SIZE (syslog-ng-3.32.1.tar.gz) = 5782744 Index: sysutils/syslog-ng/files/syslog-ng.conf =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v retrieving revision 1.11 diff -u -p -u -r1.11 syslog-ng.conf --- sysutils/syslog-ng/files/syslog-ng.conf 10 Nov 2017 21:58:26 -0000 1.11 +++ sysutils/syslog-ng/files/syslog-ng.conf 17 May 2021 20:10:11 -0000 @@ -1,15 +1,18 @@ # syslog-ng configuration file for OpenBSD. # This should provide behavior similar to OpenBSD's syslog.conf(5). -@version: 3.12 +@version: 3.32 +@requires openbsd options { use_dns(no); + dns_cache(no); create_dirs(no); keep_hostname(yes); }; source s_local { + openbsd(); unix-dgram ("/dev/log"); internal(); }; @@ -27,7 +30,6 @@ destination d_daemon { file("/var/log/da destination d_xferlog { file("/var/log/xferlog" owner(root) group(wheel) perm(0640)); }; destination d_lpderrs { file("/var/log/lpd-errs" owner(root) group(wheel) perm(0640)); }; destination d_maillog { file("/var/log/maillog" owner(root) group(wheel) perm(0600)); }; -destination d_uucplog { file("/var/log/uucp" owner(uucp) group(dialer) perm(0660)); }; destination d_doaslog { file("/var/log/doas"); }; destination d_ttyall { usertty("*"); }; destination d_ttyroot { usertty("root"); }; @@ -64,9 +66,6 @@ filter f_lprdebug { filter f_mailinfo { level(info .. emerg) and facility(mail); }; -filter f_uucpinfo { - level(info .. emerg) and facility(uucp); -}; filter f_emerg { level(emerg); }; @@ -110,8 +109,8 @@ log { source(s_local); filter(f_mailinfo # as well as all authentication messages sent to root. #log { source(s_local); filter(f_to_root); destination(d_ttyroot); }; -# Everyone gets emergency messages. -log { source(s_local); filter(f_emerg); destination(d_ttyall); }; +# Uncomment if you want everyone to get emergency messages. +#log { source(s_local); filter(f_emerg); destination(d_ttyall); }; # Uncomment to log to a central host named "loghost". #log { source(s_local); filter(f_to_loghost); destination(d_loghost); }; Index: sysutils/syslog-ng/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v retrieving revision 1.12 diff -u -p -u -r1.12 patch-Makefile_in --- sysutils/syslog-ng/patches/patch-Makefile_in 30 Apr 2021 17:14:50 -0000 1.12 +++ sysutils/syslog-ng/patches/patch-Makefile_in 10 May 2021 14:48:30 -0000 @@ -1,38 +1,29 @@ -$OpenBSD: patch-Makefile_in,v 1.12 2021/04/30 17:14:50 millert Exp $ +$OpenBSD: patch-Makefile_in,v 1.11 2017/11/10 21:58:26 steven Exp $ - temporary hack until libtool is fixed. -- work around different getent API, adapted from -https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd +- avoid GNU tar-specific option Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -4183,7 +4183,9 @@ compatinclude_HEADERS = \ - lib/compat/string.h \ - lib/compat/time.h \ - lib/compat/openssl_support.h \ -- lib/compat/pcre.h -+ lib/compat/pcre.h \ -+ lib/compat/getent.h \ -+ lib/compat/getent-bb.h +@@ -10001,11 +10001,7 @@ modules_test_subdirs = \ - compat_sources = \ - lib/compat/getutent.c \ -@@ -4194,7 +4196,8 @@ compat_sources = \ - lib/compat/strcasestr.c \ - lib/compat/strtok_r.c \ - lib/compat/time.c \ -- lib/compat/openssl_support.c -+ lib/compat/openssl_support.c \ -+ lib/compat/getent.c + syslog_ng_syslog_ng_SOURCES = syslog-ng/main.c - lib_compat_tests_TESTS = \ - lib/compat/tests/test_strtok_r -@@ -7089,7 +7092,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo: \ - lib/str-repr/$(am__dirstamp) \ - lib/str-repr/$(DEPDIR)/$(am__dirstamp) - lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES) lib/$(am__dirstamp) -- $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS) -+ $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info 0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS) - modules/add-contextual-data/$(am__dirstamp): - @$(MKDIR_P) modules/add-contextual-data - @: > modules/add-contextual-data/$(am__dirstamp) +-# NOTE: we're referring to the syslog-ng lib directly instead of via +-# libtool, because in mixed mode libtool is not used for the final linking +-# phase. See the comment in the configure script for details. +-syslog_ng_syslog_ng_LDADD = -L${top_builddir}/lib/.libs \ +- -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ ++syslog_ng_syslog_ng_LDADD = $(top_builddir)/lib/libsyslog-ng.la + + syslog_ng_syslog_ng_LINK = @SYSLOGNG_LINK@ + syslog_ng_syslog_ng_DEPENDENCIES = lib/libsyslog-ng.la +@@ -28362,7 +28358,7 @@ scl-install-data-local: + fi; \ + done + $(mkinstalldirs) $(DESTDIR)/$(scldir) +- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) ++ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) + chmod -R u+rwX $(DESTDIR)/$(scldir) + + scl-uninstall-local: Index: sysutils/syslog-ng/patches/patch-configure =================================================================== RCS file: sysutils/syslog-ng/patches/patch-configure diff -N sysutils/syslog-ng/patches/patch-configure --- sysutils/syslog-ng/patches/patch-configure 14 May 2021 20:49:05 -0000 1.9 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-configure,v 1.9 2021/05/14 20:49:05 steven Exp $ -- avoid picking up libuuid - -Index: configure ---- configure.orig -+++ configure -@@ -17665,7 +17665,7 @@ fi - else - pkg_failed=untried - fi -- -+pkg_failed=yes - - - if test $pkg_failed = yes; then Index: sysutils/syslog-ng/patches/patch-lib_compat_getent-bb_h =================================================================== RCS file: sysutils/syslog-ng/patches/patch-lib_compat_getent-bb_h diff -N sysutils/syslog-ng/patches/patch-lib_compat_getent-bb_h --- sysutils/syslog-ng/patches/patch-lib_compat_getent-bb_h 10 Nov 2017 21:58:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,60 +0,0 @@ -$OpenBSD: patch-lib_compat_getent-bb_h,v 1.1 2017/11/10 21:58:26 steven Exp $ -work around different getent API, adapted from -https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd - -Index: lib/compat/getent-bb.h ---- lib/compat/getent-bb.h.orig -+++ lib/compat/getent-bb.h -@@ -0,0 +1,52 @@ -+/* -+ * Copyright (c) 2017 Balabit -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ * As an additional exemption you are allowed to compile & link against the -+ * OpenSSL libraries as published by the OpenSSL project. See the file -+ * COPYING for details. -+ * -+ */ -+ -+#ifndef GETENT_BB_H_INCLUDED -+#define GETENT_BB_H_INCLUDED -+ -+#if defined(sun) || defined(__sun) || defined(__OpenBSD__) -+ -+#include <sys/types.h> -+#include <grp.h> -+#include <pwd.h> -+#include <netdb.h> -+ -+int bb__getprotobynumber_r(int proto, -+ struct protoent *result_buf, char *buf, -+ size_t buflen, struct protoent **result); -+ -+int bb__getprotobyname_r(const char *name, -+ struct protoent *result_buf, char *buf, -+ size_t buflen, struct protoent **result); -+ -+int bb__getservbyport_r(int port, const char *proto, -+ struct servent *result_buf, char *buf, -+ size_t buflen, struct servent **result); -+ -+int bb__getservbyname_r(const char *name, const char *proto, -+ struct servent *result_buf, char *buf, -+ size_t buflen, struct servent **result); -+ -+#endif -+ -+#endif Index: sysutils/syslog-ng/patches/patch-lib_compat_getent_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-lib_compat_getent_c diff -N sysutils/syslog-ng/patches/patch-lib_compat_getent_c --- sysutils/syslog-ng/patches/patch-lib_compat_getent_c 10 Nov 2017 21:58:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,68 +0,0 @@ -$OpenBSD: patch-lib_compat_getent_c,v 1.1 2017/11/10 21:58:26 steven Exp $ -work around different getent API, adapted from -https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd - -Index: lib/compat/getent.c ---- lib/compat/getent.c.orig -+++ lib/compat/getent.c -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (c) 2017 Balabit -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ * As an additional exemption you are allowed to compile & link against the -+ * OpenSSL libraries as published by the OpenSSL project. See the file -+ * COPYING for details. -+ * -+ */ -+ -+#if defined(sun) || defined(__sun) || defined(__OpenBSD__) -+ -+#include "compat/getent-bb.h" -+#include <errno.h> -+ -+int bb__getprotobynumber_r(int proto, -+ struct protoent *result_buf, char *buf, -+ size_t buflen, struct protoent **result) -+{ -+ *result = getprotobynumber_r(proto, result_buf, buf, buflen); -+ return (*result ? NULL : errno); -+} -+ -+int bb__getprotobyname_r(const char *name, -+ struct protoent *result_buf, char *buf, -+ size_t buflen, struct protoent **result) -+{ -+ *result = getprotobyname_r(name, result_buf, buf, buflen); -+ return (*result ? NULL : errno); -+} -+ -+int bb__getservbyport_r(int port, const char *proto, -+ struct servent *result_buf, char *buf, -+ size_t buflen, struct servent **result) -+{ -+ *result = getservbyport_r(port, proto, result_buf, buf, buflen); -+ return (*result ? NULL : errno); -+} -+ -+int bb__getservbyname_r(const char *name, const char *proto, -+ struct servent *result_buf, char *buf, -+ size_t buflen, struct servent **result) -+{ -+ *result = getservbyname_r(name, proto, result_buf, buf, buflen); -+ return (*result ? NULL : errno); -+} -+#endif Index: sysutils/syslog-ng/patches/patch-lib_compat_getent_h =================================================================== RCS file: sysutils/syslog-ng/patches/patch-lib_compat_getent_h diff -N sysutils/syslog-ng/patches/patch-lib_compat_getent_h --- sysutils/syslog-ng/patches/patch-lib_compat_getent_h 10 Nov 2017 21:58:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -$OpenBSD: patch-lib_compat_getent_h,v 1.1 2017/11/10 21:58:26 steven Exp $ -work around different getent API, adapted from -https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd - -Index: lib/compat/getent.h ---- lib/compat/getent.h.orig -+++ lib/compat/getent.h -@@ -0,0 +1,42 @@ -+/* -+ * Copyright (c) 2017 Balabit -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ * As an additional exemption you are allowed to compile & link against the -+ * OpenSSL libraries as published by the OpenSSL project. See the file -+ * COPYING for details. -+ * -+ */ -+ -+#ifndef GETENT_COMPAT_H_INCLUDED -+#define GETENT_COMPAT_H_INCLUDED -+ -+#include <sys/types.h> -+#include <grp.h> -+#include <pwd.h> -+#include <netdb.h> -+ -+#if defined(sun) || defined(__sun) || defined(__OpenBSD__) -+ -+#define getprotobynumber_r bb__getprotobynumber_r -+#define getprotobyname_r bb__getprotobyname_r -+#define getservbyport_r bb__getservbyport_r -+#define getservbyname_r bb__getservbyname_r -+ -+#include "getent-bb.h" -+ -+#endif // Solaris -+#endif Index: sysutils/syslog-ng/patches/patch-libtest_mock-transport_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-libtest_mock-transport_c diff -N sysutils/syslog-ng/patches/patch-libtest_mock-transport_c --- sysutils/syslog-ng/patches/patch-libtest_mock-transport_c 8 Jun 2017 18:19:37 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-libtest_mock-transport_c,v 1.2 2017/06/08 18:19:37 steven Exp $ -get struct iovec ---- libtest/mock-transport.c.orig Wed Dec 21 15:57:44 2016 -+++ libtest/mock-transport.c Sun Feb 5 23:56:16 2017 -@@ -26,6 +26,7 @@ - #include "gsockaddr.h" - - #include <string.h> -+#include <sys/uio.h> - #include <errno.h> - - typedef struct Index: sysutils/syslog-ng/patches/patch-modules_afsocket_transport-unix-socket_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-modules_afsocket_transport-unix-socket_c diff -N sysutils/syslog-ng/patches/patch-modules_afsocket_transport-unix-socket_c --- sysutils/syslog-ng/patches/patch-modules_afsocket_transport-unix-socket_c 8 Jun 2017 18:19:37 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-modules_afsocket_transport-unix-socket_c,v 1.2 2017/06/08 18:19:37 steven Exp $ ---- modules/afsocket/transport-unix-socket.c.orig Wed Dec 21 15:57:44 2016 -+++ modules/afsocket/transport-unix-socket.c Sun Feb 5 23:51:05 2017 -@@ -30,6 +30,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/socket.h> -+#include <sys/uio.h> - #include <fcntl.h> - #include <errno.h> - #include <unistd.h> Index: sysutils/syslog-ng/patches/patch-modules_dbparser_patternize_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-modules_dbparser_patternize_c diff -N sysutils/syslog-ng/patches/patch-modules_dbparser_patternize_c --- sysutils/syslog-ng/patches/patch-modules_dbparser_patternize_c 8 Jun 2017 18:19:37 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-modules_dbparser_patternize_c,v 1.2 2017/06/08 18:19:37 steven Exp $ ---- modules/dbparser/patternize.c.orig Wed Dec 21 15:57:44 2016 -+++ modules/dbparser/patternize.c Sun Feb 5 23:58:37 2017 -@@ -117,9 +117,8 @@ ptz_find_frequent_words(GPtrArray *logs, guint support - { - msg_progress("Finding frequent words", - evt_tag_str("phase", "caching")); -- srand(time(NULL)); - cachesize = (guint) ((logs->len * PTZ_WORDLIST_CACHE)); -- cacheseed = rand(); -+ cacheseed = arc4random(); - wordlist_cache = g_new0(int, cachesize); - } - else Index: sysutils/syslog-ng/patches/patch-modules_getent_tfgetent_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-modules_getent_tfgetent_c diff -N sysutils/syslog-ng/patches/patch-modules_getent_tfgetent_c --- sysutils/syslog-ng/patches/patch-modules_getent_tfgetent_c 10 Nov 2017 21:58:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-modules_getent_tfgetent_c,v 1.1 2017/11/10 21:58:26 steven Exp $ -work around different getent API, adapted from -https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd - -Index: modules/getent/tfgetent.c ---- modules/getent/tfgetent.c.orig -+++ modules/getent/tfgetent.c -@@ -20,6 +20,10 @@ - * COPYING for details. - */ - -+#if defined(sun) || defined(__sun) || defined(__OpenBSD__) -+#define _POSIX_PTHREAD_SEMANTICS -+#endif -+ - #include "syslog-ng.h" - #include "logmsg/logmsg.h" - #include "plugin.h" -@@ -27,6 +31,7 @@ - #include "cfg.h" - #include "parse-number.h" - #include "template/simple-function.h" -+#include "compat/getent.h" - - #include <grp.h> - #include <pwd.h> Index: sysutils/syslog-ng/patches/patch-modules_json_json-parser_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-modules_json_json-parser_c diff -N sysutils/syslog-ng/patches/patch-modules_json_json-parser_c --- sysutils/syslog-ng/patches/patch-modules_json_json-parser_c 12 Feb 2018 10:03:50 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -$OpenBSD: patch-modules_json_json-parser_c,v 1.1 2018/02/12 10:03:50 bket Exp $ - -Fix build with json-c 0.13. -https://github.com/balabit/syslog-ng/pull/1810 - -Index: modules/json/json-parser.c ---- modules/json/json-parser.c.orig -+++ modules/json/json-parser.c -@@ -20,6 +20,8 @@ - * COPYING for details. - */ - -+#define JSON_C_VER_013 (13 << 8) -+ - #include "json-parser.h" - #include "dot-notation.h" - #include "scratch-buffers.h" -@@ -28,7 +30,10 @@ - #include <ctype.h> - - #include <json.h> -+ -+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013) - #include <json_object_private.h> -+#endif - - typedef struct _JSONParser - { Index: sysutils/syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c =================================================================== RCS file: sysutils/syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c diff -N sysutils/syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c --- sysutils/syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c 1 May 2016 11:19:09 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-syslog-ng-ctl_control-client-unix_c,v 1.2 2016/05/01 11:19:09 steven Exp $ ---- syslog-ng-ctl/control-client-unix.c.orig Mon Aug 17 10:53:07 2015 -+++ syslog-ng-ctl/control-client-unix.c Sun Oct 25 15:34:54 2015 -@@ -22,6 +22,7 @@ - * - */ - -+#include <string.h> - #include "control-client.h" - #include "gsocket.h" - Index: sysutils/syslog-ng/pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v retrieving revision 1.25 diff -u -p -u -r1.25 PLIST --- sysutils/syslog-ng/pkg/PLIST 30 Apr 2021 17:14:50 -0000 1.25 +++ sysutils/syslog-ng/pkg/PLIST 10 May 2021 14:53:42 -0000 @@ -5,27 +5,46 @@ @bin bin/dqtool @bin bin/loggen @bin bin/pdbtool +@bin bin/persist-tool +@bin bin/slogencrypt +@bin bin/slogkey +@bin bin/slogverify bin/update-patterndb include/syslog-ng/ -include/syslog-ng/ack_tracker.h +include/syslog-ng/ack-tracker/ +include/syslog-ng/ack-tracker/ack_tracker.h +include/syslog-ng/ack-tracker/ack_tracker_factory.h +include/syslog-ng/ack-tracker/ack_tracker_types.h +include/syslog-ng/ack-tracker/batched_ack_tracker.h +include/syslog-ng/ack-tracker/bookmark.h +include/syslog-ng/ack-tracker/consecutive_ack_record_container.h +include/syslog-ng/ack-tracker/consecutive_ack_tracker.h +include/syslog-ng/ack-tracker/instant_ack_tracker.h include/syslog-ng/afinter.h include/syslog-ng/alarms.h include/syslog-ng/apphook.h +include/syslog-ng/atomic-gssize.h include/syslog-ng/atomic.h include/syslog-ng/block-ref-parser.h -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-internal.h include/syslog-ng/cfg-grammar.h include/syslog-ng/cfg-lexer-subst.h include/syslog-ng/cfg-lexer.h include/syslog-ng/cfg-parser.h +include/syslog-ng/cfg-path.h include/syslog-ng/cfg-tree.h +include/syslog-ng/cfg-walker.h include/syslog-ng/cfg.h include/syslog-ng/children.h include/syslog-ng/compat/ include/syslog-ng/compat/compat.h -include/syslog-ng/compat/getent-bb.h +include/syslog-ng/compat/getent-generic.h +include/syslog-ng/compat/getent-openbsd.h +include/syslog-ng/compat/getent-sun.h include/syslog-ng/compat/getent.h include/syslog-ng/compat/getutent.h include/syslog-ng/compat/glib.h @@ -36,6 +55,7 @@ include/syslog-ng/compat/pio.h include/syslog-ng/compat/socket.h include/syslog-ng/compat/string.h include/syslog-ng/compat/time.h +include/syslog-ng/compat/un.h include/syslog-ng/control/ include/syslog-ng/control/control-commands.h include/syslog-ng/control/control-main.h @@ -48,6 +68,8 @@ include/syslog-ng/debugger/debugger.h include/syslog-ng/debugger/tracer.h include/syslog-ng/dnscache.h include/syslog-ng/driver.h +include/syslog-ng/dynamic-window-pool.h +include/syslog-ng/dynamic-window.h include/syslog-ng/evtlog.h include/syslog-ng/evtmaps.h include/syslog-ng/fdhelpers.h @@ -72,14 +94,9 @@ include/syslog-ng/gsocket.h include/syslog-ng/host-id.h include/syslog-ng/host-resolve.h include/syslog-ng/hostname.h -include/syslog-ng/libtest/ -include/syslog-ng/libtest/license_module_mock.h -include/syslog-ng/libtest/mock-transport.h -include/syslog-ng/libtest/msg_parse_lib.h -include/syslog-ng/libtest/persist_lib.h -include/syslog-ng/libtest/proto_lib.h -include/syslog-ng/libtest/template_lib.h -include/syslog-ng/libtest/testutils.h +include/syslog-ng/list-adt.h +include/syslog-ng/loggen_helper.h +include/syslog-ng/loggen_plugin.h include/syslog-ng/logmatcher.h include/syslog-ng/logmpx.h include/syslog-ng/logmsg/ @@ -87,7 +104,9 @@ include/syslog-ng/logmsg/gsockaddr-seria include/syslog-ng/logmsg/logmsg-serialize-fixup.h include/syslog-ng/logmsg/logmsg-serialize.h include/syslog-ng/logmsg/logmsg.h +include/syslog-ng/logmsg/nvhandle-descriptors.h include/syslog-ng/logmsg/nvtable-serialize-endianutils.h +include/syslog-ng/logmsg/nvtable-serialize-legacy.h include/syslog-ng/logmsg/nvtable-serialize.h include/syslog-ng/logmsg/nvtable.h include/syslog-ng/logmsg/serialization.h @@ -104,6 +123,7 @@ include/syslog-ng/logproto/logproto-fram 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 @@ -114,27 +134,28 @@ include/syslog-ng/logqueue-fifo.h include/syslog-ng/logqueue.h include/syslog-ng/logreader.h include/syslog-ng/logsource.h -include/syslog-ng/logstamp.h -include/syslog-ng/logthrdestdrv.h +include/syslog-ng/logthrdest/ +include/syslog-ng/logthrdest/logthrdestdrv.h +include/syslog-ng/logthrsource/ +include/syslog-ng/logthrsource/logthrfetcherdrv.h +include/syslog-ng/logthrsource/logthrsourcedrv.h include/syslog-ng/logwriter.h include/syslog-ng/mainloop-call.h +include/syslog-ng/mainloop-control.h include/syslog-ng/mainloop-io-worker.h include/syslog-ng/mainloop-worker.h include/syslog-ng/mainloop.h include/syslog-ng/memtrace.h include/syslog-ng/messages.h +include/syslog-ng/misc.h include/syslog-ng/ml-batched-timer.h include/syslog-ng/module-config.h include/syslog-ng/modules/ -include/syslog-ng/modules/add-contextual-data/ -include/syslog-ng/modules/add-contextual-data/add-contextual-data-parser.h -include/syslog-ng/modules/add-contextual-data/add-contextual-data-selector.h -include/syslog-ng/modules/add-contextual-data/add-contextual-data-template-selector.h -include/syslog-ng/modules/add-contextual-data/add-contextual-data.h -include/syslog-ng/modules/add-contextual-data/context-info-db.h -include/syslog-ng/modules/add-contextual-data/contextual-data-record-scanner.h -include/syslog-ng/modules/add-contextual-data/csv-contextual-data-record-scanner.h +include/syslog-ng/modules/http/ +include/syslog-ng/modules/http/http-signals.h include/syslog-ng/msg-format.h +include/syslog-ng/msg-stats.h +include/syslog-ng/nondumpable-allocator.h include/syslog-ng/parse-number.h include/syslog-ng/parser/ include/syslog-ng/parser/parser-expr-parser.h @@ -157,6 +178,9 @@ include/syslog-ng/rewrite/ include/syslog-ng/rewrite/rewrite-expr-parser.h include/syslog-ng/rewrite/rewrite-expr.h include/syslog-ng/rewrite/rewrite-groupset.h +include/syslog-ng/rewrite/rewrite-set-facility.h +include/syslog-ng/rewrite/rewrite-set-pri.h +include/syslog-ng/rewrite/rewrite-set-severity.h include/syslog-ng/rewrite/rewrite-set-tag.h include/syslog-ng/rewrite/rewrite-set.h include/syslog-ng/rewrite/rewrite-subst.h @@ -170,10 +194,16 @@ include/syslog-ng/scanner/kv-scanner/ include/syslog-ng/scanner/kv-scanner/kv-scanner.h include/syslog-ng/scanner/list-scanner/ include/syslog-ng/scanner/list-scanner/list-scanner.h +include/syslog-ng/scanner/xml-scanner/ +include/syslog-ng/scanner/xml-scanner/xml-scanner.h include/syslog-ng/scratch-buffers.h +include/syslog-ng/secret-storage.h include/syslog-ng/seqnum.h include/syslog-ng/serialize.h include/syslog-ng/service-management.h +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/stats-cluster-logpipe.h include/syslog-ng/stats/stats-cluster-single.h @@ -185,7 +215,6 @@ include/syslog-ng/stats/stats-log.h 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-syslog.h include/syslog-ng/stats/stats.h include/syslog-ng/str-format.h include/syslog-ng/str-repr/ @@ -200,6 +229,7 @@ include/syslog-ng/template/ include/syslog-ng/template/common-template-typedefs.h include/syslog-ng/template/compiler.h include/syslog-ng/template/escaping.h +include/syslog-ng/template/eval.h include/syslog-ng/template/function.h include/syslog-ng/template/macros.h include/syslog-ng/template/repr.h @@ -207,16 +237,35 @@ include/syslog-ng/template/simple-functi include/syslog-ng/template/templates.h include/syslog-ng/template/user-function.h include/syslog-ng/thread-utils.h -include/syslog-ng/timeutils.h +include/syslog-ng/timeutils/ +include/syslog-ng/timeutils/cache.h +include/syslog-ng/timeutils/conv.h +include/syslog-ng/timeutils/format.h +include/syslog-ng/timeutils/misc.h +include/syslog-ng/timeutils/names.h +include/syslog-ng/timeutils/scan-timestamp.h +include/syslog-ng/timeutils/timeutils.h +include/syslog-ng/timeutils/unixtime.h +include/syslog-ng/timeutils/wallclocktime.h +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/ include/syslog-ng/transport/logtransport.h +include/syslog-ng/transport/multitransport.h include/syslog-ng/transport/transport-aux-data.h +include/syslog-ng/transport/transport-factory-id.h +include/syslog-ng/transport/transport-factory-registry.h +include/syslog-ng/transport/transport-factory-socket.h +include/syslog-ng/transport/transport-factory-tls.h +include/syslog-ng/transport/transport-factory.h include/syslog-ng/transport/transport-file.h include/syslog-ng/transport/transport-pipe.h include/syslog-ng/transport/transport-socket.h include/syslog-ng/transport/transport-tls.h +include/syslog-ng/transport/transport-udp-socket.h include/syslog-ng/type-hinting.h include/syslog-ng/userdb.h include/syslog-ng/utf8utils.h @@ -224,21 +273,32 @@ include/syslog-ng/uuid.h include/syslog-ng/value-pairs/ include/syslog-ng/value-pairs/cmdline.h include/syslog-ng/value-pairs/evttag.h +include/syslog-ng/value-pairs/internals.h include/syslog-ng/value-pairs/transforms.h include/syslog-ng/value-pairs/value-pairs.h include/syslog-ng/versioning.h -@lib lib/libevtlog-3.12.so.${LIBevtlog-3.12_VERSION} +include/syslog-ng/window-size-counter.h +@lib lib/libevtlog-3.32.so.${LIBevtlog-3.32_VERSION} @static-lib lib/libevtlog.a lib/libevtlog.la @lib lib/libevtlog.so.${LIBevtlog_VERSION} -@lib lib/libsyslog-ng-3.12.so.${LIBsyslog-ng-3.12_VERSION} +@lib lib/libloggen_helper-3.32.so.${LIBloggen_helper-3.32_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} +@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} @static-lib lib/libsyslog-ng-native-connector.a @static-lib lib/libsyslog-ng.a lib/libsyslog-ng.la @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION} -lib/pkgconfig/syslog-ng-add-contextual-data.pc lib/pkgconfig/syslog-ng-native-connector.pc -lib/pkgconfig/syslog-ng-test.pc lib/pkgconfig/syslog-ng.pc lib/syslog-ng/ @so lib/syslog-ng/libadd-contextual-data.so @@ -247,37 +307,52 @@ lib/syslog-ng/ @so lib/syslog-ng/libafsocket.so @so lib/syslog-ng/libafsql.so @so lib/syslog-ng/libafuser.so +@so lib/syslog-ng/libappmodel.so +@so lib/syslog-ng/libazure-auth-header.so @so lib/syslog-ng/libbasicfuncs.so @so lib/syslog-ng/libcef.so @so lib/syslog-ng/libconfgen.so @so lib/syslog-ng/libcryptofuncs.so @so lib/syslog-ng/libcsvparser.so -@so lib/syslog-ng/libdate.so @so lib/syslog-ng/libdbparser.so @so lib/syslog-ng/libdisk-buffer.so +@so lib/syslog-ng/libexamples.so @so lib/syslog-ng/libgeoip2-plugin.so @so lib/syslog-ng/libgraphite.so +@so lib/syslog-ng/libhook-commands.so @so lib/syslog-ng/libhttp.so @so lib/syslog-ng/libjson-plugin.so @so lib/syslog-ng/libkvformat.so @so lib/syslog-ng/liblinux-kmsg-format.so @so lib/syslog-ng/libmap-value-pairs.so +@so lib/syslog-ng/libopenbsd.so @so lib/syslog-ng/libpseudofile.so -@so lib/syslog-ng/libsnmptrapd-parser.so +@so lib/syslog-ng/libsecure-logging.so @so lib/syslog-ng/libstardate.so @so lib/syslog-ng/libsyslogformat.so @so lib/syslog-ng/libsystem-source.so @so lib/syslog-ng/libtags-parser.so -lib/syslog-ng/libtest/ -@static-lib lib/syslog-ng/libtest/libsyslog-ng-test.a @so lib/syslog-ng/libtfgetent.so +@so lib/syslog-ng/libtimestamp.so @so lib/syslog-ng/libxml.so +lib/syslog-ng/loggen/ +@static-lib lib/syslog-ng/loggen/libloggen_socket_plugin.a +lib/syslog-ng/loggen/libloggen_socket_plugin.la +@so lib/syslog-ng/loggen/libloggen_socket_plugin.so +@static-lib lib/syslog-ng/loggen/libloggen_ssl_plugin.a +lib/syslog-ng/loggen/libloggen_ssl_plugin.la +@so lib/syslog-ng/loggen/libloggen_ssl_plugin.so @man man/man1/dqtool.1 @man man/man1/loggen.1 @man man/man1/pdbtool.1 +@man man/man1/persist-tool.1 +@man man/man1/slogencrypt.1 +@man man/man1/slogkey.1 +@man man/man1/slogverify.1 @man man/man1/syslog-ng-ctl.1 @man man/man1/syslog-ng-debun.1 @man man/man5/syslog-ng.conf.5 +@man man/man7/secure-logging.7 @man man/man8/syslog-ng.8 @bin sbin/syslog-ng @bin sbin/syslog-ng-ctl @@ -294,43 +369,83 @@ share/syslog-ng/include/ share/syslog-ng/include/scl/ share/syslog-ng/include/scl/apache/ share/syslog-ng/include/scl/apache/apache.conf +share/syslog-ng/include/scl/cee/ +share/syslog-ng/include/scl/cee/adapter.conf +share/syslog-ng/include/scl/checkpoint/ +share/syslog-ng/include/scl/checkpoint/plugin.conf share/syslog-ng/include/scl/cim/ +share/syslog-ng/include/scl/cim/adapter.conf share/syslog-ng/include/scl/cim/template.conf share/syslog-ng/include/scl/cisco/ share/syslog-ng/include/scl/cisco/plugin.conf +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/elasticsearch/ -share/syslog-ng/include/scl/elasticsearch/plugin.conf +share/syslog-ng/include/scl/elasticsearch/elastic-http.conf +share/syslog-ng/include/scl/elasticsearch/elastic-java.conf +share/syslog-ng/include/scl/ewmm/ +share/syslog-ng/include/scl/ewmm/ewmm.conf +share/syslog-ng/include/scl/fortigate/ +share/syslog-ng/include/scl/fortigate/fortigate.conf share/syslog-ng/include/scl/graphite/ share/syslog-ng/include/scl/graphite/README share/syslog-ng/include/scl/graphite/plugin.conf +share/syslog-ng/include/scl/graylog2/ +share/syslog-ng/include/scl/graylog2/plugin.conf share/syslog-ng/include/scl/hdfs/ share/syslog-ng/include/scl/hdfs/plugin.conf +share/syslog-ng/include/scl/iptables/ +share/syslog-ng/include/scl/iptables/iptables.conf +share/syslog-ng/include/scl/junos/ +share/syslog-ng/include/scl/junos/plugin.conf share/syslog-ng/include/scl/kafka/ -share/syslog-ng/include/scl/kafka/plugin.conf +share/syslog-ng/include/scl/kafka/kafka-java.conf +share/syslog-ng/include/scl/kafka/kafka.conf +share/syslog-ng/include/scl/linux-audit/ +share/syslog-ng/include/scl/linux-audit/linux-audit.conf +share/syslog-ng/include/scl/loadbalancer/ +share/syslog-ng/include/scl/loadbalancer/gen-loadbalancer.sh +share/syslog-ng/include/scl/loadbalancer/plugin.conf share/syslog-ng/include/scl/loggly/ share/syslog-ng/include/scl/loggly/loggly.conf share/syslog-ng/include/scl/logmatic/ share/syslog-ng/include/scl/logmatic/logmatic.conf share/syslog-ng/include/scl/mbox/ share/syslog-ng/include/scl/mbox/mbox.conf +share/syslog-ng/include/scl/netskope/ +share/syslog-ng/include/scl/netskope/plugin.conf share/syslog-ng/include/scl/nodejs/ share/syslog-ng/include/scl/nodejs/plugin.conf share/syslog-ng/include/scl/osquery/ share/syslog-ng/include/scl/osquery/plugin.conf share/syslog-ng/include/scl/pacct/ share/syslog-ng/include/scl/pacct/plugin.conf +share/syslog-ng/include/scl/paloalto/ +share/syslog-ng/include/scl/paloalto/panos.conf share/syslog-ng/include/scl/rewrite/ share/syslog-ng/include/scl/rewrite/cc-mask.conf +share/syslog-ng/include/scl/slack/ +share/syslog-ng/include/scl/slack/slack.conf share/syslog-ng/include/scl/snmptrap/ share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf share/syslog-ng/include/scl/solaris/ share/syslog-ng/include/scl/solaris/plugin.conf +share/syslog-ng/include/scl/sudo/ +share/syslog-ng/include/scl/sudo/sudo.conf +share/syslog-ng/include/scl/sumologic/ +share/syslog-ng/include/scl/sumologic/sumologic.conf share/syslog-ng/include/scl/syslogconf/ 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/ share/syslog-ng/include/scl/system/plugin.conf +share/syslog-ng/include/scl/telegram/ +share/syslog-ng/include/scl/telegram/telegram.conf +share/syslog-ng/include/scl/websense/ +share/syslog-ng/include/scl/websense/plugin.conf share/syslog-ng/include/scl/windowseventlog/ share/syslog-ng/include/scl/windowseventlog/plugin.conf share/syslog-ng/include/scl/windowseventlog/windowseventlog.xml
