below is an update to syslog-ng. tested on amd64. tests / comments / ok ? Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v retrieving revision 1.48 diff -u -p -u -r1.48 Makefile --- Makefile 29 Oct 2014 09:14:50 -0000 1.48 +++ Makefile 29 Oct 2014 22:43:54 -0000 @@ -4,9 +4,8 @@ COMMENT= syslogd replacement SHARED_ONLY = Yes -V = 3.4.7 +V = 3.5.6 DISTNAME = syslog-ng-$V -REVISION = 4 CATEGORIES = sysutils MAINTAINER = Steven Mestdagh <ste...@openbsd.org> @@ -19,8 +18,8 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/ DISTFILES = syslog-ng_$V.tar.gz -SHARED_LIBS = syslog-ng 0.0 \ - syslog-ng-${V} 0.0 +SHARED_LIBS = syslog-ng 1.0 \ + syslog-ng-${V} 1.0 MODULES = devel/gettext @@ -41,6 +40,7 @@ CONFIGURE_ARGS += --disable-tcp-wrapper --with-librabbitmq-client=no \ --disable-mongodb \ --disable-amqp \ + --disable-stomp \ --disable-geoip \ --without-libnet \ --with-ivykis=system \ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v retrieving revision 1.21 diff -u -p -u -r1.21 distinfo --- distinfo 12 Jan 2014 20:41:11 -0000 1.21 +++ distinfo 29 Oct 2014 22:43:54 -0000 @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.4.7.tar.gz) = exEU/wvZ0sUqjOQH8PWRAupBI/9++z+EJTlh4N5qwbA= -SIZE (syslog-ng_3.4.7.tar.gz) = 3203894 +SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY= +SIZE (syslog-ng_3.5.6.tar.gz) = 3001992 Index: files/syslog-ng.conf =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v retrieving revision 1.4 diff -u -p -u -r1.4 syslog-ng.conf --- files/syslog-ng.conf 30 Nov 2013 10:02:12 -0000 1.4 +++ files/syslog-ng.conf 29 Oct 2014 22:43:54 -0000 @@ -2,7 +2,7 @@ # This should provide the same behavior as OpenBSD's syslog.conf(5). # 2010-07-18 ste...@openbsd.org -@version: 3.4 +@version: 3.5 options { use_dns(no); Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 29 Oct 2014 22:43:54 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +temporary hack until libtool is fixed. +--- Makefile.in.orig Tue Oct 28 07:22:29 2014 ++++ Makefile.in Tue Oct 28 07:23:34 2014 +@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \ + lib/$(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/afamqp/$(am__dirstamp): + @$(MKDIR_P) modules/afamqp + @: > modules/afamqp/$(am__dirstamp) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-configure --- patches/patch-configure 4 Dec 2013 07:13:31 -0000 1.1 +++ patches/patch-configure 29 Oct 2014 22:43:54 -0000 @@ -1,8 +1,8 @@ -$OpenBSD: patch-configure,v 1.1 2013/12/04 07:13:31 steven Exp $ +$OpenBSD$ do not pick up libuuid ---- configure.orig Wed Nov 27 16:40:28 2013 -+++ configure Wed Dec 4 07:53:40 2013 -@@ -15379,6 +15379,7 @@ fi +--- configure.orig Tue Oct 28 07:38:54 2014 ++++ configure Tue Oct 28 07:40:00 2014 +@@ -15854,6 +15854,7 @@ fi else pkg_failed=untried fi Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- patches/patch-lib_Makefile_in 30 Nov 2013 10:02:12 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-lib_Makefile_in,v 1.3 2013/11/30 10:02:12 steven Exp $ -temporary hack until libtool is fixed. ---- lib/Makefile.in.orig Mon Nov 4 09:18:07 2013 -+++ lib/Makefile.in Wed Nov 13 22:51:23 2013 -@@ -229,7 +229,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l - libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS) - libsyslog_ng_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(libsyslog_ng_la_CFLAGS) $(CFLAGS) $(libsyslog_ng_la_LDFLAGS) \ -+ $(libsyslog_ng_la_CFLAGS) $(CFLAGS) -version-info 0:0:0 \ -+ $(libsyslog_ng_la_LDFLAGS) \ - $(LDFLAGS) -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) Index: patches/patch-lib_gsockaddr_c =================================================================== RCS file: patches/patch-lib_gsockaddr_c diff -N patches/patch-lib_gsockaddr_c --- patches/patch-lib_gsockaddr_c 30 Nov 2013 10:02:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_gsockaddr_c,v 1.1 2013/11/30 10:02:12 steven Exp $ ---- lib/gsockaddr.c.orig Fri Jun 14 07:54:20 2013 -+++ lib/gsockaddr.c Tue Sep 24 01:24:06 2013 -@@ -355,7 +355,7 @@ g_sockaddr_inet_range_new(gchar *ip, guint16 min_port, - addr->sa_funcs = &inet_range_sockaddr_funcs; - if (max_port > min_port) - { -- addr->last_port = (rand() % (max_port - min_port)) + min_port; -+ addr->last_port = arc4random_uniform(max_port - min_port) + min_port; - } - addr->min_port = min_port; - addr->max_port = max_port; Index: patches/patch-modules_json_jsonparser_c =================================================================== RCS file: patches/patch-modules_json_jsonparser_c diff -N patches/patch-modules_json_jsonparser_c --- patches/patch-modules_json_jsonparser_c 24 Apr 2014 15:58:54 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-modules_json_jsonparser_c,v 1.1 2014/04/24 15:58:54 sthen Exp $ - -old api was deprecated in json-c 0.12 - ---- modules/json/jsonparser.c.orig Thu Apr 24 16:47:42 2014 -+++ modules/json/jsonparser.c Thu Apr 24 16:55:21 2014 -@@ -185,7 +185,7 @@ log_json_parser_process (LogParser *s, LogMessage **pm - if (tok->err != json_tokener_success) - { - msg_error ("Unparsable JSON stream encountered", -- evt_tag_str ("error", json_tokener_errors[tok->err]), NULL); -+ evt_tag_str ("error", json_tokener_error_desc(tok->err)), NULL); - json_tokener_free (tok); - return FALSE; - } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v retrieving revision 1.18 diff -u -p -u -r1.18 PLIST --- pkg/PLIST 29 Oct 2014 09:14:50 -0000 1.18 +++ pkg/PLIST 29 Oct 2014 22:43:54 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.18 2014/10/29 09:14:50 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.17 2014/03/31 17:06:54 ajacoutot Exp $ @bin bin/loggen @bin bin/pdbtool bin/update-patterndb @@ -22,33 +22,51 @@ include/syslog-ng/crypto.h include/syslog-ng/dnscache.h include/syslog-ng/driver.h include/syslog-ng/file-perms.h -include/syslog-ng/filter-expr-parser.h -include/syslog-ng/filter.h +include/syslog-ng/filter/ +include/syslog-ng/filter/filter-call.h +include/syslog-ng/filter/filter-cmp.h +include/syslog-ng/filter/filter-expr-parser.h +include/syslog-ng/filter/filter-expr.h +include/syslog-ng/filter/filter-in-list.h +include/syslog-ng/filter/filter-netmask.h +include/syslog-ng/filter/filter-op.h +include/syslog-ng/filter/filter-pipe.h +include/syslog-ng/filter/filter-pri.h +include/syslog-ng/filter/filter-re.h +include/syslog-ng/filter/filter-tags.h include/syslog-ng/gprocess.h include/syslog-ng/gsockaddr.h include/syslog-ng/gsocket.h +include/syslog-ng/libtest/ +include/syslog-ng/libtest/mock-transport.h +include/syslog-ng/libtest/msg_parse_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/logmatcher.h include/syslog-ng/logmpx.h include/syslog-ng/logmsg.h -include/syslog-ng/logparser.h include/syslog-ng/logpipe.h -include/syslog-ng/logproto-buffered-server.h -include/syslog-ng/logproto-builtins.h -include/syslog-ng/logproto-client.h -include/syslog-ng/logproto-dgram-server.h -include/syslog-ng/logproto-framed-client.h -include/syslog-ng/logproto-framed-server.h -include/syslog-ng/logproto-record-server.h -include/syslog-ng/logproto-server.h -include/syslog-ng/logproto-text-client.h -include/syslog-ng/logproto-text-server.h -include/syslog-ng/logproto.h +include/syslog-ng/logproto/ +include/syslog-ng/logproto/logproto-buffered-server.h +include/syslog-ng/logproto/logproto-builtins.h +include/syslog-ng/logproto/logproto-client.h +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-record-server.h +include/syslog-ng/logproto/logproto-regexp-multiline-server.h +include/syslog-ng/logproto/logproto-server.h +include/syslog-ng/logproto/logproto-text-client.h +include/syslog-ng/logproto/logproto-text-server.h +include/syslog-ng/logproto/logproto.h include/syslog-ng/logqueue-fifo.h include/syslog-ng/logqueue.h include/syslog-ng/logreader.h -include/syslog-ng/logrewrite.h include/syslog-ng/logsource.h include/syslog-ng/logstamp.h +include/syslog-ng/logthrdestdrv.h include/syslog-ng/logtransport.h include/syslog-ng/logwriter.h include/syslog-ng/mainloop.h @@ -58,11 +76,22 @@ include/syslog-ng/misc.h include/syslog-ng/ml-batched-timer.h include/syslog-ng/msg-format.h include/syslog-ng/nvtable.h -include/syslog-ng/parser-expr-parser.h +include/syslog-ng/parse-number.h +include/syslog-ng/parser/ +include/syslog-ng/parser/parser-expr-parser.h +include/syslog-ng/parser/parser-expr.h include/syslog-ng/persist-state.h +include/syslog-ng/plugin-types.h include/syslog-ng/plugin.h +include/syslog-ng/poll-events.h +include/syslog-ng/poll-fd-events.h include/syslog-ng/pragma-parser.h -include/syslog-ng/rewrite-expr-parser.h +include/syslog-ng/rewrite/ +include/syslog-ng/rewrite/rewrite-expr-parser.h +include/syslog-ng/rewrite/rewrite-expr.h +include/syslog-ng/rewrite/rewrite-set-tag.h +include/syslog-ng/rewrite/rewrite-set.h +include/syslog-ng/rewrite/rewrite-subst.h include/syslog-ng/scratch-buffers.h include/syslog-ng/serialize.h include/syslog-ng/stats.h @@ -70,20 +99,23 @@ include/syslog-ng/str-format.h include/syslog-ng/syslog-names.h include/syslog-ng/syslog-ng.h include/syslog-ng/tags.h -include/syslog-ng/templates.h +include/syslog-ng/template/ +include/syslog-ng/template/templates.h include/syslog-ng/timeutils.h include/syslog-ng/tls-support.h include/syslog-ng/tlscontext.h include/syslog-ng/tlstransport.h +include/syslog-ng/type-hinting.h include/syslog-ng/utils.h include/syslog-ng/uuid.h include/syslog-ng/value-pairs.h include/syslog-ng/versioning.h include/syslog-ng/vptransform.h -@lib lib/libsyslog-ng-3.4.7.so.${LIBsyslog-ng-3.4.7_VERSION} +@lib lib/libsyslog-ng-3.5.6.so.${LIBsyslog-ng-3.5.6_VERSION} lib/libsyslog-ng.a lib/libsyslog-ng.la @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION} +lib/pkgconfig/syslog-ng-test.pc lib/pkgconfig/syslog-ng.pc lib/syslog-ng/ lib/syslog-ng/libaffile.so @@ -99,9 +131,12 @@ lib/syslog-ng/libcryptofuncs.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libdbparser.so lib/syslog-ng/libjson-plugin.so +lib/syslog-ng/liblinux-kmsg-format.so lib/syslog-ng/libsyslog-ng-crypto.so lib/syslog-ng/libsyslogformat.so lib/syslog-ng/libsystem-source.so +lib/syslog-ng/libtest/ +lib/syslog-ng/libtest/libsyslog-ng-test.a @man man/man1/loggen.1 @man man/man1/pdbtool.1 @man man/man1/syslog-ng-ctl.1
