upstream bug fix release

This commit is contained in:
Peter Vrabec 2007-07-23 14:49:14 +00:00
parent 031ec0f26a
commit 2e38b29b2c
4 changed files with 12 additions and 28 deletions

View File

@ -1,3 +1,3 @@
rsyslog-1.17.1.tar.gz rsyslog-1.17.2.tar.gz
rsyslog.init rsyslog.init
rsyslog.sysconfig rsyslog.sysconfig

View File

@ -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();
}

View File

@ -1,9 +1,9 @@
%define with_db 0 %define with_db 0
%define sbindir /sbin %define sbindir /sbin
Summary: Enhanced system logging and kernel message trapping daemons Summary: Enhanced system logging and kernel message trapping daemons
Name: rsyslog Name: rsyslog
Version: 1.17.1 Version: 1.17.2
Release: 1%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -11,7 +11,6 @@ URL: http://www.rsyslog.com/
Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz Source0: http://download.adiscon.com/rsyslog/%{name}-%{version}.tar.gz
Source1: rsyslog.init Source1: rsyslog.init
Source2: rsyslog.sysconfig Source2: rsyslog.sysconfig
Patch1: rsyslog-1.17.1-rOptionCompat.patch
Conflicts: logrotate < 3.5.2 Conflicts: logrotate < 3.5.2
%if %{with_db} %if %{with_db}
BuildRequires: mysql-devel >= 4.0 BuildRequires: mysql-devel >= 4.0
@ -24,6 +23,7 @@ Requires(post): /sbin/chkconfig coreutils
Requires(preun): /sbin/chkconfig /sbin/chkconfig Requires(preun): /sbin/chkconfig /sbin/chkconfig
Requires(postun): /sbin/service Requires(postun): /sbin/service
Provides: syslog Provides: syslog
Provides: sysklogd
Obsoletes: sysklogd Obsoletes: sysklogd
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 %prep
%setup -q %setup -q
%patch1 -p1 -b .rOptionCompat
%build %build
%configure --sbindir=%{sbindir} %configure --sbindir=%{sbindir}
@ -71,8 +70,8 @@ if [ $1 = 1 ]; then
fi fi
for n in /var/log/{messages,secure,maillog,spooler} for n in /var/log/{messages,secure,maillog,spooler}
do do
[ -f $n ] && continue [ -f $n ] && continue
umask 066 && touch $n umask 066 && touch $n
done done
%preun %preun
@ -99,6 +98,9 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %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 * Fri Jul 20 2007 Peter Vrabec <pvrabec@redhat.com> 1.17.1-1
- upstream bug fix release - upstream bug fix release
- include html docs (#248712) - include html docs (#248712)

View File

@ -1,3 +1,3 @@
a5bd8983f72c836a8f2da707a28b2372 rsyslog-1.17.1.tar.gz a9327c1e72f3950a97547445a4910f48 rsyslog-1.17.2.tar.gz
26932048c2b297a1fb7bbb6d0a1edb41 rsyslog.init 26932048c2b297a1fb7bbb6d0a1edb41 rsyslog.init
6cdadcfd270c58962c9fe560223acf99 rsyslog.sysconfig e10d2dc3238c2cf2a54933f10b19b9bf rsyslog.sysconfig