[arch-commits] CVS update of core/base/syslog-ng (PKGBUILD syslog-ng.conf)

[Tobias Powalowski]

    Date: Thursday, October 25, 2007 @ 06:04:31
  Author: tpowa
    Path: /home/cvs-core/core/base/syslog-ng

Modified: PKGBUILD (1.21 -> 1.22) syslog-ng.conf (1.6 -> 1.7)

'upgpkg: fix #5997 #6000 #4495'


----------------+
 PKGBUILD       |   11 ++++++-----
 syslog-ng.conf |   13 ++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)


Index: core/base/syslog-ng/PKGBUILD
diff -u core/base/syslog-ng/PKGBUILD:1.21 core/base/syslog-ng/PKGBUILD:1.22
--- core/base/syslog-ng/PKGBUILD:1.21	Wed Sep 19 16:27:28 2007
+++ core/base/syslog-ng/PKGBUILD	Thu Oct 25 06:04:31 2007
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD,v 1.21 2007/09/19 20:27:28 thomas Exp $
+# $Id: PKGBUILD,v 1.22 2007/10/25 10:04:31 tpowa Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=syslog-ng
 pkgver=2.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A portable syslogd replacement with enhanced, flexible configuration scheme."
 arch=(i686 x86_64)
 license=('GPL')
 groups=('base')
 url="http://www.balabit.com/products/syslog_ng"
-makedepends=('flex' 'libol' 'glib2' 'eventlog')
-depends=('tcp_wrappers' 'logrotate' 'glibc')
+makedepends=('flex' 'glib2' 'eventlog' 'pkgconfig' 'tcp_wrappers')
+depends=('logrotate' 'glibc')
 provides=('logger')
 backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
 source=(http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/$pkgname-$pkgver.tar.gz \
 	syslog-ng.conf syslog-ng.logrotate syslog-ng)
 md5sums=('c161eefc450fabc246c1a10997c6c6a5'
-         '8ca48752d64f8740f4117e8f7711a2cc'
+         '1d960d7637de4fd7a3209b856762ccad'
          '9714c7479119922b55a7992677ebecb5'
          '7e14fecf3815e5fdc50f2817dc19720f')
 
@@ -29,3 +29,4 @@
   install -D -m644 ../syslog-ng.logrotate $startdir/pkg/etc/logrotate.d/syslog-ng
   install -D -m755 ../syslog-ng $startdir/pkg/etc/rc.d/syslog-ng
 }
+
Index: core/base/syslog-ng/syslog-ng.conf
diff -u core/base/syslog-ng/syslog-ng.conf:1.6 core/base/syslog-ng/syslog-ng.conf:1.7
--- core/base/syslog-ng/syslog-ng.conf:1.6	Thu Aug 16 16:05:32 2007
+++ core/base/syslog-ng/syslog-ng.conf	Thu Oct 25 06:04:31 2007
@@ -1,5 +1,5 @@
 #
-# /etc/syslog-ng/syslog-ng.conf
+# /etc/syslog-ng.conf
 #
 
 options {
@@ -18,7 +18,7 @@
 source src {
   unix-stream("/dev/log");
   internal();
-  pipe("/proc/kmsg");
+  file("/proc/kmsg");
 };
 
 destination authlog { file("/var/log/auth.log"); };
@@ -31,6 +31,7 @@
 destination uucp { file("/var/log/uucp.log"); };
 destination mail { file("/var/log/mail.log"); };
 destination news { file("/var/log/news.log"); };
+destination ppp { file("/var/log/ppp.log"); };
 #destination debug { file("/var/log/debug.log"); };
 destination messages { file("/var/log/messages.log"); };
 destination errors { file("/var/log/errors.log"); };
@@ -47,15 +48,16 @@
 filter f_syslog { program(syslog-ng); };
 filter f_cron { facility(cron); };
 filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern); };
+filter f_kernel { facility(kern) and not filter(f_iptables); };
 filter f_lpr { facility(lpr); };
 filter f_mail { facility(mail); };
 filter f_news { facility(news); };
 filter f_user { facility(user); };
 filter f_uucp { facility(cron); };
 filter f_news { facility(news); };
+filter f_ppp { facility(local2); };
 #filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news) and not program(syslog-ng) and not match("IN=.*OUT="); };
+filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
 filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
 filter f_emergency { level(emerg); };
 filter f_info { level(info); };
@@ -63,7 +65,7 @@
 filter f_warn { level(warn); };
 filter f_crit { level(crit); };
 filter f_err { level(err); };
-filter f_iptables { match("IN="); };
+filter f_iptables { match("IN=.*OUT="); };
 filter f_acpid { match("acpid"); };
 
 log { source(src); filter(f_acpid); destination(acpid); flags(final); };
@@ -75,6 +77,7 @@
 log { source(src); filter(f_lpr); destination(lpr); };
 log { source(src); filter(f_mail); destination(mail); };
 log { source(src); filter(f_news); destination(news); };
+log { source(src); filter(f_ppp); destination(ppp); };
 log { source(src); filter(f_user); destination(user); };
 log { source(src); filter(f_uucp); destination(uucp); };
 #log { source(src); filter(f_debug); destination(debug); };