Predrag Punosevac [2016-03-27, 00:21:26]: > Dear Mr. Mestdagh, > > What is the reason syslog-ng is not updated to 3.7.1? Is branch 3.7 > still considered unstable for use on OpenBSD or there are some other > problems in updating the existing 3.6.4 port. >
please try the following diff. Index: syslog-ng/Makefile =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v retrieving revision 1.54 diff -u -p -u -r1.54 Makefile --- syslog-ng/Makefile 18 Mar 2016 21:38:25 -0000 1.54 +++ syslog-ng/Makefile 3 Apr 2016 18:55:01 -0000 @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.54 2016/03/18 21:38:25 naddy Exp $ +# $OpenBSD: Makefile,v 1.53 2015/07/21 20:29:34 steven Exp $ COMMENT= syslogd replacement -V = 3.6.4 -REL = 3.6 +V = 3.7.2 +REL = 3.7 DISTNAME = syslog-ng-$V CATEGORIES = sysutils @@ -14,11 +14,12 @@ HOMEPAGE = http://www.balabit.com/networ # GPL v2 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 +#MASTER_SITES = http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/ +MASTER_SITES = http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/ +#DISTFILES = syslog-ng_$V.tar.gz -SHARED_LIBS = syslog-ng 2.0 \ - syslog-ng-${REL} 2.0 +SHARED_LIBS = syslog-ng 3.0 \ + syslog-ng-${REL} 3.0 MODULES = devel/gettext @@ -37,6 +38,7 @@ CONFIGURE_ARGS += --disable-tcp-wrapper --enable-json \ --with-libmongo-client=no \ --with-librabbitmq-client=no \ + --disable-python \ --disable-mongodb \ --disable-amqp \ --disable-stomp \ Index: syslog-ng/distinfo =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v retrieving revision 1.23 diff -u -p -u -r1.23 distinfo --- syslog-ng/distinfo 21 Jul 2015 20:29:34 -0000 1.23 +++ syslog-ng/distinfo 3 Apr 2016 18:55:01 -0000 @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc= -SIZE (syslog-ng_3.6.4.tar.gz) = 3276432 +SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU= +SIZE (syslog-ng-3.7.2.tar.gz) = 3558377 Index: syslog-ng/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v retrieving revision 1.8 diff -u -p -u -r1.8 patch-Makefile_in --- syslog-ng/patches/patch-Makefile_in 21 Jul 2015 20:29:34 -0000 1.8 +++ syslog-ng/patches/patch-Makefile_in 3 Apr 2016 18:55:01 -0000 @@ -1,10 +1,10 @@ $OpenBSD: patch-Makefile_in,v 1.8 2015/07/21 20:29:34 steven Exp $ temporary hack until libtool is fixed. ---- 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) +--- 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) + 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: syslog-ng/patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-configure --- syslog-ng/patches/patch-configure 21 Jul 2015 20:29:34 -0000 1.3 +++ syslog-ng/patches/patch-configure 3 Apr 2016 18:55:01 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.3 2015/07/21 20:29:34 steven Exp $ -do not pick up libuuid ---- configure.orig Fri Jun 19 13:24:21 2015 -+++ configure Thu Jul 16 22:22:03 2015 -@@ -16400,6 +16400,7 @@ fi +$OpenBSD$ +--- configure.orig Sun Apr 3 20:18:45 2016 ++++ configure Sun Apr 3 20:19:27 2016 +@@ -16790,7 +16790,7 @@ fi else pkg_failed=untried fi +- +pkg_failed=yes - + if test $pkg_failed = yes; then Index: syslog-ng/patches/patch-lib_compat_getutent_h =================================================================== RCS file: syslog-ng/patches/patch-lib_compat_getutent_h diff -N syslog-ng/patches/patch-lib_compat_getutent_h --- syslog-ng/patches/patch-lib_compat_getutent_h 21 Jul 2015 20:29:34 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-lib_compat_getutent_h,v 1.1 2015/07/21 20:29:34 steven Exp $ ---- 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: syslog-ng/patches/patch-lib_tlscontext_c =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_tlscontext_c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-lib_tlscontext_c --- syslog-ng/patches/patch-lib_tlscontext_c 23 May 2014 12:53:01 -0000 1.1 +++ syslog-ng/patches/patch-lib_tlscontext_c 3 Apr 2016 18:55:01 -0000 @@ -1,8 +1,8 @@ -$OpenBSD: patch-lib_tlscontext_c,v 1.1 2014/05/23 12:53:01 sthen Exp $ ---- lib/tlscontext.c.orig Fri May 23 13:43:20 2014 -+++ lib/tlscontext.c Fri May 23 13:43:39 2014 -@@ -28,6 +28,7 @@ - #if ENABLE_SSL +$OpenBSD$ +--- 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> Index: syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-syslog-ng-ctl_control-client-unix_c --- syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c 21 Jul 2015 20:29:34 -0000 1.1 +++ syslog-ng/patches/patch-syslog-ng-ctl_control-client-unix_c 3 Apr 2016 18:55:01 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-syslog-ng-ctl_control-client-unix_c,v 1.1 2015/07/21 20:29:34 steven Exp $ ---- 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 +--- 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 @@ * */ @@ -8,4 +8,4 @@ $OpenBSD: patch-syslog-ng-ctl_control-cl +#include <string.h> #include "control-client.h" #include "gsocket.h" - #include "stdio.h" + Index: syslog-ng/pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v retrieving revision 1.20 diff -u -p -u -r1.20 PLIST --- syslog-ng/pkg/PLIST 21 Jul 2015 20:29:34 -0000 1.20 +++ syslog-ng/pkg/PLIST 3 Apr 2016 18:55:01 -0000 @@ -32,6 +32,10 @@ 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/debugger/ +include/syslog-ng/debugger/debugger-main.h +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/file-perms.h @@ -42,6 +46,7 @@ include/syslog-ng/filter/filter-expr-par 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-netmask6.h include/syslog-ng/filter/filter-op.h include/syslog-ng/filter/filter-pipe.h include/syslog-ng/filter/filter-pri.h @@ -50,6 +55,7 @@ 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-id.h include/syslog-ng/host-resolve.h include/syslog-ng/hostname.h include/syslog-ng/libtest/ @@ -92,6 +98,7 @@ 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/msg-format.h include/syslog-ng/nvtable.h include/syslog-ng/parse-number.h @@ -131,11 +138,20 @@ 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/syslog-names.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 +include/syslog-ng/template/escaping.h +include/syslog-ng/template/function.h +include/syslog-ng/template/macros.h +include/syslog-ng/template/repr.h +include/syslog-ng/template/simple-function.h 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/tls-support.h @@ -149,11 +165,12 @@ 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/utf8utils.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.6.so.${LIBsyslog-ng-3.6_VERSION} +@lib lib/libsyslog-ng-3.7.so.${LIBsyslog-ng-3.7_VERSION} lib/libsyslog-ng.a lib/libsyslog-ng.la @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION} @@ -162,8 +179,6 @@ lib/pkgconfig/syslog-ng.pc lib/syslog-ng/ lib/syslog-ng/libaffile.so lib/syslog-ng/libafprog.so -lib/syslog-ng/libafsocket-notls.so -lib/syslog-ng/libafsocket-tls.so lib/syslog-ng/libafsocket.so lib/syslog-ng/libafsql.so lib/syslog-ng/libafuser.so @@ -174,9 +189,9 @@ lib/syslog-ng/libcsvparser.so lib/syslog-ng/libdbparser.so lib/syslog-ng/libgraphite.so lib/syslog-ng/libjson-plugin.so +lib/syslog-ng/libkvformat.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 lib/syslog-ng/libtest/
