Stuart Henderson [2015-07-17, 00:09:46]: > On 2015/07/16 22:49, Steven Mestdagh wrote: > > Update to 3.6.4. > > > > I was getting certificate errors on fetch, hence the modified FETCH_CMD. > > > > The certificate seems fine however in firefox/chromium. Looks like we do not > > yet have the NetLock CA in our cert.pem and it needs to be added? > > FETCH_CMD can't be set in a port Makefile, we either need to mirror the > distfile or add the cert to cert.pem.
we'll go with the latter option, i will add the cert soon. here's the updated diff. Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v retrieving revision 1.52 diff -u -p -u -r1.52 Makefile --- Makefile 18 Jul 2015 21:39:05 -0000 1.52 +++ Makefile 19 Jul 2015 15:13:26 -0000 @@ -4,10 +4,10 @@ COMMENT= syslogd replacement SHARED_ONLY = Yes -V = 3.5.6 +V = 3.6.4 +REL = 3.6 DISTNAME = syslog-ng-$V CATEGORIES = sysutils -REVISION = 1 MAINTAINER = Steven Mestdagh <ste...@openbsd.org> @@ -19,8 +19,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 1.0 \ - syslog-ng-${V} 1.0 +SHARED_LIBS = syslog-ng 2.0 \ + syslog-ng-${REL} 2.0 MODULES = devel/gettext @@ -45,7 +45,8 @@ CONFIGURE_ARGS += --disable-tcp-wrapper --disable-geoip \ --without-libnet \ --with-ivykis=system \ - --enable-sql + --enable-sql \ + --enable-manpages CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \ OPENSSL_LIBS="-lssl -lcrypto" \ LIBDBI_CFLAGS="-I/usr/include/openssl" \ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v retrieving revision 1.22 diff -u -p -u -r1.22 distinfo --- distinfo 31 Dec 2014 11:33:56 -0000 1.22 +++ distinfo 19 Jul 2015 15:13:26 -0000 @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY= -SIZE (syslog-ng_3.5.6.tar.gz) = 3001992 +SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc= +SIZE (syslog-ng_3.6.4.tar.gz) = 3276432 Index: files/syslog-ng.conf =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v retrieving revision 1.7 diff -u -p -u -r1.7 syslog-ng.conf --- files/syslog-ng.conf 18 Jul 2015 21:39:05 -0000 1.7 +++ files/syslog-ng.conf 19 Jul 2015 15:13:26 -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.5 +@version: 3.6 options { use_dns(no); Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v retrieving revision 1.7 diff -u -p -u -r1.7 patch-Makefile_in --- patches/patch-Makefile_in 31 Dec 2014 11:33:56 -0000 1.7 +++ patches/patch-Makefile_in 19 Jul 2015 15:13:26 -0000 @@ -1,10 +1,10 @@ $OpenBSD: patch-Makefile_in,v 1.7 2014/12/31 11:33:56 steven Exp $ 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) - +--- Makefile.in.orig Mon Jun 8 15:44:57 2015 ++++ Makefile.in Sat Jun 20 10:10:42 2015 +@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo: \ + lib/transport/$(am__dirstamp) \ + lib/transport/$(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) Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-configure --- patches/patch-configure 31 Dec 2014 11:33:56 -0000 1.2 +++ patches/patch-configure 19 Jul 2015 15:13:26 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-configure,v 1.2 2014/12/31 11:33:56 steven Exp $ do not pick up libuuid ---- configure.orig Tue Oct 28 07:38:54 2014 -+++ configure Tue Oct 28 07:40:00 2014 -@@ -15854,6 +15854,7 @@ fi +--- configure.orig Fri Jun 19 13:24:21 2015 ++++ configure Thu Jul 16 22:22:03 2015 +@@ -16400,6 +16400,7 @@ fi else pkg_failed=untried fi Index: patches/patch-lib_compat_getutent_h =================================================================== RCS file: patches/patch-lib_compat_getutent_h diff -N patches/patch-lib_compat_getutent_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_compat_getutent_h 19 Jul 2015 15:13:26 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- lib/compat/getutent.h.orig Fri Jan 2 21:32:48 2015 ++++ lib/compat/getutent.h Fri Jan 2 21:32:57 2015 +@@ -26,6 +26,7 @@ + #define COMPAT_GETUTENT_H_INCLUDED + + #include <inttypes.h> ++#include <time.h> + #include "compat/compat.h" + + #ifdef HAVE_UTMPX_H Index: patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-modules_afmongodb_libmongo-client_src_mongo-utils_c --- patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c 30 Nov 2013 10:02:12 -0000 1.1 +++ patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c 19 Jul 2015 15:13:26 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_afmongodb_libmongo-client_src_mongo-utils_c,v 1.1 2013/11/30 10:02:12 steven Exp $ ---- modules/afmongodb/libmongo-client/src/mongo-utils.c.orig Fri Jun 14 08:00:37 2013 -+++ modules/afmongodb/libmongo-client/src/mongo-utils.c Tue Sep 24 01:44:07 2013 -@@ -38,8 +38,7 @@ mongo_util_oid_init (gint32 mid) +$OpenBSD$ +--- 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) { Index: patches/patch-modules_afsocket_transport-unix-socket_c =================================================================== RCS file: patches/patch-modules_afsocket_transport-unix-socket_c diff -N patches/patch-modules_afsocket_transport-unix-socket_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-modules_afsocket_transport-unix-socket_c 19 Jul 2015 15:13:26 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- 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 +@@ -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 Index: patches/patch-modules_syslogformat_syslog-format_c =================================================================== RCS file: patches/patch-modules_syslogformat_syslog-format_c diff -N patches/patch-modules_syslogformat_syslog-format_c --- patches/patch-modules_syslogformat_syslog-format_c 21 Nov 2014 08:10:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ -$OpenBSD: patch-modules_syslogformat_syslog-format_c,v 1.1 2014/11/21 08:10:48 jasper Exp $ - -From e6aeb3e21bbcfed3137a558449222c6a4bca7c7b Mon Sep 17 00:00:00 2001 -From: Budai Laszlo <laszlo.bu...@balabit.com> -Date: Thu, 20 Nov 2014 10:17:39 +0100 -Subject: [PATCH] timeutils: fix bad pointer cast that leads to timestamp overwriting - -https://github.com/balabit/syslog-ng/pull/305 - ---- modules/syslogformat/syslog-format.c.orig Fri Jun 6 12:50:49 2014 -+++ modules/syslogformat/syslog-format.c Thu Nov 20 01:35:02 2014 -@@ -245,6 +245,7 @@ log_msg_parse_date(LogMessage *self, const guchar **da - { - /* RFC3339 timestamp, expected format: YYYY-MM-DDTHH:MM:SS[.frac]<+/->ZZ:ZZ */ - gint hours, mins; -+ time_t now_tv_sec = (time_t)now.tv_sec; - - self->timestamps[LM_TS_STAMP].tv_usec = 0; - -@@ -253,7 +254,7 @@ log_msg_parse_date(LogMessage *self, const guchar **da - * not exist on all platforms and 0 initializing it causes trouble on - * time-zone barriers */ - -- cached_localtime(&now.tv_sec, &tm); -+ cached_localtime(&now_tv_sec, &tm); - if (!scan_iso_timestamp((const gchar **) &src, &left, &tm)) - { - goto error; -@@ -315,8 +316,8 @@ log_msg_parse_date(LogMessage *self, const guchar **da - { - /* PIX timestamp, expected format: MMM DD YYYY HH:MM:SS: */ - /* ASA timestamp, expected format: MMM DD YYYY HH:MM:SS */ -- -- cached_localtime(&now.tv_sec, &tm); -+ time_t now_tv_sec = (time_t)now.tv_sec; -+ cached_localtime(&now_tv_sec, &tm); - if (!scan_pix_timestamp((const gchar **) &src, &left, &tm)) - goto error; - -@@ -338,7 +339,8 @@ log_msg_parse_date(LogMessage *self, const guchar **da - { - /* LinkSys timestamp, expected format: MMM DD HH:MM:SS YYYY */ - -- cached_localtime(&now.tv_sec, &tm); -+ time_t now_tv_sec = (time_t)now.tv_sec; -+ cached_localtime(&now_tv_sec, &tm); - if (!scan_linksys_timestamp((const gchar **) &src, &left, &tm)) - goto error; - tm.tm_isdst = -1; -@@ -354,8 +356,8 @@ log_msg_parse_date(LogMessage *self, const guchar **da - /* RFC 3164 timestamp, expected format: MMM DD HH:MM:SS ... */ - struct tm nowtm; - glong usec = 0; -- -- cached_localtime(&now.tv_sec, &nowtm); -+ time_t now_tv_sec = (time_t)now.tv_sec; -+ cached_localtime(&now_tv_sec, &nowtm); - tm = nowtm; - if (!scan_bsd_timestamp((const gchar **) &src, &left, &tm)) - goto error; -@@ -879,7 +881,7 @@ log_msg_parse_legacy(const MsgFormatOptions *parse_opt - log_msg_parse_seq(self, &src, &left); - log_msg_parse_skip_chars(self, &src, &left, " ", -1); - cached_g_current_time(&now); -- if (log_msg_parse_date(self, &src, &left, parse_options->flags & ~LP_SYSLOG_PROTOCOL, time_zone_info_get_offset(parse_options->recv_time_zone_info, now.tv_sec))) -+ if (log_msg_parse_date(self, &src, &left, parse_options->flags & ~LP_SYSLOG_PROTOCOL, time_zone_info_get_offset(parse_options->recv_time_zone_info, (time_t)now.tv_sec))) - { - /* Expected format: hostname program[pid]: */ - /* Possibly: Message forwarded from hostname: ... */ Index: patches/patch-syslog-ng-ctl_control-client-unix_c =================================================================== RCS file: patches/patch-syslog-ng-ctl_control-client-unix_c diff -N patches/patch-syslog-ng-ctl_control-client-unix_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-syslog-ng-ctl_control-client-unix_c 19 Jul 2015 15:13:26 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- syslog-ng-ctl/control-client-unix.c.orig Sat Jun 20 10:10:49 2015 ++++ syslog-ng-ctl/control-client-unix.c Sat Jun 20 10:11:00 2015 +@@ -22,6 +22,7 @@ + * + */ + ++#include <string.h> + #include "control-client.h" + #include "gsocket.h" + #include "stdio.h" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v retrieving revision 1.19 diff -u -p -u -r1.19 PLIST --- pkg/PLIST 31 Dec 2014 11:33:56 -0000 1.19 +++ pkg/PLIST 19 Jul 2015 15:13:26 -0000 @@ -3,11 +3,14 @@ @bin bin/pdbtool bin/update-patterndb include/syslog-ng/ +include/syslog-ng/ack_tracker.h include/syslog-ng/afinter.h include/syslog-ng/alarms.h include/syslog-ng/apphook.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-grammar.h include/syslog-ng/cfg-lexer-subst.h @@ -16,8 +19,18 @@ include/syslog-ng/cfg-parser.h include/syslog-ng/cfg-tree.h include/syslog-ng/cfg.h include/syslog-ng/children.h -include/syslog-ng/compat.h -include/syslog-ng/control.h +include/syslog-ng/compat/ +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/pio.h +include/syslog-ng/compat/socket.h +include/syslog-ng/compat/string.h +include/syslog-ng/compat/time.h +include/syslog-ng/control/ +include/syslog-ng/control/control-server.h +include/syslog-ng/control/control.h include/syslog-ng/crypto.h include/syslog-ng/dnscache.h include/syslog-ng/driver.h @@ -37,9 +50,12 @@ 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/host-resolve.h +include/syslog-ng/hostname.h include/syslog-ng/libtest/ 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 @@ -67,8 +83,10 @@ include/syslog-ng/logreader.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-call.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 @@ -80,38 +98,62 @@ 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/pathutils.h include/syslog-ng/persist-state.h +include/syslog-ng/persistable-state-header.h +include/syslog-ng/persistable-state-presenter.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/presented-persistable-state.h +include/syslog-ng/rcptid.h +include/syslog-ng/reloc.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-groupset.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/ringbuffer.h +include/syslog-ng/run-id.h include/syslog-ng/scratch-buffers.h include/syslog-ng/serialize.h -include/syslog-ng/stats.h +include/syslog-ng/service-management.h +include/syslog-ng/stats/ +include/syslog-ng/stats/stats-cluster.h +include/syslog-ng/stats/stats-counter.h +include/syslog-ng/stats/stats-csv.h +include/syslog-ng/stats/stats-log.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/syslog-names.h include/syslog-ng/syslog-ng.h include/syslog-ng/tags.h include/syslog-ng/template/ include/syslog-ng/template/templates.h +include/syslog-ng/thread-utils.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/transport/ +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 +include/syslog-ng/transport/transport-tls.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.5.6.so.${LIBsyslog-ng-3.5.6_VERSION} +@lib lib/libsyslog-ng-3.6.so.${LIBsyslog-ng-3.6_VERSION} lib/libsyslog-ng.a lib/libsyslog-ng.la @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION} @@ -130,8 +172,10 @@ lib/syslog-ng/libconfgen.so lib/syslog-ng/libcryptofuncs.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libdbparser.so +lib/syslog-ng/libgraphite.so lib/syslog-ng/libjson-plugin.so lib/syslog-ng/liblinux-kmsg-format.so +lib/syslog-ng/libpseudofile.so lib/syslog-ng/libsyslog-ng-crypto.so lib/syslog-ng/libsyslogformat.so lib/syslog-ng/libsystem-source.so
