diff options
author | cy <cy@FreeBSD.org> | 2014-10-17 04:05:12 +0800 |
---|---|---|
committer | cy <cy@FreeBSD.org> | 2014-10-17 04:05:12 +0800 |
commit | 0f6fc5207f9dc2ed4a79151ab763f52ed231f1d7 (patch) | |
tree | 19424bf029e6f746da091885621763025e29afc8 /sysutils | |
parent | c0a46325c027e560af4231cd3eafe357997b219a (diff) | |
download | freebsd-ports-gnome-0f6fc5207f9dc2ed4a79151ab763f52ed231f1d7.tar.gz freebsd-ports-gnome-0f6fc5207f9dc2ed4a79151ab763f52ed231f1d7.tar.zst freebsd-ports-gnome-0f6fc5207f9dc2ed4a79151ab763f52ed231f1d7.zip |
Update 3.6.0r1 --> 3.6.0r2
- enabled JSON by default (it's getting popular, and syslog-ng
complains at startup if unavailable)
- added scl.conf to default config
- enabled the system() source by default (which handles differences
automagically among different platforms and releases)
Submitted by: Peter Czanik <peter.czanik@balabit.com> (syslog-ng upline)
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/syslog-ng-devel/Makefile | 4 | ||||
-rw-r--r-- | sysutils/syslog-ng-devel/distinfo | 4 | ||||
-rw-r--r-- | sysutils/syslog-ng-devel/files/syslog-ng.conf.sample | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index 5f5441775d96..75d8a338ffd4 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= syslog-ng -PORTVERSION= 3.6.0r1 +PORTVERSION= 3.6.0r2 PKGNAMESUFFIX= -devel CATEGORIES= sysutils DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/) @@ -24,7 +24,7 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= SYS_SSL PORTS_SSL OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS -OPTIONS_DEFAULT= PORTS_SSL +OPTIONS_DEFAULT= PORTS_SSL JSON SYS_SSL_DESC= Build with OpenSSL support (from system) PORTS_SSL_DESC= Build with OpenSSL support (from ports) TCP_WRAPPERS_DESC= Build with TCP Wrappers diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo index bf5c0a0d2b8a..30e0e8bd7af0 100644 --- a/sysutils/syslog-ng-devel/distinfo +++ b/sysutils/syslog-ng-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (syslog-ng_3.6.0rc1.tar.gz) = bacca809ba2d8c24d3b5d678f22e733ae0714316b87958d4d3b2b3ea81b92636 -SIZE (syslog-ng_3.6.0rc1.tar.gz) = 3164949 +SHA256 (syslog-ng_3.6.0rc2.tar.gz) = e46c0dfcf99a905a0f42e4c9c429c48fc19e882f43c70ff0110e51ba1465aa1f +SIZE (syslog-ng_3.6.0rc2.tar.gz) = 3165637 diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample index 8609e72a1f3b..7fa32733ffd1 100644 --- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample +++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample @@ -1,4 +1,5 @@ @version:3.6 +@include "scl.conf" # # This sample configuration file is essentially equilivent to the stock @@ -15,9 +16,8 @@ options { chain_hostnames(off); flush_lines(0); threaded(yes); }; # # sources # -source src { unix-dgram("/var/run/log"); - unix-dgram("/var/run/logpriv" perm(0600)); - udp(); internal(); file("/dev/klog"); }; +source src { system(); + udp(); internal(); }; # # destinations |