- update for syslog-ng 3.1.1

- supports the new syslog protocol standards
- log statements can be embedded into each other
- the encoding of source files can be set for proper character conversion
- can read, process, and rewrite structured messages (e.g., Apache
    webserver logs) using templates and regular expressions
- support for patterndb v2 and v3 format, along with a bunch of new
    parsers: ANYSTRING, IPv6, IPvANY and FLOAT.
- added a new "pdbtool" utility to manage patterndb files: convert them
    from v1 or v2 format, merge mulitple patterndb files into one and look
    up matching patterns given a specific message.
- support for message tags: tags can be assigned to log messages as they
    enter syslog-ng: either by the source driver or via patterndb. Later it
    these tags can be used for efficient filtering.
- added support for rewriting structured data
- added pcre support in the binary packages of syslog-ng

.cvsignore

@@ -1,2 +1 @@
-syslog-ng-2.1.4.tar.gz
-syslog-ng-2.1.4-libnet.patch
+syslog-ng_3.1.1.tar.gz

sources

@@ -1 +1 @@
-17c4c7725d2eab62b588395f1ed93f32  syslog-ng-2.1.4.tar.gz
+4fdc64ff0ad964dc811a746228609412  syslog-ng_3.1.1.tar.gz

syslog-ng.conf

@@ -1,3 +1,5 @@
+@version:3.0
+
 # syslog-ng configuration file.
 #
 # This should behave pretty much like the original syslog on RedHat. But
@@ -7,7 +9,7 @@
 #
 
 options {
-	sync (0);
+	flush_lines (0);
 	time_reopen (10);
 	log_fifo_size (1000);
 	long_hostnames (off);
@@ -18,7 +20,7 @@ options {
 };
 
 source s_sys {
-	file ("/proc/kmsg" log_prefix("kernel: "));
+	file ("/proc/kmsg" program_override("kernel: "));
 	unix-stream ("/dev/log");
 	internal();
 	# udp(ip(0.0.0.0) port(514));
@@ -27,7 +29,7 @@ source s_sys {
 destination d_cons { file("/dev/console"); };
 destination d_mesg { file("/var/log/messages"); };
 destination d_auth { file("/var/log/secure"); };
-destination d_mail { file("/var/log/maillog" sync(10)); };
+destination d_mail { file("/var/log/maillog" flush_lines(10)); };
 destination d_spol { file("/var/log/spooler"); };
 destination d_boot { file("/var/log/boot.log"); };
 destination d_cron { file("/var/log/cron"); };

syslog-ng.spec

@@ -1,18 +1,18 @@
 %{?_with_spoofsource:%define spoofsource 1}
-%define evtlog_ver 0.2.7-1
+%define evtlog_ver 0.2.7-2
 
 %define _sbindir /sbin
 %define _localstatedir /var/lib/syslog-ng
 
 Name: syslog-ng
-Version: 2.1.4
-Release: 8%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
 License: GPLv2+
 Url: http://www.balabit.com/products/syslog_ng/
-Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/%{name}-%{version}.tar.gz
+Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/3.1.1/src/%{name}_%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.init.d
 Source10: sysklogd-syslog-ng.sysconfig
@@ -30,6 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel
+BuildRequires: pcre-devel
 %if 0%{?fedora}
 BuildRequires: glib2-static
 %endif
@@ -67,11 +68,12 @@ ideal for firewalled environments.
 
 
 %prep
-%setup -q
 %if 0%{?rhel}
 %patch0 -p1 -b .libnet
 %endif
 
+%setup -q
+
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 
@@ -106,6 +108,7 @@ touch src/cfg-grammar.c src/cfg-lex.c
 	--enable-ipv6 \
 	--sysconfdir=%{_sysconfdir}/%{name} \
 	--enable-tcp-wrapper \
+	--enable-pcre \
 %if 0%{?spoofsource}
 	--enable-spoof-source \
 %endif
@@ -207,7 +210,6 @@ fi
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README ChangeLog NEWS
-%doc doc/reference/syslog-ng.txt
 %doc doc/security/*.txt
 %doc doc/examples/syslog-ng.conf.sample
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
@@ -218,14 +220,35 @@ fi
 %{_sysconfdir}/init.d/%{name}
 %dir %{_localstatedir}
 %{_sbindir}/%{name}
+%{_sbindir}/syslog-ng-ctl
 %{_bindir}/loggen
+%{_bindir}/pdbtool
 %{_datadir}/%{name}
+%{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 %ghost %{_datadir}/vim/
 
 
 %changelog
+* Sat Jul 24 2010 Doug Warner <silfreed@fedoraproject.org> - 3.1.1-1
+- update for syslog-ng 3.1.1
+- supports the new syslog protocol standards
+- log statements can be embedded into each other
+- the encoding of source files can be set for proper character conversion
+- can read, process, and rewrite structured messages (e.g., Apache webserver
+  logs) using templates and regular expressions
+- support for patterndb v2 and v3 format, along with a bunch of new
+  parsers: ANYSTRING, IPv6, IPvANY and FLOAT.
+- added a new "pdbtool" utility to manage patterndb files: convert them
+  from v1 or v2 format, merge mulitple patterndb files into one and look
+  up matching patterns given a specific message.
+- support for message tags: tags can be assigned to log messages as they
+  enter syslog-ng: either by the source driver or via patterndb.
+  Later it these tags can be used for efficient filtering.
+- added support for rewriting structured data
+- added pcre support in the binary packages of syslog-ng
+
 * Tue Sep 15 2009 Ray Van Dolson <rayvd@fedoraproject.org> - 2.1.4-8
 - Adjust eventlog build requirement