From 23d2ad378e6b55b8a91333d50214d42275c0f770 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@fedoraproject.org>
Date: Tue, 10 Feb 2009 14:15:38 +0000
Subject: [PATCH] upgrade

---
 .cvsignore                 |  2 +-
 rsyslog-3.21.9-dodie.patch | 17 -----------------
 rsyslog-3.21.9-opts.patch  | 24 ------------------------
 rsyslog.spec               | 11 +++++------
 sources                    |  2 +-
 5 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 rsyslog-3.21.9-dodie.patch
 delete mode 100644 rsyslog-3.21.9-opts.patch

diff --git a/.cvsignore b/.cvsignore
index 3e2643c..4946e21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rsyslog-3.21.9.tar.gz
+rsyslog-3.21.10.tar.gz
diff --git a/rsyslog-3.21.9-dodie.patch b/rsyslog-3.21.9-dodie.patch
deleted file mode 100644
index c568a8a..0000000
--- a/rsyslog-3.21.9-dodie.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up rsyslog-3.21.9/tools/syslogd.c.dodie rsyslog-3.21.9/tools/syslogd.c
---- rsyslog-3.21.9/tools/syslogd.c.dodie	2009-01-05 17:20:33.000000000 +0100
-+++ rsyslog-3.21.9/tools/syslogd.c	2009-01-05 17:25:19.000000000 +0100
-@@ -1877,9 +1877,11 @@ static void doDie(int sig)
- #	define MSG1 "DoDie called.\n"
- #	define MSG2 "DoDie called 5 times - unconditional exit\n"
- 	static int iRetries = 0; /* debug aid */
--	write(1, MSG1, sizeof(MSG1));
-+	if(Debug || NoFork)
-+		write(1, MSG1, sizeof(MSG1) - 1);
- 	if(iRetries++ == 4) {
--		write(1, MSG2, sizeof(MSG2));
-+		if(Debug || NoFork)
-+			write(1, MSG2, sizeof(MSG2) - 1);
- 		abort();
- 	}
- 	bFinished = sig;
diff --git a/rsyslog-3.21.9-opts.patch b/rsyslog-3.21.9-opts.patch
deleted file mode 100644
index 9ea6d64..0000000
--- a/rsyslog-3.21.9-opts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up rsyslog-3.21.9/tools/syslogd.c.opts rsyslog-3.21.9/tools/syslogd.c
---- rsyslog-3.21.9/tools/syslogd.c.opts	2008-12-09 10:36:02.000000000 +0100
-+++ rsyslog-3.21.9/tools/syslogd.c	2008-12-09 10:57:03.000000000 +0100
-@@ -391,8 +391,9 @@ static void processImInternal(void);
- 
- static int usage(void)
- {
--	fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
--			"                [-fconffile] [-ipidfile] [-Nlevel]\n"
-+	fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
-+			"                [-f<conffile>] [-i<pidfile>] [-N<level>] [-M<module load path>]\n"
-+			"                [-u<number>]\n"
- 			"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
- 			"For further information see http://www.rsyslog.com/doc\n");
- 	exit(1); /* "good" exit - done to terminate usage() */
-@@ -3164,7 +3165,7 @@ int realMain(int argc, char **argv)
- 	 * only when actually neeeded. 
- 	 * rgerhards, 2008-04-04
- 	 */
--	while((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nN:opqQr::s:t:u:vwx")) != EOF) {
-+	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:u:vwx")) != EOF) {
- 		switch((char)ch) {
-                 case '4':
-                 case '6':
diff --git a/rsyslog.spec b/rsyslog.spec
index de8fcb5..f52ff6d 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -2,8 +2,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 3.21.9
-Release: 3%{?dist}
+Version: 3.21.10
+Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,8 +12,6 @@ Source1: rsyslog.init
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
-Patch0: rsyslog-3.21.9-opts.patch
-Patch1: rsyslog-3.21.9-dodie.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -89,8 +87,6 @@ IETF standard protocol.
 
 %prep
 %setup -q
-%patch0 -p1 -b .opts
-%patch1 -p1 -b .dodie
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
@@ -196,6 +192,9 @@ fi
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Tue Feb 10 2009 Tomas Heinrich <theinric@redhat.com> 3.21.10-1
+- upgrade
+
 * Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> 3.21.9-3
 - rebuild for dependencies
 
diff --git a/sources b/sources
index 607900e..be2ac0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06e1d9fa8f40263bb654b38d2ef57e6c  rsyslog-3.21.9.tar.gz
+c3354921ccb1d83d00199212d35e1d43  rsyslog-3.21.10.tar.gz