major update, and enabled geoip and curl modules.
note it requires the libdbi update that i posted a few days ago.
basic test ok on amd64. comments and more tests welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.55
diff -u -p -u -r1.55 Makefile
--- Makefile 1 May 2016 11:19:09 -0000 1.55
+++ Makefile 28 May 2017 08:56:32 -0000
@@ -2,8 +2,8 @@
COMMENT= syslogd replacement
-V = 3.7.2
-REL = 3.7
+V = 3.9.1
+REL = 3.9
DISTNAME = syslog-ng-$V
CATEGORIES = sysutils
@@ -16,39 +16,41 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
-SHARED_LIBS = syslog-ng 3.0 \
- syslog-ng-${REL} 3.0
+SHARED_LIBS = syslog-ng 4.0 \
+ syslog-ng-${REL} 4.0
MODULES = devel/gettext
WANTLIB = c m pcre crypto ssl evtlog dbi ivykis pthread \
- glib-2.0 gmodule-2.0 gthread-2.0 json-c
+ glib-2.0 gmodule-2.0 gthread-2.0 json-c \
+ curl nghttp2 z GeoIP
LIB_DEPENDS = devel/glib2 \
devel/json-c \
devel/libivykis \
sysutils/eventlog \
- databases/libdbi
+ databases/libdbi>=0.9.0 \
+ net/curl \
+ net/GeoIP
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-tcp-wrapper \
--with-pidfile-dir=/var/run \
--enable-json \
- --with-libmongo-client=no \
+ --with-mongoc=no \
--with-librabbitmq-client=no \
--disable-python \
--disable-mongodb \
--disable-amqp \
--disable-stomp \
- --disable-geoip \
+ --enable-geoip \
--without-libnet \
--with-ivykis=system \
+ --with-libcurl=${LOCALBASE} \
--enable-sql \
--enable-manpages
CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
- OPENSSL_LIBS="-lssl -lcrypto" \
- LIBDBI_CFLAGS="-I/usr/include/openssl" \
- LIBDBI_LIBS="-ldbi"
+ OPENSSL_LIBS="-lssl -lcrypto"
# 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`"
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- distinfo 1 May 2016 11:19:09 -0000 1.24
+++ distinfo 28 May 2017 08:56:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU=
-SIZE (syslog-ng-3.7.2.tar.gz) = 3558377
+SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
+SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
Index: files/syslog-ng.conf
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.9
diff -u -p -u -r1.9 syslog-ng.conf
--- files/syslog-ng.conf 1 May 2016 11:19:09 -0000 1.9
+++ files/syslog-ng.conf 28 May 2017 08:56:32 -0000
@@ -2,7 +2,7 @@
# This should provide the same behavior as OpenBSD's syslog.conf(5).
# 2010-07-18 steven@openbsd.org
-@version: 3.7
+@version: 3.9
options {
use_dns(no);
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 1 May 2016 11:19:09 -0000 1.9
+++ patches/patch-Makefile_in 28 May 2017 08:56:32 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.9 2016/05/01 11:19:09 steven Exp $
temporary hack until libtool is fixed.
---- Makefile.in.orig Tue Oct 27 09:09:48 2015
-+++ Makefile.in Sat Nov 21 01:24:57 2015
-@@ -5196,7 +5196,7 @@ lib/compat/lib_libsyslog_ng_la-strtok_r.lo: \
- lib/compat/$(DEPDIR)/$(am__dirstamp)
-
+--- Makefile.in.orig Wed Dec 21 16:00:32 2016
++++ Makefile.in Sun Feb 5 23:53:33 2017
+@@ -6203,7 +6203,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/afamqp/$(am__dirstamp):
- @$(MKDIR_P) modules/afamqp
- @: > modules/afamqp/$(am__dirstamp)
+ modules/add-contextual-data/$(am__dirstamp):
+ @$(MKDIR_P) modules/add-contextual-data
+ @: > modules/add-contextual-data/$(am__dirstamp)
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-configure
--- patches/patch-configure 1 May 2016 11:19:09 -0000 1.4
+++ patches/patch-configure 28 May 2017 08:56:32 -0000
@@ -1,7 +1,9 @@
-$OpenBSD: patch-configure,v 1.4 2016/05/01 11:19:09 steven Exp $
---- configure.orig Sun Apr 3 20:18:45 2016
-+++ configure Sun Apr 3 20:19:27 2016
-@@ -16790,7 +16790,7 @@ fi
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -17316,7 +17316,7 @@ fi
else
pkg_failed=untried
fi
Index: patches/patch-lib_tlscontext_c
===================================================================
RCS file: patches/patch-lib_tlscontext_c
diff -N patches/patch-lib_tlscontext_c
--- patches/patch-lib_tlscontext_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-lib_tlscontext_c,v 1.2 2016/05/01 11:19:09 steven Exp $
---- lib/tlscontext.c.orig Mon Aug 17 10:53:07 2015
-+++ lib/tlscontext.c Sun Oct 25 15:34:54 2015
-@@ -26,6 +26,7 @@
- #include "messages.h"
-
- #include <arpa/inet.h>
-+#include <string.h>
- #include <openssl/x509_vfy.h>
- #include <openssl/x509v3.h>
- #include <openssl/err.h>
Index: patches/patch-libtest_mock-transport_c
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-libtest_mock-transport_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-libtest_mock-transport_c
--- patches/patch-libtest_mock-transport_c 30 Nov 2013 10:02:12 -0000 1.1
+++ patches/patch-libtest_mock-transport_c 28 May 2017 08:56:32 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-libtest_mock-transport_c,v 1.1 2013/11/30 10:02:12 steven Exp $
+$OpenBSD$
get struct iovec
---- libtest/mock-transport.c.orig Sat Oct 5 08:42:43 2013
-+++ libtest/mock-transport.c Sat Oct 5 08:42:56 2013
+--- 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: patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
===================================================================
RCS file: patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
diff -N patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c
--- patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c 21 Jul 2015 20:29:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-modules_afmongodb_libmongo-client_src_mongo-utils_c,v 1.2 2015/07/21 20:29:34 steven Exp $
---- modules/afmongodb/libmongo-client/src/mongo-utils.c.orig Mon Dec 15 15:49:47 2014
-+++ modules/afmongodb/libmongo-client/src/mongo-utils.c Fri Jan 2 21:25:29 2015
-@@ -40,8 +40,7 @@ mongo_util_oid_init (gint32 mid)
-
- if (mid == 0)
- {
-- srand (time (NULL));
-- machine_id = rand ();
-+ machine_id = arc4random();
- }
- else
- machine_id = mid;
Index: patches/patch-modules_afsocket_transport-unix-socket_c
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-modules_afsocket_transport-unix-socket_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-modules_afsocket_transport-unix-socket_c
--- patches/patch-modules_afsocket_transport-unix-socket_c 21 Jul 2015 20:29:34 -0000 1.1
+++ patches/patch-modules_afsocket_transport-unix-socket_c 28 May 2017 08:56:32 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-modules_afsocket_transport-unix-socket_c,v 1.1 2015/07/21 20:29:34 steven Exp $
---- modules/afsocket/transport-unix-socket.c.orig Fri Jan 2 21:33:11 2015
-+++ modules/afsocket/transport-unix-socket.c Fri Jan 2 21:33:34 2015
+--- 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>
-
- static void
+ #include <errno.h>
+ #include <unistd.h>
Index: patches/patch-modules_dbparser_patternize_c
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-modules_dbparser_patternize_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-modules_dbparser_patternize_c
--- patches/patch-modules_dbparser_patternize_c 30 Nov 2013 10:02:12 -0000 1.1
+++ patches/patch-modules_dbparser_patternize_c 28 May 2017 08:56:32 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-modules_dbparser_patternize_c,v 1.1 2013/11/30 10:02:12 steven Exp $
---- modules/dbparser/patternize.c.orig Tue Aug 13 11:25:18 2013
-+++ modules/dbparser/patternize.c Wed Oct 9 23:26:32 2013
-@@ -119,9 +119,8 @@ ptz_find_frequent_words(GPtrArray *logs, guint support
+$OpenBSD$
+--- 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"),
- NULL);
+ evt_tag_str("phase", "caching"));
- srand(time(NULL));
cachesize = (guint) ((logs->len * PTZ_WORDLIST_CACHE));
- cacheseed = rand();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- pkg/PLIST 1 May 2016 11:19:09 -0000 1.21
+++ pkg/PLIST 28 May 2017 08:56:32 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.21 2016/05/01 11:19:09 steven Exp $
+@bin bin/dqtool
@bin bin/loggen
@bin bin/pdbtool
bin/update-patterndb
@@ -24,6 +25,7 @@ include/syslog-ng/compat/compat.h
include/syslog-ng/compat/getutent.h
include/syslog-ng/compat/glib.h
include/syslog-ng/compat/lfs.h
+include/syslog-ng/compat/openssl_support.h
include/syslog-ng/compat/pio.h
include/syslog-ng/compat/socket.h
include/syslog-ng/compat/string.h
@@ -38,6 +40,7 @@ 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/fdhelpers.h
include/syslog-ng/file-perms.h
include/syslog-ng/filter/
include/syslog-ng/filter/filter-call.h
@@ -52,6 +55,7 @@ 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/find-crlf.h
include/syslog-ng/gprocess.h
include/syslog-ng/gsockaddr.h
include/syslog-ng/gsocket.h
@@ -67,7 +71,18 @@ 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/logmsg/
+include/syslog-ng/logmsg/gsockaddr-serialize.h
+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/nvtable-serialize-endianutils.h
+include/syslog-ng/logmsg/nvtable-serialize.h
+include/syslog-ng/logmsg/nvtable.h
+include/syslog-ng/logmsg/serialization.h
+include/syslog-ng/logmsg/tags-serialize.h
+include/syslog-ng/logmsg/tags.h
+include/syslog-ng/logmsg/timestamp-serialize.h
include/syslog-ng/logpipe.h
include/syslog-ng/logproto/
include/syslog-ng/logproto/logproto-buffered-server.h
@@ -96,11 +111,18 @@ 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/msg-format.h
-include/syslog-ng/nvtable.h
include/syslog-ng/parse-number.h
include/syslog-ng/parser/
include/syslog-ng/parser/parser-expr-parser.h
@@ -117,6 +139,7 @@ include/syslog-ng/pragma-parser.h
include/syslog-ng/presented-persistable-state.h
include/syslog-ng/rcptid.h
include/syslog-ng/reloc.h
+include/syslog-ng/resolved-configurable-paths.h
include/syslog-ng/rewrite/
include/syslog-ng/rewrite/rewrite-expr-parser.h
include/syslog-ng/rewrite/rewrite-expr.h
@@ -124,9 +147,14 @@ include/syslog-ng/rewrite/rewrite-groups
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/rewrite/rewrite-unset.h
include/syslog-ng/ringbuffer.h
include/syslog-ng/run-id.h
+include/syslog-ng/scanner/
+include/syslog-ng/scanner/csv-scanner/
+include/syslog-ng/scanner/csv-scanner/csv-scanner.h
include/syslog-ng/scratch-buffers.h
+include/syslog-ng/seqnum.h
include/syslog-ng/serialize.h
include/syslog-ng/service-management.h
include/syslog-ng/stats/
@@ -138,10 +166,14 @@ 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/stringutils.h
+include/syslog-ng/str-repr/
+include/syslog-ng/str-repr/decode.h
+include/syslog-ng/str-repr/encode.h
+include/syslog-ng/str-utils.h
+include/syslog-ng/string-list.h
include/syslog-ng/syslog-names.h
+include/syslog-ng/syslog-ng-config.h
include/syslog-ng/syslog-ng.h
-include/syslog-ng/tags.h
include/syslog-ng/template/
include/syslog-ng/template/common-template-typedefs.h
include/syslog-ng/template/compiler.h
@@ -165,28 +197,41 @@ include/syslog-ng/transport/transport-pi
include/syslog-ng/transport/transport-socket.h
include/syslog-ng/transport/transport-tls.h
include/syslog-ng/type-hinting.h
+include/syslog-ng/userdb.h
include/syslog-ng/utf8utils.h
include/syslog-ng/uuid.h
-include/syslog-ng/value-pairs.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/transforms.h
+include/syslog-ng/value-pairs/value-pairs.h
include/syslog-ng/versioning.h
-include/syslog-ng/vptransform.h
-@lib lib/libsyslog-ng-3.7.so.${LIBsyslog-ng-3.7_VERSION}
+@lib lib/libsyslog-ng-3.9.so.${LIBsyslog-ng-3.9_VERSION}
+lib/libsyslog-ng-native-connector.a
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/
+lib/syslog-ng/libadd-contextual-data.so
lib/syslog-ng/libaffile.so
lib/syslog-ng/libafprog.so
lib/syslog-ng/libafsocket.so
lib/syslog-ng/libafsql.so
lib/syslog-ng/libafuser.so
lib/syslog-ng/libbasicfuncs.so
+lib/syslog-ng/libcef.so
lib/syslog-ng/libconfgen.so
lib/syslog-ng/libcryptofuncs.so
lib/syslog-ng/libcsvparser.so
+lib/syslog-ng/libcurl.so
+lib/syslog-ng/libdate.so
lib/syslog-ng/libdbparser.so
+lib/syslog-ng/libdisk-buffer.so
+lib/syslog-ng/libgeoip-plugin.so
lib/syslog-ng/libgraphite.so
lib/syslog-ng/libjson-plugin.so
lib/syslog-ng/libkvformat.so
@@ -210,4 +255,51 @@ share/examples/syslog-ng/scl.conf
share/examples/syslog-ng/syslog-ng.conf
share/examples/syslog-ng/syslog-ng.conf.openbsd
@sample ${SYSCONFDIR}/syslog-ng.conf
+share/syslog-ng/
+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/cim/
+share/syslog-ng/include/scl/cim/template.conf
+share/syslog-ng/include/scl/elasticsearch/
+share/syslog-ng/include/scl/elasticsearch/plugin.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/hdfs/
+share/syslog-ng/include/scl/hdfs/plugin.conf
+share/syslog-ng/include/scl/kafka/
+share/syslog-ng/include/scl/kafka/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/nodejs/
+share/syslog-ng/include/scl/nodejs/plugin.conf
+share/syslog-ng/include/scl/pacct/
+share/syslog-ng/include/scl/pacct/plugin.conf
+share/syslog-ng/include/scl/rewrite/
+share/syslog-ng/include/scl/rewrite/cc-mask.conf
+share/syslog-ng/include/scl/solaris/
+share/syslog-ng/include/scl/solaris/plugin.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/tools/
+share/syslog-ng/tools/cfg-grammar.y
+share/syslog-ng/tools/lex-rules.am
+share/syslog-ng/tools/merge-grammar.pl
+share/syslog-ng/tools/system-expand.sh
+share/syslog-ng/xsd/
+share/syslog-ng/xsd/patterndb-1.xsd
+share/syslog-ng/xsd/patterndb-2.xsd
+share/syslog-ng/xsd/patterndb-3.xsd
+share/syslog-ng/xsd/patterndb-4.xsd
+share/syslog-ng/xsd/patterndb-5.xsd
@rcscript ${RCDIR}/syslog_ng
No comments:
Post a Comment