This commit is contained in:
Peter Vrabec 2007-11-19 11:22:01 +00:00
parent f580f886e8
commit 0143eafc61
4 changed files with 8 additions and 33 deletions

View File

@ -1,4 +1,3 @@
rsyslog.init rsyslog.init
rsyslog.sysconfig rsyslog.sysconfig
rsyslog-1.19.6.tar.gz rsyslog-1.19.10.tar.gz
rsyslog-1.19.6-repmsg.patch

View File

@ -1,22 +0,0 @@
--- syslogd.c.dropNul 2007-10-03 17:38:07.000000000 +0200
+++ syslogd.c 2007-10-03 17:43:23.000000000 +0200
@@ -2023,13 +2023,18 @@ void printchopped(char *hname, char *msg
dbgprintf("Message length: %d, File descriptor: %d.\n", len, fd);
+ if(*(msg + len - 1) == '\0') {
+ dbgprintf("dropped NUL at very end of message\n");
+ len--;
+ }
+
/* we first check if we need to drop trailing LFs, which often make
* their way into syslog messages unintentionally. In order to remain
* compatible to recent IETF developments, we allow the user to
* turn on/off this handling. rgerhards, 2007-07-23
*/
if(bDropTrailingLF && *(msg + len - 1) == '\n') {
- *(msg + len - 1) = '\0';
+ dbgprintf("dropped LF at very end of message (DropTrailingLF is set)\n");
len--;
}

View File

@ -2,16 +2,14 @@
Summary: Enhanced system logging and kernel message trapping daemons Summary: Enhanced system logging and kernel message trapping daemons
Name: rsyslog Name: rsyslog
Version: 1.19.6 Version: 1.19.10
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
Source1: rsyslog.init Source1: rsyslog.init
Source2: rsyslog.sysconfig Source2: rsyslog.sysconfig
Patch1: rsyslog-1.19.6-repmsg.patch
Patch2: rsyslog-1.19.6-dropNul.patch
Conflicts: logrotate < 3.5.2 Conflicts: logrotate < 3.5.2
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: autoconf automake BuildRequires: autoconf automake
@ -47,11 +45,9 @@ MySQL database support to rsyslog.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .repmsg
%patch2 -p0 -b .dropnul
%build %build
%configure --sbindir=%{sbindir} --disable-static %configure --sbindir=%{sbindir} --disable-static --enable-mysql
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -121,6 +117,9 @@ fi
%{_libdir}/rsyslog/ommysql.so %{_libdir}/rsyslog/ommysql.so
%changelog %changelog
* Mon Nov 19 2007 Peter Vrabec <pvrabec@redhat.com> 1.19.10-1
- new upstream release
* Wed Oct 03 2007 Peter Vrabec <pvrabec@redhat.com> 1.19.6-3 * Wed Oct 03 2007 Peter Vrabec <pvrabec@redhat.com> 1.19.6-3
- remove NUL character from recieved messages - remove NUL character from recieved messages

View File

@ -1,4 +1,3 @@
fe8fcd90c672701fa198dd1206df64ae rsyslog.init fe8fcd90c672701fa198dd1206df64ae rsyslog.init
e10d2dc3238c2cf2a54933f10b19b9bf rsyslog.sysconfig e10d2dc3238c2cf2a54933f10b19b9bf rsyslog.sysconfig
0aa4ea5d07d3c2ba3080b4a64280ff72 rsyslog-1.19.6.tar.gz 9aea93c0ad90db8ff5553d18b0ff75e7 rsyslog-1.19.10.tar.gz
8687f4cb4dbc28106890a00eabf2c6f7 rsyslog-1.19.6-repmsg.patch