svn commit: r371021 - in head/sysutils/syslog-ng-devel: . files

[Cy Schubert]

Author: cy
Date: Thu Oct 16 20:05:12 2014
New Revision: 371021
URL: https://svnweb.freebsd.org/changeset/ports/371021
QAT: https://qat.redports.org/buildarchive/r371021/

Log:
  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 at balabit.com> (syslog-ng upline)

Modified:
  head/sysutils/syslog-ng-devel/Makefile
  head/sysutils/syslog-ng-devel/distinfo
  head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample

Modified: head/sysutils/syslog-ng-devel/Makefile
==============================================================================
--- head/sysutils/syslog-ng-devel/Makefile	Thu Oct 16 19:48:45 2014	(r371020)
+++ head/sysutils/syslog-ng-devel/Makefile	Thu Oct 16 20:05:12 2014	(r371021)
@@ -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

Modified: head/sysutils/syslog-ng-devel/distinfo
==============================================================================
--- head/sysutils/syslog-ng-devel/distinfo	Thu Oct 16 19:48:45 2014	(r371020)
+++ head/sysutils/syslog-ng-devel/distinfo	Thu Oct 16 20:05:12 2014	(r371021)
@@ -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

Modified: head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
==============================================================================
--- head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample	Thu Oct 16 19:48:45 2014	(r371020)
+++ head/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample	Thu Oct 16 20:05:12 2014	(r371021)
@@ -1,4 +1,5 @@
 @version:3.6
+ at include "scl.conf"
 
 #
 # This sample configuration file is essentially equilivent to the stock
@@ -15,9 +16,8 @@ options { chain_hostnames(off); flush_li
 #
 # 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