rpms/inn/devel inn-2.4.3.rcreaderaddrinuse.patch, NONE, 1.1 inn.spec, 1.37, 1.38

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	inn.spec 
Added Files:
	inn-2.4.3.rcreaderaddrinuse.patch 
Log Message:
use rsyslog instead of sysklogd, do not log fatal error for non-error eaddrinuse in rcreader

inn-2.4.3.rcreaderaddrinuse.patch:

--- NEW FILE inn-2.4.3.rcreaderaddrinuse.patch ---
diff -urNp inn-2.4.3-orig/innd/rc.c inn-2.4.3/innd/rc.c
--- inn-2.4.3-orig/innd/rc.c	2008-01-16 13:18:49.000000000 +0100
+++ inn-2.4.3/innd/rc.c	2008-01-16 13:25:48.000000000 +0100
@@ -1907,11 +1907,11 @@ RCsetup(int i)
     /* Set it up to wait for connections. */
     if (listen(i, MAXLISTEN) < 0) {
 	j = errno;
-	syslog(L_FATAL, "%s cant listen RCreader %m", LogName);
 	/* some IPv6 systems already listening on any address will 
 	   return EADDRINUSE when trying to listen on the IPv4 socket */
 	if (j == EADDRINUSE)
 	   return;
+	syslog(L_FATAL, "%s cant listen RCreader %m", LogName);
 	exit(1);
     }
 


Index: inn.spec
===================================================================
RCS file: /cvs/extras/rpms/inn/devel/inn.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- inn.spec	7 Jan 2008 16:22:07 -0000	1.37
+++ inn.spec	16 Jan 2008 13:06:34 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server
 Name: inn
 Version: 2.4.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 #see LICENSE file for details
 License: GPL+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -20,6 +20,7 @@
 Patch6: inn-2.4.1.posix.patch
 Patch7: inn-2.4.3.warn.patch
 Patch8: inn-2.4.2-makedbz.patch
+Patch9: inn-2.4.3.rcreaderaddrinuse.patch
 BuildRequires: perl-devel python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel
 Prereq: /sbin/chkconfig, grep, coreutils, sed
 Requires: bash >= 2.0, inews
@@ -77,6 +78,7 @@
 %patch6 -p1 -b .posix
 %patch7 -p1 -b .warn
 %patch8 -p1 -b .makedbz
+%patch9 -p1 -b .addrinuse
 
 perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
 perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -210,26 +212,26 @@
 service innd stop > /dev/null 2>&1
 exit 0
 
-%triggerin -- sysklogd
-if [ -f /etc/syslog.conf ]; then
-  if ! grep -q INN /etc/syslog.conf; then
-    sed 's/mail.none;/mail.none;news.none;/' < /etc/syslog.conf > /etc/syslog.conf.inn
-    mv /etc/syslog.conf.inn /etc/syslog.conf
+%triggerin -- rsyslog
+if [ -f /etc/rsyslog.conf ]; then
+  if ! grep -q INN /etc/rsyslog.conf; then
+    sed 's/mail.none;/mail.none;news.none;/' < /etc/rsyslog.conf > /etc/rsyslog.conf.inn
+    mv /etc/rsyslog.conf.inn /etc/rsyslog.conf
 
     echo '' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '#' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '# INN' \
-       >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
     echo '#' \
-       >> /etc/syslog.conf
-    echo 'news.=crit                                        /var/log/news/news.crit'   >> /etc/syslog.conf
-    echo 'news.=err                                         /var/log/news/news.err'    >> /etc/syslog.conf
-    echo 'news.notice                                       /var/log/news/news.notice' >> /etc/syslog.conf
+       >> /etc/rsyslog.conf
+    echo 'news.=crit                                        /var/log/news/news.crit'   >> /etc/rsyslog.conf
+    echo 'news.=err                                         /var/log/news/news.err'    >> /etc/rsyslog.conf
+    echo 'news.notice                                       /var/log/news/news.notice' >> /etc/rsyslog.conf
     fi
-  if [ -f /var/run/syslog.pid ]; then
-    kill -HUP `cat /var/run/syslog.pid` 2> /dev/null ||:
+  if [ -f /var/run/rsyslogd.pid ]; then
+    kill -HUP `cat /var/run/rsyslogd.pid` 2> /dev/null ||:
   fi
 fi
 
@@ -293,6 +295,11 @@
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jan 16 2008 Ondrej Vasik <ovasik at redhat.com> 2.4.3-9
+- do not show annoying fatal log message when nonfatal error 
+  eaddrinuse occured in rcreader
+- use /etc/rsyslog.conf instead of /etc/syslog.conf
+
 * Mon Jan 07 2008 Ondrej Vasik <ovasik at redhat.com> 2.4.3-8
 - initscript changes - review changes caused errors while
   in stop() phase - not known variable NEWSBIN(#401241)