Update 3.9.1 --> 3.10.1

Submitted by:	Peter Czanik (CzP) <peter.czanik@balabit.com>
		Balabit / syslog-ng upstream

4 files changed, 48 insertions, 8 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 8e30b81a0f40..500e7b198156 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-DISTVERSION=	3.9.1
+DISTVERSION=	3.10.1
 PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
@@ -60,6 +60,10 @@ TCP_WRAPPERS_CONFIGURE_ENABLE=	tcp-wrapper
 
 SPOOF_LIB_DEPENDS=		libnet.so:net/libnet
 SPOOF_CONFIGURE_ENABLE=		spoof-source
+SPOOF_CONFIGURE_ON=		--with-libnet=/usr/local/bin
+SPOOF_CONFIGURE_ENV=		LIBNET_CFLAGS="-I/usr/local/include" \
+				LIBNET_LIBS="-L/usr/local/lib -lnet"
+
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 
@@ -98,7 +102,6 @@ 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_USE_JAVA=		yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
 				bash:shells/bash
@@ -132,7 +135,6 @@ PYTHON_PLIST_FILES= 		lib/syslog-ng/libmod-python.so
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
-CURL_PLIST_FILES= 		lib/syslog-ng/libcurl.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index eb682ed7d48a..2bc0d5a35124 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489753689
-SHA256 (syslog-ng-3.9.1.tar.gz) = 5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17
-SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
+TIMESTAMP = 1498475519
+SHA256 (syslog-ng-3.10.1.tar.gz) = a905fe7bad09dcf40bf03650ef1c287b511bf262d004464b8993a28ce58c9136
+SIZE (syslog-ng-3.10.1.tar.gz) = 8465976
diff --git a/sysutils/syslog-ng-devel/files/patch-lfs b/sysutils/syslog-ng-devel/files/patch-lfs
new file mode 100644
index 000000000000..cbc27356d5fd
--- /dev/null
+++ b/sysutils/syslog-ng-devel/files/patch-lfs
@@ -0,0 +1,20 @@
+--- modules/affile/affile-source.c.orig
++++ modules/affile/affile-source.c
+@@ -25,6 +25,7 @@
+ #include "messages.h"
+ #include "gprocess.h"
+ #include "mainloop.h"
++#include "compat/lfs.h"
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- modules/affile/wildcard-source.c.orig
++++ modules/affile/wildcard-source.c
+@@ -23,6 +23,7 @@
+ #include "wildcard-source.h"
+ #include "directory-monitor-factory.h"
+ #include "messages.h"
++#include "compat/lfs.h"
+ #include <fcntl.h>
+ 
+ #define DEFAULT_SD_OPEN_FLAGS (O_RDONLY | O_NOCTTY | O_NONBLOCK | O_LARGEFILE)
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 0a46a0219b8c..212afd3d14dd 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -215,8 +215,19 @@ 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
+include/syslog-ng/compat/pcre.h
+include/syslog-ng/control/control-commands.h
+include/syslog-ng/control/control-main.h
+include/syslog-ng/scanner/kv-scanner/kv-scanner.h
+include/syslog-ng/scanner/list-scanner/list-scanner.h
+include/syslog-ng/stats/stats-cluster-logpipe.h
+include/syslog-ng/stats/stats-cluster-single.h
+include/syslog-ng/stats/stats-control.h
+include/syslog-ng/stats/stats-query-commands.h
+include/syslog-ng/stats/stats-query.h
+include/syslog-ng/stats/stats-views.h
+lib/libsyslog-ng-3.10.so.0.0.0
+lib/libsyslog-ng-3.10.so.0
 lib/libsyslog-ng.so
 lib/libsyslog-ng-native-connector.a
 lib/syslog-ng/libtest/libsyslog-ng-test.a
@@ -240,7 +251,12 @@ lib/syslog-ng/libdbparser.so
 lib/syslog-ng/libafstomp.so
 lib/syslog-ng/libpseudofile.so
 lib/syslog-ng/libgraphite.so
+lib/syslog-ng/libhttp.so
 lib/syslog-ng/libkvformat.so
+lib/syslog-ng/libmap-value-pairs.so
+lib/syslog-ng/libsnmptrapd-parser.so
+lib/syslog-ng/libstardate.so
+lib/syslog-ng/libtfgetent.so
 libdata/pkgconfig/syslog-ng.pc
 libdata/pkgconfig/syslog-ng-test.pc
 libdata/pkgconfig/syslog-ng-native-connector.pc
@@ -269,6 +285,8 @@ share/syslog-ng/include/scl/hdfs/plugin.conf
 share/syslog-ng/include/scl/apache/apache.conf
 share/syslog-ng/include/scl/loggly/loggly.conf
 share/syslog-ng/include/scl/logmatic/logmatic.conf
+share/syslog-ng/include/scl/cisco/plugin.conf
+share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf
 share/syslog-ng/tools/lex-rules.am
 share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/merge-grammar.pl