On Wed, Oct 09, 2013 at 11:47:34PM +0200, Steven Mestdagh wrote:
> Steven Mestdagh [2013-10-05, 10:07:35]:
> > this moves syslog-ng to the 3.4 branch.
> > i've tried it only on amd64 so far.
> >
> > please test/comment/ok.
>
> received no feedback yet. new diff integrating David Hill's patches below.
I dont use it so cant comment on itself, but portswise it looks good to
me. Only a small question: how come the .la files are not installed
anymore ? I dont see any change into libtool calls besides the version
fixing patch, and usually it installs them by default and we @comment
them or remove them in post-install.
Landry
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
> retrieving revision 1.37
> diff -u -r1.37 Makefile
> --- Makefile 19 Jun 2013 20:26:05 -0000 1.37
> +++ Makefile 9 Oct 2013 21:43:38 -0000
> @@ -4,7 +4,7 @@
>
> SHARED_ONLY = Yes
>
> -V = 3.3.11
> +V = 3.4.3
> DISTNAME = syslog-ng-$V
> CATEGORIES = sysutils
>
> @@ -23,12 +23,11 @@
>
> MODULES = devel/gettext
>
> -WANTLIB = c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
> - gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
> - json-glib-1.0
> +WANTLIB = c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
> + glib-2.0 gmodule-2.0 gthread-2.0 json-c
>
> LIB_DEPENDS = devel/glib2 \
> - devel/json-glib \
> + devel/json-c \
> devel/libivykis \
> sysutils/eventlog \
> databases/libdbi
> @@ -36,9 +35,11 @@
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS += --enable-tcp-wrapper \
> --with-pidfile-dir=/var/run \
> - --with-json=json-glib \
> + --enable-json \
> --with-libmongo-client=no \
> --disable-mongodb \
> + --disable-amqp \
> + --without-libnet \
> --with-ivykis=system \
> --enable-sql
> CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
> retrieving revision 1.19
> diff -u -r1.19 distinfo
> --- distinfo 19 Jun 2013 20:26:05 -0000 1.19
> +++ distinfo 9 Oct 2013 21:43:38 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (syslog-ng_3.3.11.tar.gz) =
> fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
> -SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
> +SHA256 (syslog-ng_3.4.3.tar.gz) =
> igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
> +SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
> Index: files/syslog-ng.conf
> ===================================================================
> RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
> retrieving revision 1.3
> diff -u -r1.3 syslog-ng.conf
> --- files/syslog-ng.conf 28 Nov 2012 07:04:36 -0000 1.3
> +++ files/syslog-ng.conf 9 Oct 2013 21:43:38 -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.3
> +@version: 3.4
>
> options {
> use_dns(no);
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 28 Nov 2012 07:04:36 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
> ---- Makefile.in.orig Tue Oct 30 17:58:59 2012
> -+++ Makefile.in Fri Nov 9 07:44:55 2012
> -@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
> - top_build_prefix = @top_build_prefix@
> - top_builddir = @top_builddir@
> - top_srcdir = @top_srcdir@
> --SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian
> tgz2build build
> -+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build
> build
> - ACLOCAL_AMFLAGS = -I m4 --install
> - EXTRA_DIST = VERSION \
> - syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog
> syslog-ng.pc.in
> Index: patches/patch-lib_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
> retrieving revision 1.2
> diff -u -r1.2 patch-lib_Makefile_in
> --- patches/patch-lib_Makefile_in 18 Jan 2013 19:09:08 -0000 1.2
> +++ patches/patch-lib_Makefile_in 9 Oct 2013 21:43:38 -0000
> @@ -1,14 +1,14 @@
> -temporary hack until libtool is fixed.
> -
> $OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
> ---- lib/Makefile.in.orig Thu Jan 17 10:27:17 2013
> -+++ lib/Makefile.in Fri Jan 18 19:26:49 2013
> -@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
> - rewrite-expr-grammar.lo $(am__objects_2)
> +temporary hack until libtool is fixed.
> +--- lib/Makefile.in.orig Tue Aug 13 11:29:11 2013
> ++++ lib/Makefile.in Mon Sep 23 22:25:03 2013
> +@@ -200,7 +200,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) --tag=CC $(AM_LIBTOOLFLAGS) \
> -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
> -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS)
> -version-info 0:0:0 \
> - $(libsyslog_ng_la_LDFLAGS) $(LDFLAGS) -o $@
> + 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 $@
> DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
> depcomp = $(SHELL) $(top_srcdir)/depcomp
> Index: patches/patch-lib_gsockaddr_c
> ===================================================================
> RCS file: patches/patch-lib_gsockaddr_c
> diff -N patches/patch-lib_gsockaddr_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-lib_gsockaddr_c 9 Oct 2013 21:43:38 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- 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-lib_mainloop_c
> ===================================================================
> RCS file: patches/patch-lib_mainloop_c
> diff -N patches/patch-lib_mainloop_c
> --- patches/patch-lib_mainloop_c 18 Jan 2013 19:09:08 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-lib_mainloop_c,v 1.2 2013/01/18 19:09:08 steven Exp $
> ---- lib/mainloop.c.orig Thu Jan 17 10:25:17 2013
> -+++ lib/mainloop.c Fri Jan 18 19:26:49 2013
> -@@ -41,6 +41,7 @@
> - #include <arpa/nameser.h>
> - #include <resolv.h>
> - #include <iv.h>
> -+#include <iv_event.h>
> - #include <iv_signal.h>
> - #include <iv_work.h>
> - #include <iv_event.h>
> Index: patches/patch-libtest_mock-transport_c
> ===================================================================
> RCS file: patches/patch-libtest_mock-transport_c
> diff -N patches/patch-libtest_mock-transport_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-libtest_mock-transport_c 9 Oct 2013 21:43:38 -0000
> @@ -0,0 +1,12 @@
> +$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
> +@@ -26,6 +26,7 @@
> + #include "gsockaddr.h"
> +
> + #include <string.h>
> ++#include <sys/uio.h>
> +
> + typedef struct
> + {
> Index: patches/patch-modules_Makefile_in
> ===================================================================
> RCS file: patches/patch-modules_Makefile_in
> diff -N patches/patch-modules_Makefile_in
> --- patches/patch-modules_Makefile_in 28 Nov 2012 07:04:36 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-modules_Makefile_in,v 1.1 2012/11/28 07:04:36 steven Exp $
> ---- modules/Makefile.in.orig Tue Oct 30 17:58:56 2012
> -+++ modules/Makefile.in Fri Nov 9 07:44:56 2012
> -@@ -283,7 +283,7 @@ timezonedir = @timezonedir@
> - top_build_prefix = @top_build_prefix@
> - top_builddir = @top_builddir@
> - top_srcdir = @top_srcdir@
> --SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb csvparser
> confgen syslogformat pacctformat basicfuncs convertfuncs dbparser tfjson dummy
> -+SUBDIRS = afsocket afsql afstreams affile afprog afuser csvparser confgen
> syslogformat pacctformat basicfuncs convertfuncs dbparser tfjson dummy
> - all: all-recursive
> -
> - .SUFFIXES:
> 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
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-modules_afmongodb_libmongo-client_src_mongo-utils_c 9 Oct
> 2013 21:43:38 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +--- 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)
> +
> + if (mid == 0)
> + {
> +- srand (time (NULL));
> +- machine_id = rand ();
> ++ machine_id = arc4random();
> + }
> + else
> + machine_id = mid;
> Index: patches/patch-modules_dbparser_patternize_c
> ===================================================================
> RCS file: patches/patch-modules_dbparser_patternize_c
> diff -N patches/patch-modules_dbparser_patternize_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-modules_dbparser_patternize_c 9 Oct 2013 21:43:38
> -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +--- 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
> + msg_progress("Finding frequent words",
> + evt_tag_str("phase", "caching"),
> + NULL);
> +- srand(time(NULL));
> + cachesize = (guint) ((logs->len * PTZ_WORDLIST_CACHE));
> +- cacheseed = rand();
> ++ cacheseed = arc4random();
> + wordlist_cache = g_new0(int, cachesize);
> + }
> + else
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -r1.13 PLIST
> --- pkg/PLIST 19 Jun 2013 20:26:05 -0000 1.13
> +++ pkg/PLIST 9 Oct 2013 21:43:38 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.13 2013/06/19 20:26:05 steven Exp $
> +@bin bin/loggen
> @bin bin/pdbtool
> bin/update-patterndb
> include/syslog-ng/
> @@ -7,18 +8,20 @@
> include/syslog-ng/apphook.h
> include/syslog-ng/atomic.h
> include/syslog-ng/block-ref-parser.h
> -include/syslog-ng/center.h
> +include/syslog-ng/cfg-args.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-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/crypto.h
> -include/syslog-ng/dgroup.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/gprocess.h
> @@ -29,7 +32,16 @@
> include/syslog-ng/logmsg.h
> include/syslog-ng/logparser.h
> include/syslog-ng/logpipe.h
> -include/syslog-ng/logprocess.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/logqueue-fifo.h
> include/syslog-ng/logqueue.h
> @@ -43,6 +55,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/msg-format.h
> include/syslog-ng/nvtable.h
> include/syslog-ng/parser-expr-parser.h
> @@ -52,7 +65,6 @@
> include/syslog-ng/rewrite-expr-parser.h
> include/syslog-ng/scratch-buffers.h
> include/syslog-ng/serialize.h
> -include/syslog-ng/sgroup.h
> include/syslog-ng/stats.h
> include/syslog-ng/str-format.h
> include/syslog-ng/syslog-names.h
> @@ -64,44 +76,32 @@
> include/syslog-ng/tlscontext.h
> include/syslog-ng/tlstransport.h
> include/syslog-ng/utils.h
> +include/syslog-ng/uuid.h
> include/syslog-ng/value-pairs.h
> -@lib lib/libsyslog-ng-3.3.11.so.${LIBsyslog-ng-3.3.11_VERSION}
> +include/syslog-ng/versioning.h
> +include/syslog-ng/vptransform.h
> +@lib lib/libsyslog-ng-3.4.3.so.${LIBsyslog-ng-3.4.3_VERSION}
> lib/libsyslog-ng-crypto.so
> lib/libsyslog-ng.la
> @lib lib/libsyslog-ng.so.${LIBsyslog-ng_VERSION}
> lib/pkgconfig/syslog-ng.pc
> lib/syslog-ng/
> -lib/syslog-ng/libaffile.la
> lib/syslog-ng/libaffile.so
> -lib/syslog-ng/libafprog.la
> lib/syslog-ng/libafprog.so
> -lib/syslog-ng/libafsocket-notls.la
> lib/syslog-ng/libafsocket-notls.so
> -lib/syslog-ng/libafsocket-tls.la
> lib/syslog-ng/libafsocket-tls.so
> lib/syslog-ng/libafsocket.so
> -lib/syslog-ng/libafsql.la
> lib/syslog-ng/libafsql.so
> -lib/syslog-ng/libafuser.la
> lib/syslog-ng/libafuser.so
> -lib/syslog-ng/libbasicfuncs.la
> lib/syslog-ng/libbasicfuncs.so
> -lib/syslog-ng/libconfgen.la
> lib/syslog-ng/libconfgen.so
> -lib/syslog-ng/libconvertfuncs.la
> -lib/syslog-ng/libconvertfuncs.so
> -lib/syslog-ng/libcsvparser.la
> +lib/syslog-ng/libcryptofuncs.so
> lib/syslog-ng/libcsvparser.so
> -lib/syslog-ng/libdbparser.la
> lib/syslog-ng/libdbparser.so
> -lib/syslog-ng/libdummy.la
> -lib/syslog-ng/libdummy.so
> -lib/syslog-ng/libsyslog-ng-crypto.la
> +lib/syslog-ng/libjson-plugin.so
> lib/syslog-ng/libsyslog-ng-crypto.so
> -lib/syslog-ng/libsyslogformat.la
> lib/syslog-ng/libsyslogformat.so
> -lib/syslog-ng/libtfjson.la
> -lib/syslog-ng/libtfjson.so
> +lib/syslog-ng/libsystem-source.so
> @man man/man1/loggen.1
> @man man/man1/pdbtool.1
> @man man/man1/syslog-ng-ctl.1
>
