rpms
/
syslog-ng
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with devel.

This commit is contained in:
Jose Pedro Oliveira 2007-06-09 13:11:46 +00:00
parent 10dc1158f5
commit 5270c2572f
2 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
syslog-ng-2.0.4-conf.patch Normal file
View File

@ -0,0 +1,52 @@
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 (<Frank.Crawford@ac3.com.au>) - 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 (<Frank.Crawford@ac3.com.au>) - 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 (<jpo at di.uminho.pt>) - 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 (<jpo at di.uminho.pt>) - 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:

18
syslog-ng.spec
View File

@ -12,7 +12,7 @@
Name: syslog-ng
Version: 2.0.4
Release: 2%{?dist}
Release: 4%{?dist}
Summary: Syslog replacement daemon
Group: System Environment/Daemons
@ -22,6 +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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex
@ -56,6 +57,7 @@ ideal for firewalled environments.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
chmod -c a-x contrib/syslog2ng
@ -97,7 +99,7 @@ install -p -m 644 %{SOURCE1} \
# Vim syntax file
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/
for vimver in 63 64 70 ; do
for vimver in 63 64 70 71 ; do
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
ln -s ../../../%{name}/syslog-ng.vim .
@ -132,7 +134,8 @@ fi
%triggerin -- vim-common
VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
ln -sf %{_datadir}/%{name}/syslog-ng.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || :
cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
ln -sf ../../../%{name}/syslog-ng.vim . || :
%triggerun -- vim-common
VIMVEROLD=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | head -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@ -144,7 +147,8 @@ VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 |
if [ $1 = 1 ]; then
rm -f %{_datadir}/vim/vim${VIMVEROLD}/syntax/syslog-ng.vim || :
[ -d %{_datadir}/vim/vim${VIMVERNEW}/syntax ] && \
ln -sf %{_datadir}/%{name}/syslog-ng.vim %{_datadir}/vim/vim${VIMVERNEW}/syntax || :
cd %{_datadir}/vim/vim${VIMVERNEW}/syntax && \
ln -sf ../../../%{name}/syslog-ng.vim . || :
fi
@ -168,6 +172,12 @@ fi
%changelog
* Thu Jun 7 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.4-4
- Add support for vim 7.1.
* Thu May 31 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.4-3
- Increase the number of unix-stream max-connections (10 -> 32).
* Sat May 26 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.4-2
- New upstream download location
(https://lists.balabit.hu/pipermail/syslog-ng/2007-May/010258.html)