diff --git a/.cvsignore b/.cvsignore index ea97c50..cb1353f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -syslog-ng-2.0.4.tar.gz +syslog-ng-2.0.5.tar.gz diff --git a/sources b/sources index 7664dec..4e6d907 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51e72f9687e5a3a3c01e51ed9de96378 syslog-ng-2.0.4.tar.gz +c161eefc450fabc246c1a10997c6c6a5 syslog-ng-2.0.5.tar.gz diff --git a/syslog-ng-2.0.4-conf.patch b/syslog-ng-2.0.4-conf.patch deleted file mode 100644 index 0b3be1a..0000000 --- a/syslog-ng-2.0.4-conf.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ruN syslog-ng-2.0.4-orig/contrib/fedora-packaging/syslog-ng.conf syslog-ng-2.0.4/contrib/fedora-packaging/syslog-ng.conf ---- syslog-ng-2.0.4-orig/contrib/fedora-packaging/syslog-ng.conf 2007-04-19 20:37:16.000000000 +0100 -+++ syslog-ng-2.0.4/contrib/fedora-packaging/syslog-ng.conf 2007-05-31 21:57:32.000000000 +0100 -@@ -8,15 +8,15 @@ - # 20000925 gb@sysfive.com - # - # Updated by Frank Crawford () - 10 Aug 2002 --# - for Red Hat 7.3 --# - totally do away with klogd --# - add message "kernel:" as is done with klogd. -+# - for Red Hat 7.3 -+# - totally do away with klogd -+# - add message "kernel:" as is done with klogd. - # - # Updated by Frank Crawford () - 22 Aug 2002 --# - use the log_prefix option as per Balazs Scheidler's email -+# - use the log_prefix option as per Balazs Scheidler's email - # - # Updated by Jose Pedro Oliveira () - 05 Apr 2003 --# - corrected filters 'f_filter2' and 'f_filter6' -+# - corrected filters 'f_filter2' and 'f_filter6' - # these filters were only allowing messages of one specific - # priority level; they should be allowing messages from that - # priority and upper levels. -@@ -28,6 +28,9 @@ - # - /proc/kmsg is a file not a pipe. - # (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html) - # -+# Updated by Jose Pedro Oliveira () - 31 May 2007 -+# - increase the number of unix-stream max-connections (syslog-ng 2.0.4) -+# - - options { - sync (0); -@@ -42,9 +45,10 @@ - - source s_sys { - file ("/proc/kmsg" log_prefix("kernel: ")); -- unix-stream ("/dev/log"); -+ unix-stream ("/dev/log" max-connections(32)); - internal(); - # udp(ip(0.0.0.0) port(514)); -+ # tcp(ip(0.0.0.0) port(514)); - }; - - destination d_cons { file("/dev/console"); }; -@@ -75,3 +79,5 @@ - log { source(s_sys); filter(f_filter6); destination(d_spol); }; - log { source(s_sys); filter(f_filter7); destination(d_boot); }; - log { source(s_sys); filter(f_filter8); destination(d_cron); }; -+ -+# vim:set ai ts=4 sw=4 sts=4 et: diff --git a/syslog-ng-2.0.5-conf.patch b/syslog-ng-2.0.5-conf.patch new file mode 100644 index 0000000..1bab4d4 --- /dev/null +++ b/syslog-ng-2.0.5-conf.patch @@ -0,0 +1,52 @@ +diff -ruN syslog-ng-2.0.5-orig/contrib/fedora-packaging/syslog-ng.conf syslog-ng-2.0.5/contrib/fedora-packaging/syslog-ng.conf +--- syslog-ng-2.0.5-orig/contrib/fedora-packaging/syslog-ng.conf 2007-04-19 20:37:16.000000000 +0100 ++++ syslog-ng-2.0.5/contrib/fedora-packaging/syslog-ng.conf 2007-07-26 16:02:11.000000000 +0100 +@@ -8,15 +8,15 @@ + # 20000925 gb@sysfive.com + # + # Updated by Frank Crawford () - 10 Aug 2002 +-# - for Red Hat 7.3 +-# - totally do away with klogd +-# - add message "kernel:" as is done with klogd. ++# - for Red Hat 7.3 ++# - totally do away with klogd ++# - add message "kernel:" as is done with klogd. + # + # Updated by Frank Crawford () - 22 Aug 2002 +-# - use the log_prefix option as per Balazs Scheidler's email ++# - use the log_prefix option as per Balazs Scheidler's email + # + # Updated by Jose Pedro Oliveira () - 05 Apr 2003 +-# - corrected filters 'f_filter2' and 'f_filter6' ++# - corrected filters 'f_filter2' and 'f_filter6' + # these filters were only allowing messages of one specific + # priority level; they should be allowing messages from that + # priority and upper levels. +@@ -28,6 +28,13 @@ + # - /proc/kmsg is a file not a pipe. + # (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html) + # ++# Updated by Jose Pedro Oliveira () - 31 May 2007 ++# - increase the number of unix-stream max-connections (syslog-ng 2.0.4) ++# ++# Updated by Jose Pedro Oliveira () - 26 July 2007 ++# - revert previous unix-stream max-connections change ++# (the new unix-stream max-connections default in syslog-ng 2.0.5 is 256) ++# + + options { + sync (0); +@@ -45,6 +52,7 @@ + unix-stream ("/dev/log"); + internal(); + # udp(ip(0.0.0.0) port(514)); ++ # tcp(ip(0.0.0.0) port(514)); + }; + + destination d_cons { file("/dev/console"); }; +@@ -75,3 +83,5 @@ + log { source(s_sys); filter(f_filter6); destination(d_spol); }; + log { source(s_sys); filter(f_filter7); destination(d_boot); }; + log { source(s_sys); filter(f_filter8); destination(d_cron); }; ++ ++# vim:set ai ts=4 sw=4 sts=4 et: diff --git a/syslog-ng.spec b/syslog-ng.spec index c0a978d..83949c5 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -11,8 +11,8 @@ %define sbindir /sbin Name: syslog-ng -Version: 2.0.4 -Release: 4%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -22,7 +22,7 @@ Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/s Source1: syslog.log Patch0: syslog-ng-2.0.0-init.patch Patch1: syslog-ng-1.6.7-logrotate.patch -Patch2: syslog-ng-2.0.4-conf.patch +Patch2: syslog-ng-2.0.5-conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex @@ -172,6 +172,9 @@ fi %changelog +* Thu Jul 26 2007 Jose Pedro Oliveira - 2.0.5-1 +- Update to 2.0.5 + * Thu Jun 7 2007 Jose Pedro Oliveira - 2.0.4-4 - Add support for vim 7.1.