rpms/rsyslog/devel rsyslog-1.17.1-rOptionCompat.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rsyslog.spec, 1.1, 1.2 sources, 1.2, 1.3 rsyslog-1.17.0-cleanup.patch, 1.1, NONE

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24048

Modified Files:
	.cvsignore rsyslog.spec sources 
Added Files:
	rsyslog-1.17.1-rOptionCompat.patch 
Removed Files:
	rsyslog-1.17.0-cleanup.patch 
Log Message:
- upstream bug fix release
- include html docs (#248712)
- make "-r" option compatible with sysklogd config (248982)


rsyslog-1.17.1-rOptionCompat.patch:

--- NEW FILE rsyslog-1.17.1-rOptionCompat.patch ---
--- 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();
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Jul 2007 09:09:41 -0000	1.2
+++ .cvsignore	20 Jul 2007 10:43:39 -0000	1.3
@@ -1,2 +1,3 @@
-rsyslog-1.17.0.tar.gz
+rsyslog-1.17.1.tar.gz
 rsyslog.init
+rsyslog.sysconfig


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.spec	18 Jul 2007 09:09:41 -0000	1.1
+++ rsyslog.spec	20 Jul 2007 10:43:39 -0000	1.2
@@ -3,14 +3,15 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.17.0
+Version: 1.17.1
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
 Source1: rsyslog.init
-Patch1: rsyslog-1.17.0-cleanup.patch
+Source2: rsyslog.sysconfig
+Patch1: rsyslog-1.17.1-rOptionCompat.patch
 Conflicts: logrotate < 3.5.2
 %if %{with_db}
 BuildRequires: mysql-devel >= 4.0
@@ -37,9 +38,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .cleanup
-
-autoreconf
+%patch1 -p1 -b .rOptionCompat
 
 %build
 %configure --sbindir=%{sbindir}
@@ -56,7 +55,7 @@
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog
 install -p -m 644 redhat/rsyslog.conf $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
 install -p -m 644 redhat/rsyslog.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rsyslog
-install -p -m 644 redhat/rsyslog.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyslog
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyslog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +88,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING INSTALL NEWS README
+%doc AUTHORS COPYING INSTALL NEWS README doc
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
 %config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
@@ -100,7 +99,12 @@
 %{_mandir}/*/*
 
 %changelog
-* Thu Jul 17 2007 Peter Vrabec <pvrabec at redhat.com> 1.17.0-1
+* Fri Jul 20 2007 Peter Vrabec <pvrabec at redhat.com> 1.17.1-1
+- upstream bug fix release
+- include html docs (#248712)
+- make "-r" option compatible with sysklogd config (248982)
+
+* Tue Jul 17 2007 Peter Vrabec <pvrabec at redhat.com> 1.17.0-1
 - feature rich upstream release
 
 * Thu Jul 12 2007 Peter Vrabec <pvrabec at redhat.com> 1.15.1-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Jul 2007 09:09:41 -0000	1.2
+++ sources	20 Jul 2007 10:43:39 -0000	1.3
@@ -1,2 +1,3 @@
-bf138b47f6474d3c2d2320945ba9ac28  rsyslog-1.17.0.tar.gz
+a5bd8983f72c836a8f2da707a28b2372  rsyslog-1.17.1.tar.gz
 26932048c2b297a1fb7bbb6d0a1edb41  rsyslog.init
+6cdadcfd270c58962c9fe560223acf99  rsyslog.sysconfig


--- rsyslog-1.17.0-cleanup.patch DELETED ---