[arch-commits] Commit in syslog-ng/trunk (PKGBUILD syslog-ng.conf)

[Tobias Powalowski]

    Date: Friday, March 6, 2009 @ 12:01:16
  Author: tpowa
Revision: 29210

'bump to 3.x series'

Modified:
  syslog-ng/trunk/PKGBUILD
  syslog-ng/trunk/syslog-ng.conf

----------------+
 PKGBUILD       |   11 +++----
 syslog-ng.conf |   78 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 45 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-06 14:31:08 UTC (rev 29209)
+++ PKGBUILD	2009-03-06 17:01:16 UTC (rev 29210)
@@ -3,9 +3,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=syslog-ng
-pkgver=2.1.3
-_shortver="${pkgver%.*}"
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,10 +15,10 @@
 optdepends=('logrotate')
 provides=('logger')
 backup=('etc/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$_shortver/src/$pkgname-$pkgver.tar.gz
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/$pkgname\_$pkgver.tar.gz
         syslog-ng.conf syslog-ng.logrotate syslog-ng.rc)
-md5sums=('e502745de194570182ad9d69c9860d7d'
-         '655d68ae73a320e1b7211ba97d2a836f'
+md5sums=('14e13519bad47d0a6308905292385321'
+         'c42c6b19bfe784e41c1d4f99c9e7d600'
          '9714c7479119922b55a7992677ebecb5'
          '9bd98250cfa49e13fa3fa731b6040549')
 

Modified: syslog-ng.conf
===================================================================
--- syslog-ng.conf	2009-03-06 14:31:08 UTC (rev 29209)
+++ syslog-ng.conf	2009-03-06 17:01:16 UTC (rev 29210)
@@ -1,3 +1,4 @@
+ at version: 3.0
 #
 # /etc/syslog-ng.conf
 #
@@ -3,5 +4,6 @@
 
 options {
-  sync (0);
+  stats_freq (0);
+  flush_lines (0);
   time_reopen (10);
   log_fifo_size (1000);
@@ -21,24 +23,24 @@
   file("/proc/kmsg");
 };
 
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog.log"); };
-destination cron { file("/var/log/crond.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kernel { file("/var/log/kernel.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-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"); };
-destination everything { file("/var/log/everything.log"); };
-destination iptables { file("/var/log/iptables.log"); };
-destination acpid { file("/var/log/acpid.log"); };
-destination console { usertty("root"); };
+destination d_authlog { file("/var/log/auth.log"); };
+destination d_syslog { file("/var/log/syslog.log"); };
+destination d_cron { file("/var/log/crond.log"); };
+destination d_daemon { file("/var/log/daemon.log"); };
+destination d_kernel { file("/var/log/kernel.log"); };
+destination d_lpr { file("/var/log/lpr.log"); };
+destination d_user { file("/var/log/user.log"); };
+destination d_uucp { file("/var/log/uucp.log"); };
+destination d_mail { file("/var/log/mail.log"); };
+destination d_news { file("/var/log/news.log"); };
+destination d_ppp { file("/var/log/ppp.log"); };
+destination d_debug { file("/var/log/debug.log"); };
+destination d_messages { file("/var/log/messages.log"); };
+destination d_errors { file("/var/log/errors.log"); };
+destination d_everything { file("/var/log/everything.log"); };
+destination d_iptables { file("/var/log/iptables.log"); };
+destination d_acpid { file("/var/log/acpid.log"); };
+destination d_console { usertty("root"); };
 
 # Log everything to vc12
 destination console_all { file("/dev/vc/12"); };
@@ -65,27 +67,27 @@
 filter f_warn { level(warn); };
 filter f_crit { level(crit); };
 filter f_err { level(err); };
-filter f_iptables { match("IN=.*OUT="); };
+filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
 filter f_acpid { program("acpid"); };
 
-log { source(src); filter(f_acpid); destination(acpid); };
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(src); filter(f_kernel); destination(kernel); };
-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); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_err); destination(errors); };
-log { source(src); filter(f_emergency); destination(console); };
-log { source(src); filter(f_everything); destination(everything); };
-log { source(src); filter(f_iptables); destination(iptables); };
+log { source(src); filter(f_acpid); destination(d_acpid); };
+log { source(src); filter(f_authpriv); destination(d_authlog); };
+log { source(src); filter(f_syslog); destination(d_syslog); };
+log { source(src); filter(f_cron); destination(d_cron); };
+log { source(src); filter(f_daemon); destination(d_daemon); };
+log { source(src); filter(f_kernel); destination(d_kernel); };
+log { source(src); filter(f_lpr); destination(d_lpr); };
+log { source(src); filter(f_mail); destination(d_mail); };
+log { source(src); filter(f_news); destination(d_news); };
+log { source(src); filter(f_ppp); destination(d_ppp); };
+log { source(src); filter(f_user); destination(d_user); };
+log { source(src); filter(f_uucp); destination(d_uucp); };
+#log { source(src); filter(f_debug); destination(d_debug); };
+log { source(src); filter(f_messages); destination(d_messages); };
+log { source(src); filter(f_err); destination(d_errors); };
+log { source(src); filter(f_emergency); destination(d_console); };
+log { source(src); filter(f_everything); destination(d_everything); };
+log { source(src); filter(f_iptables); destination(d_iptables); };
 
 # Log everything to vc12
 #log { source(src); destination(console_all); };