here is a long overdue update for syslog-ng. i would appreciate if you can help to test it.
comments/feedback welcome. (i know the new shared lib and symlink hack are not yet optimal portswise, but i'd like to move forward with this update.) Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 19 Sep 2012 12:25:40 -0000 1.30 +++ Makefile 18 Nov 2012 15:42:18 -0000 @@ -2,9 +2,10 @@ COMMENT= syslogd replacement -V = 3.1.4 +SHARED_ONLY = Yes + +V = 3.3.7 DISTNAME = syslog-ng-$V -REVISION = 9 CATEGORIES = sysutils MAINTAINER = Steven Mestdagh <ste...@openbsd.org> @@ -20,45 +21,53 @@ 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 + MODULES = devel/gettext -WANTLIB = c pcre wrap crypto ssl z glib-2.0 evtlog dbi gthread-2.0 pthread +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 LIB_DEPENDS = devel/glib2 \ + devel/json-glib \ + devel/libivykis \ sysutils/eventlog \ databases/libdbi CONFIGURE_STYLE = gnu CONFIGURE_ARGS += --enable-tcp-wrapper \ --with-pidfile-dir=/var/run \ + --with-libmongo-client=no \ + --disable-mongodb \ + --with-ivykis=system \ --enable-sql CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/include/openssl" \ OPENSSL_LIBS="-lssl -lcrypto" \ LIBDBI_CFLAGS="-I/usr/include/openssl" \ LIBDBI_LIBS="-ldbi" +USE_GMAKE = Yes +USE_LIBTOOL = Yes USE_GROFF = Yes CFLAGS += -I${LOCALBASE}/include + +SUBST_VARS += V DOC = ${PREFIX}/share/doc/syslog-ng/ EXAMPLES = ${PREFIX}/share/examples/syslog-ng/ -#post-extract: -# tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz - -post-configure: - cd ${WRKSRC}/src && mv Makefile Makefile.was && \ - sed '/^syslog_ng_ctl_LDADD = /s/-lwrap //' Makefile.was > Makefile - pre-install: cd ${WRKSRC}/doc/man && perl -pi -e 's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158] post-install: -# ${INSTALL_DATA_DIR} ${DOC} -# ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC} ${INSTALL_DATA_DIR} ${EXAMPLES} ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \ ${EXAMPLES}/syslog-ng.conf.sample + rm -rf ${PREFIX}/share/{include,tools,xsd} +# XXX hack for libtool dropping -rpath + ln -s syslog-ng/libsyslog-ng-crypto.so ${PREFIX}/lib/libsyslog-ng-crypto.so .include <bsd.port.mk> CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/syslog-ng Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v retrieving revision 1.15 diff -u -r1.15 distinfo --- distinfo 1 May 2011 13:48:32 -0000 1.15 +++ distinfo 18 Nov 2012 15:42:18 -0000 @@ -1,5 +1,2 @@ -MD5 (syslog-ng_3.1.4.tar.gz) = SOZkbRLTDGVfQ5G5cNYfVg== -RMD160 (syslog-ng_3.1.4.tar.gz) = ZFIEBM98ij+D7+QdcOkbuft6g/4= -SHA1 (syslog-ng_3.1.4.tar.gz) = vBqmP96VINfWfF8fU0CAUUPPmDk= -SHA256 (syslog-ng_3.1.4.tar.gz) = n0jIRSO5F1TysdOsdg4njM4xx/5eAC1inwC3jq46jNo= -SIZE (syslog-ng_3.1.4.tar.gz) = 724071 +SHA256 (syslog-ng_3.3.7.tar.gz) = EpyR50Z1GgqedDvW4VXFwfykwusoN1FxwgsxKCK1EXs= +SIZE (syslog-ng_3.3.7.tar.gz) = 2613938 Index: files/syslog-ng.conf =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v retrieving revision 1.2 diff -u -r1.2 syslog-ng.conf --- files/syslog-ng.conf 29 May 2012 05:19:19 -0000 1.2 +++ files/syslog-ng.conf 18 Nov 2012 15:42:18 -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.0 +@version: 3.3 options { use_dns(no); Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile_in --- patches/patch-Makefile_in 24 Sep 2010 17:54:16 -0000 1.4 +++ patches/patch-Makefile_in 18 Nov 2012 15:42:18 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2010/09/24 17:54:16 steven Exp $ ---- Makefile.in.orig Mon Aug 2 17:26:31 2010 -+++ Makefile.in Wed Aug 4 19:55:04 2010 -@@ -218,7 +218,7 @@ timezonedir = @timezonedir@ +$OpenBSD: patch-Makefile_in,v 1.3 2010/05/03 20:51:17 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 = src scripts tests doc contrib debian tgz2build -+SUBDIRS = src scripts doc contrib debian tgz2build +-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.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog syslog-ng.pc.in Index: patches/patch-doc_man_syslog-ng_conf_5 =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-doc_man_syslog-ng_conf_5,v retrieving revision 1.1 diff -u -r1.1 patch-doc_man_syslog-ng_conf_5 --- patches/patch-doc_man_syslog-ng_conf_5 28 May 2012 16:31:31 -0000 1.1 +++ patches/patch-doc_man_syslog-ng_conf_5 18 Nov 2012 15:42:18 -0000 @@ -1,11 +1,12 @@ -$OpenBSD: patch-doc_man_syslog-ng_conf_5,v 1.1 2012/05/28 16:31:31 ajacoutot Exp $ +$OpenBSD$ Runs syslog-ng.conf(5) through tbl(1). ---- doc/man/syslog-ng.conf.5.orig Sat May 26 11:23:41 2012 -+++ doc/man/syslog-ng.conf.5 Sat May 26 11:23:45 2012 -@@ -1,3 +1,4 @@ +--- doc/man/syslog-ng.conf.5.orig Sun Aug 19 18:27:24 2012 ++++ doc/man/syslog-ng.conf.5 Sun Oct 14 18:12:26 2012 +@@ -1,4 +1,5 @@ + '\" t +'\" t .\" Title: syslog-ng.conf - .\" Author: - .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> + .\" Author: [see the "Author" section] + .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_Makefile_in 18 Nov 2012 15:42:18 -0000 @@ -0,0 +1,14 @@ +temporary hack until libtool is fixed. + +$OpenBSD$ +--- lib/Makefile.in.orig Sun Nov 18 08:41:17 2012 ++++ lib/Makefile.in Sun Nov 18 08:42:11 2012 +@@ -127,7 +127,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph + rewrite-expr-grammar.lo + 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 $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp Index: patches/patch-lib_mainloop_c =================================================================== RCS file: patches/patch-lib_mainloop_c diff -N patches/patch-lib_mainloop_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_mainloop_c 18 Nov 2012 15:42:18 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- lib/mainloop.c.orig Sun Oct 14 19:01:34 2012 ++++ lib/mainloop.c Sun Oct 14 19:01:43 2012 +@@ -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> + Index: patches/patch-modules_Makefile_in =================================================================== RCS file: patches/patch-modules_Makefile_in diff -N patches/patch-modules_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-modules_Makefile_in 18 Nov 2012 15:42:18 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- 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: pkg/PLIST =================================================================== RCS file: /cvs/ports/sysutils/syslog-ng/pkg/PLIST,v retrieving revision 1.9 diff -u -r1.9 PLIST --- pkg/PLIST 14 Sep 2011 02:34:06 -0000 1.9 +++ pkg/PLIST 18 Nov 2012 15:42:18 -0000 @@ -1,7 +1,110 @@ -@comment $OpenBSD: PLIST,v 1.9 2011/09/14 02:34:06 william Exp $ +@comment $OpenBSD: PLIST,v 1.8 2010/09/24 17:54:16 steven Exp $ @bin bin/pdbtool bin/update-patterndb +include/syslog-ng/ +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/center.h +include/syslog-ng/cfg-grammar.h +include/syslog-ng/cfg-lexer.h +include/syslog-ng/cfg-parser.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/filter-expr-parser.h +include/syslog-ng/filter.h +include/syslog-ng/gprocess.h +include/syslog-ng/gsockaddr.h +include/syslog-ng/gsocket.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/logprocess.h +include/syslog-ng/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/logtransport.h +include/syslog-ng/logwriter.h +include/syslog-ng/mainloop.h +include/syslog-ng/memtrace.h +include/syslog-ng/messages.h +include/syslog-ng/misc.h +include/syslog-ng/msg-format.h +include/syslog-ng/nvtable.h +include/syslog-ng/parser-expr-parser.h +include/syslog-ng/persist-state.h +include/syslog-ng/plugin.h +include/syslog-ng/pragma-parser.h +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 +include/syslog-ng/syslog-ng.h +include/syslog-ng/tags.h +include/syslog-ng/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/utils.h +include/syslog-ng/value-pairs.h +@lib lib/libsyslog-ng-3.3.7.so.${LIBsyslog-ng-3.3.7_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 +@comment 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/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/libsyslog-ng-crypto.so +lib/syslog-ng/libsyslogformat.la +lib/syslog-ng/libsyslogformat.so +lib/syslog-ng/libtfjson.la +lib/syslog-ng/libtfjson.so +@man man/man1/loggen.1 @man man/man1/pdbtool.1 +@man man/man1/syslog-ng-ctl.1 @man man/man5/syslog-ng.conf.5 @man man/man8/syslog-ng.8 @bin sbin/syslog-ng
