From 6e61b3b4a41ae832ef614e7b2db91e809b614ca6 Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 24 Mar 2017 21:12:59 +0000 Subject: Update 3.8.1 --> 3.9.1 Submitted by: Peter Czanik (CzP) Balabit / syslog-ng upstream --- sysutils/syslog-ng-devel/Makefile | 25 +++++++++++----------- sysutils/syslog-ng-devel/distinfo | 6 +++--- .../syslog-ng-devel/files/syslog-ng.conf.sample | 2 +- sysutils/syslog-ng-devel/pkg-plist | 17 ++++++++++++--- 4 files changed, 30 insertions(+), 20 deletions(-) (limited to 'sysutils') diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index 3760b146b1bd..58a2c7defe99 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= syslog-ng -DISTVERSION= 3.8.1 -PORTREVISION= 1 +DISTVERSION= 3.9.1 PKGNAMESUFFIX= -devel CATEGORIES= sysutils DISTFILES= syslog-ng-${DISTVERSION}.tar.gz @@ -16,7 +15,8 @@ BROKEN_sparc64= Does not compile on sparc64: gcc core dump LIB_DEPENDS= libevtlog.so:sysutils/eventlog \ libpcre.so:devel/pcre \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ + libbson-1.0.so:devel/libbson CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ syslog-ng[0-9][0-9]-[0-9]* \ @@ -76,20 +76,20 @@ SMTP_CONFIGURE_OFF= --without-libesmtp --disable-smtp SMTP_LIB_DEPENDS= libesmtp.so:mail/libesmtp SMTP_PLIST_FILES= lib/syslog-ng/libafsmtp.so -MSQL_CONFIGURE_ENABLE= sql -MSQL_LIB_DEPENDS= libdbi.so:databases/libdbi -MSQL_CONFIGURE_ENV= LIBDBI_LIBS="-ldbi" -MSQL_LDFLAGS= -L${LOCALBASE}/lib -MSQL_PLIST_FILES= lib/syslog-ng/libafsql.so +SQL_CONFIGURE_ENABLE= sql +SQL_LIB_DEPENDS= libdbi.so:databases/libdbi +SQL_CONFIGURE_ENV= LIBDBI_LIBS="-ldbi" +SQL_LDFLAGS= -L${LOCALBASE}/lib +SQL_PLIST_FILES= lib/syslog-ng/libafsql.so MONGO_CONFIGURE_ENABLE= mongodb -MONGO_BROKEN= Does not build MONGO_LIB_DEPENDS= libmongoc-1.0.so:devel/mongo-c-driver MONGO_PLIST_FILES= lib/syslog-ng/libafmongodb.so JSON_CONFIGURE_ENABLE= json JSON_LIB_DEPENDS= libjson-c.so:devel/json-c -JSON_PLIST_FILES= lib/syslog-ng/libjson-plugin.so +JSON_PLIST_FILES= lib/syslog-ng/libjson-plugin.so \ + share/syslog-ng/include/scl/cim/template.conf JAVA_CONFIGURE_ENABLE= java JAVA_USE_JAVA= yes @@ -97,7 +97,7 @@ JAVA_PLIST_FILES= lib/syslog-ng/libmod-java.so \ lib/syslog-ng/java-modules/syslog-ng-core.jar JAVA_MOD_CONFIGURE_ENABLE= java-modules -JAVA_MOD_BROKEN= Unsupported maven downloads. +# JAVA_MOD_BROKEN= Unsupported maven downloads. JAVA_MOD_USE_JAVA= yes JAVA_MOD_BUILD_DEPENDS= gradle:devel/gradle \ bash:shells/bash @@ -130,11 +130,10 @@ PYTHON_CONFIGURE_WITH= python=2.7 PYTHON_USES= python:2.7 PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so -CURL_CONFIGURE_ENABLE= curl +CURL_CONFIGURE_OFF= --with-libcurl=off CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_PLIST_FILES= lib/syslog-ng/libcurl.so - .include post-patch: diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo index b24aa84f2245..eb682ed7d48a 100644 --- a/sysutils/syslog-ng-devel/distinfo +++ b/sysutils/syslog-ng-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1471953902 -SHA256 (syslog-ng-3.8.1.tar.gz) = 84b081f6e5f98cbc52052e342bcfdc5de5fe0ebe9f5ec32fe9eaec5759224cc5 -SIZE (syslog-ng-3.8.1.tar.gz) = 8328391 +TIMESTAMP = 1489753689 +SHA256 (syslog-ng-3.9.1.tar.gz) = 5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17 +SIZE (syslog-ng-3.9.1.tar.gz) = 8312677 diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample index fdbf7b28e8d4..fbc56b7e9455 100644 --- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample @@ -1,4 +1,4 @@ -@version:3.8 +@version:3.9 @include "scl.conf" # diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist index 782cb6d8f6cc..b2f3a22f0674 100644 --- a/sysutils/syslog-ng-devel/pkg-plist +++ b/sysutils/syslog-ng-devel/pkg-plist @@ -205,8 +205,18 @@ include/syslog-ng/iv_thread.h include/syslog-ng/iv_tls.h include/syslog-ng/iv_wait.h include/syslog-ng/iv_work.h -lib/libsyslog-ng-3.8.so.0.0.0 -lib/libsyslog-ng-3.8.so.0 +include/syslog-ng/compat/openssl_support.h +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/str-repr/decode.h +include/syslog-ng/str-repr/encode.h +lib/libsyslog-ng-3.9.so.0.0.0 +lib/libsyslog-ng-3.9.so.0 lib/libsyslog-ng.so lib/libsyslog-ng-native-connector.a lib/syslog-ng/libtest/libsyslog-ng-test.a @@ -222,6 +232,7 @@ lib/syslog-ng/libafuser.so lib/syslog-ng/libafamqp.so lib/syslog-ng/libcsvparser.so lib/syslog-ng/libconfgen.so +lib/syslog-ng/libcurl.so lib/syslog-ng/libsystem-source.so lib/syslog-ng/liblinux-kmsg-format.so lib/syslog-ng/libbasicfuncs.so @@ -234,6 +245,7 @@ lib/syslog-ng/libkvformat.so libdata/pkgconfig/syslog-ng.pc libdata/pkgconfig/syslog-ng-test.pc libdata/pkgconfig/syslog-ng-native-connector.pc +libdata/pkgconfig/syslog-ng-add-contextual-data.pc man/man1/loggen.1.gz man/man1/pdbtool.1.gz man/man1/syslog-ng-ctl.1.gz @@ -250,7 +262,6 @@ share/syslog-ng/include/scl/rewrite/cc-mask.conf share/syslog-ng/include/scl/nodejs/plugin.conf share/syslog-ng/include/scl/graphite/README share/syslog-ng/include/scl/graphite/plugin.conf -share/syslog-ng/include/scl/cim/template.conf share/syslog-ng/include/scl/solaris/plugin.conf share/syslog-ng/include/scl/mbox/mbox.conf share/syslog-ng/include/scl/elasticsearch/plugin.conf -- cgit