- add syslog-ng-3.2.5-nilvalue-patch.diff to fix
a bug reported on the syslog-ng mailinglist Signed-off-by: Peter Czanik <pczanik@fang.fa.gau.hu>
This commit is contained in:
parent
260e957a40
commit
a1f0450de5
22
syslog-ng-3.2.5-nilvalue-patch.diff
Normal file
22
syslog-ng-3.2.5-nilvalue-patch.diff
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/modules/syslogformat/syslog-format.c b/modules/syslogformat/syslog-format.c
|
||||||
|
index 6f53020..fc2dd17 100644
|
||||||
|
--- a/modules/syslogformat/syslog-format.c
|
||||||
|
+++ b/modules/syslogformat/syslog-format.c
|
||||||
|
@@ -421,7 +421,16 @@ log_msg_parse_date(LogMessage *self, const guchar **data, gint *length, guchar *
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- return FALSE;
|
||||||
|
+ if (left >= 1 && src[0] == '-')
|
||||||
|
+ {
|
||||||
|
+ /* NILVALUE */
|
||||||
|
+ self->timestamps[LM_TS_STAMP] = self->timestamps[LM_TS_RECVD];
|
||||||
|
+ *length = --left;
|
||||||
|
+ *data = ++src;
|
||||||
|
+ return TRUE;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NOTE: mktime() returns the time assuming that the timestamp we
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Name: syslog-ng
|
Name: syslog-ng
|
||||||
Version: 3.2.5
|
Version: 3.2.5
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: Next-generation syslog server
|
Summary: Next-generation syslog server
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -20,6 +20,7 @@ Source4: syslog-ng.logrotate
|
|||||||
Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch
|
Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch
|
||||||
Patch1: syslog-ng-3.2.5-tests-functional-control.py.patch
|
Patch1: syslog-ng-3.2.5-tests-functional-control.py.patch
|
||||||
Patch2: syslog-ng-3.2.5-tests-functional-sql-test.patch
|
Patch2: syslog-ng-3.2.5-tests-functional-sql-test.patch
|
||||||
|
Patch3: syslog-ng-3.2.5-nilvalue-patch.diff
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -84,6 +85,7 @@ developing applications that use %{name}.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
# fix perl path
|
# fix perl path
|
||||||
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
|
%{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
|
||||||
@ -262,6 +264,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 23 2014 Peter Czanik <czanik@balabit.hu> - 3.2.5-4
|
||||||
|
- Patch syslog-ng-3.2.5-nilvalue-patch.diff as discussed
|
||||||
|
on the syslog-ng mailing list
|
||||||
|
|
||||||
* Sun Jan 15 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-3
|
* Sun Jan 15 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-3
|
||||||
- Enabled SQL support (subpackage syslog-ng-libdbi) and the SQL test.
|
- Enabled SQL support (subpackage syslog-ng-libdbi) and the SQL test.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user