From 2e38b29b2c87c474e20d78477b8b24f362cec5e5 Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Jul 23 2007 14:49:14 +0000
Subject: upstream bug fix release


---

diff --git a/.cvsignore b/.cvsignore
index 0164d97..17df3be 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-rsyslog-1.17.1.tar.gz
+rsyslog-1.17.2.tar.gz
 rsyslog.init
 rsyslog.sysconfig
diff --git a/rsyslog-1.17.1-rOptionCompat.patch b/rsyslog-1.17.1-rOptionCompat.patch
deleted file mode 100644
index fdadc98..0000000
--- a/rsyslog-1.17.1-rOptionCompat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- rsyslog-1.17.1/syslogd.c.rOptionCompat	2007-07-20 10:22:56.000000000 +0200
-+++ rsyslog-1.17.1/syslogd.c	2007-07-20 12:34:02.000000000 +0200
-@@ -9174,7 +9174,14 @@
- 		case 'x':		/* disable dns for remote messages */
- 			DisableDNS = 1;
- 			break;
--		case '?':
-+		case '?':              
-+			/* handle "-r" option for compatibility reasons */
-+	                if(optopt == 'r') {
-+				opterr = 0;
-+		                AcceptRemote = 1;
-+				LogPort = "0";
-+				break;
-+			}
- 		default:
- 			usage();
- 		}
diff --git a/rsyslog.spec b/rsyslog.spec
index 74bdbb4..80ac7a5 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -1,9 +1,9 @@
-%define with_db 0
-%define sbindir	/sbin
+%define	with_db	0
+%define	sbindir	/sbin
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.17.1
+Version: 1.17.2
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
@@ -11,7 +11,6 @@ URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
 Source2: rsyslog.sysconfig
-Patch1: rsyslog-1.17.1-rOptionCompat.patch
 Conflicts: logrotate < 3.5.2
 %if %{with_db}
 BuildRequires: mysql-devel >= 4.0
@@ -24,6 +23,7 @@ Requires(post): /sbin/chkconfig coreutils
 Requires(preun): /sbin/chkconfig /sbin/chkconfig
 Requires(postun): /sbin/service
 Provides: syslog
+Provides: sysklogd
 Obsoletes: sysklogd
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +38,6 @@ at the same time being very easy to setup for the novice user.
 
 %prep
 %setup -q
-%patch1 -p1 -b .rOptionCompat
 
 %build
 %configure --sbindir=%{sbindir}
@@ -71,8 +70,8 @@ if [ $1 = 1 ]; then
 fi
 for n in /var/log/{messages,secure,maillog,spooler}
 do
-        [ -f $n ] && continue
-        umask 066 && touch $n
+	[ -f $n ] && continue
+	umask 066 && touch $n
 done
 
 %preun
@@ -99,6 +98,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon Jul 23 2007 Peter Vrabec <pvrabec@redhat.com> 1.17.2-1
+- upstream bug fix release
+
 * Fri Jul 20 2007 Peter Vrabec <pvrabec@redhat.com> 1.17.1-1
 - upstream bug fix release
 - include html docs (#248712)
diff --git a/sources b/sources
index a7e6537..90dc7cf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a5bd8983f72c836a8f2da707a28b2372  rsyslog-1.17.1.tar.gz
+a9327c1e72f3950a97547445a4910f48  rsyslog-1.17.2.tar.gz
 26932048c2b297a1fb7bbb6d0a1edb41  rsyslog.init
-6cdadcfd270c58962c9fe560223acf99  rsyslog.sysconfig
+e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig