From 0143eafc617a1353bbcf7fa814e8223f4677879d Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Nov 19 2007 11:22:01 +0000
Subject: upgrade


---

diff --git a/.cvsignore b/.cvsignore
index cd520ea..47a5296 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
 rsyslog.init
 rsyslog.sysconfig
-rsyslog-1.19.6.tar.gz
-rsyslog-1.19.6-repmsg.patch
+rsyslog-1.19.10.tar.gz
diff --git a/rsyslog-1.19.6-dropNul.patch b/rsyslog-1.19.6-dropNul.patch
deleted file mode 100644
index d52aade..0000000
--- a/rsyslog-1.19.6-dropNul.patch
+++ /dev/null
@@ -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--;
- 	}
- 
diff --git a/rsyslog.spec b/rsyslog.spec
index c9504c6..5d18683 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -2,16 +2,14 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.6
-Release: 3%{?dist}
+Version: 1.19.10
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.19.6-repmsg.patch
-Patch2: rsyslog-1.19.6-dropNul.patch 
 Conflicts: logrotate < 3.5.2
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
@@ -47,11 +45,9 @@ MySQL database support to rsyslog.
 
 %prep
 %setup -q
-%patch1 -p1 -b .repmsg
-%patch2 -p0 -b .dropnul
 
 %build
-%configure --sbindir=%{sbindir} --disable-static
+%configure --sbindir=%{sbindir} --disable-static --enable-mysql
 make %{?_smp_mflags}
 
 %install
@@ -121,6 +117,9 @@ fi
 %{_libdir}/rsyslog/ommysql.so
 
 %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
 - remove NUL character from recieved messages
 
diff --git a/sources b/sources
index 502a39b..0f91f44 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
-0aa4ea5d07d3c2ba3080b4a64280ff72  rsyslog-1.19.6.tar.gz
-8687f4cb4dbc28106890a00eabf2c6f7  rsyslog-1.19.6-repmsg.patch
+9aea93c0ad90db8ff5553d18b0ff75e7  rsyslog-1.19.10.tar.gz