- Update devel/libol to 0.3.15 and sysutils/syslog-ng to 1.6.6

- Synchronize syslog-ng.conf with /etc/syslog.conf

Submitted by:	glebius
Approved by:	maintainer silence

3 files changed, 27 insertions, 7 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index c939f867d3db..2616b1e59c5f 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	1.6.5
-PORTREVISION=	1
+PORTVERSION=	1.6.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/syslog-ng/1.6/src/
 
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 78959a2d6b62..59e314bfbd6d 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1 +1,2 @@
-MD5 (syslog-ng-1.6.5.tar.gz) = ce70b4230e73ad79191618530c8c3a72
+MD5 (syslog-ng-1.6.6.tar.gz) = 2d955e93a5b07295de3fc8bf71ffeb48
+SIZE (syslog-ng-1.6.6.tar.gz) = 377597
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index 64794c5ed1e2..c2059c4165db 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -20,9 +20,12 @@ source src { unix-dgram("/var/run/log");
 #
 destination messages { file("/var/log/messages"); };
 destination security { file("/var/log/security"); };
+destination authlog { file("/var/log/auth.log"); };
 destination maillog { file("/var/log/maillog"); };
 destination lpd-errs { file("/var/log/lpd-errs"); };
+destination xferlog { file("/var/log/xferlog"); };
 destination cron { file("/var/log/cron"); };
+destination debuglog { file("/var/log/debug.log"); };
 destination consolelog { file("/var/log/console.log"); };
 destination all { file("/var/log/all.log"); };
 destination newscrit { file("/var/log/news/news.crit"); };
@@ -39,6 +42,7 @@ destination allusers { usertty("*"); };
 #
 filter f_auth { facility(auth); };
 filter f_authpriv { facility(authpriv); };
+filter f_not_authpriv { not facility(authpriv); };
 filter f_console { facility(console); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
@@ -70,6 +74,7 @@ filter f_warning { level(warning..emerg); };
 filter f_notice { level(notice..emerg); };
 filter f_info { level(info..emerg); };
 filter f_debug { level(debug..emerg); };
+filter f_is_debug { level(debug); };
 
 #
 # program filters
@@ -78,17 +83,17 @@ filter f_ppp { program("ppp"); };
 filter f_slip { program("startslip"); };
 
 #
-# *.err;kern.debug;auth.notice;mail.crit		/dev/console
+# *.err;kern.warning;auth.notice;mail.crit		/dev/console
 #
 log { source(src); filter(f_err); destination(console); };
-log { source(src); filter(f_kern); filter(f_debug); destination(console); };
+log { source(src); filter(f_kern); filter(f_warning); destination(console); };
 log { source(src); filter(f_auth); filter(f_notice); destination(console); };
 log { source(src); filter(f_mail); filter(f_crit); destination(console); };
 
 #
-# *.notice;kern.debug;lpr.info;mail.crit;news.err	/var/log/messages
+# *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err	/var/log/messages
 #
-log { source(src); filter(f_notice); destination(messages); };
+log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); };
 log { source(src); filter(f_kern); filter(f_debug); destination(messages); };
 log { source(src); filter(f_lpr); filter(f_info); destination(messages); };
 log { source(src); filter(f_mail); filter(f_crit); destination(messages); };
@@ -100,6 +105,11 @@ log { source(src); filter(f_news); filter(f_err); destination(messages); };
 log { source(src); filter(f_security); destination(security); };
 
 #
+# auth.info;authpriv.info				/var/log/auth.log
+log { source(src); filter(f_auth); filter(f_info); destination(authlog); };
+log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); };
+
+#
 # mail.info						/var/log/maillog
 #
 log { source(src); filter(f_mail); filter(f_info); destination(maillog); };
@@ -110,11 +120,21 @@ log { source(src); filter(f_mail); filter(f_info); destination(maillog); };
 log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); };
 
 #
+# ftp.info						/var/log/xferlog
+#
+log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); };
+
+#
 # cron.*						/var/log/cron
 #
 log { source(src); filter(f_cron); destination(cron); };
 
 #
+# *.=debug						/var/log/debug.log
+#
+log { source(src); filter(f_is_debug); destination(debuglog); };
+
+#
 # *.emerg						*
 #
 log { source(src); filter(f_emerg); destination(allusers); };