rpms/sysklogd/F-7 sysklogd-1.4.2rh-dispatcher.patch, 1.1, 1.2 sysklogd.spec, 1.54, 1.55

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/sysklogd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10911

Modified Files:
	sysklogd-1.4.2rh-dispatcher.patch sysklogd.spec 
Log Message:
- fix realtime interface
- terminate parent of syslogd daemon on SIGCHLD


sysklogd-1.4.2rh-dispatcher.patch:

Index: sysklogd-1.4.2rh-dispatcher.patch
===================================================================
RCS file: /cvs/extras/rpms/sysklogd/F-7/sysklogd-1.4.2rh-dispatcher.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sysklogd-1.4.2rh-dispatcher.patch	16 Apr 2007 18:15:26 -0000	1.1
+++ sysklogd-1.4.2rh-dispatcher.patch	7 Jun 2007 07:23:12 -0000	1.2
@@ -1,5 +1,5 @@
---- sysklogd-1.4.2rh/sysklogd.8.dispatcher	2007-04-16 19:27:44.000000000 +0200
-+++ sysklogd-1.4.2rh/sysklogd.8	2007-04-16 19:27:44.000000000 +0200
+--- sysklogd-1.4.2rh/sysklogd.8.dispatcher	2007-05-14 16:53:48.000000000 +0200
++++ sysklogd-1.4.2rh/sysklogd.8	2007-05-14 16:53:48.000000000 +0200
 @@ -30,6 +30,9 @@
  .RB [ " \-s "
  .I domainlist
@@ -45,8 +45,8 @@
  .SH INSTALLATION CONCERNS
  There is probably one important consideration when installing this
  version of syslogd.  This version of syslogd is dependent on proper
---- /dev/null	2007-04-11 16:01:52.461576228 +0200
-+++ sysklogd-1.4.2rh/sysklogd-dispatch.h	2007-04-16 19:27:44.000000000 +0200
+--- /dev/null	2007-05-10 11:02:57.435034000 +0200
++++ sysklogd-1.4.2rh/sysklogd-dispatch.h	2007-05-14 16:53:48.000000000 +0200
 @@ -0,0 +1,64 @@
 +/* sysklogd-dispatch.h -- 
 + * Copyright 2007 Red Hat Inc., Durham, North Carolina.
@@ -113,7 +113,7 @@
 +
 +#endif
 --- sysklogd-1.4.2rh/Makefile.dispatcher	2007-02-26 10:46:08.000000000 +0100
-+++ sysklogd-1.4.2rh/Makefile	2007-04-16 19:30:48.000000000 +0200
++++ sysklogd-1.4.2rh/Makefile	2007-05-14 16:53:48.000000000 +0200
 @@ -10,6 +10,7 @@
  INSTALL = /usr/bin/install
  BINDIR = $(TOPDIR)/sbin
@@ -146,9 +146,9 @@
  
  ## Red Hat specific additions
  
---- /dev/null	2007-04-11 16:01:52.461576228 +0200
-+++ sysklogd-1.4.2rh/sysklogd-dispatch.c	2007-04-16 19:27:44.000000000 +0200
-@@ -0,0 +1,185 @@
+--- /dev/null	2007-05-10 11:02:57.435034000 +0200
++++ sysklogd-1.4.2rh/sysklogd-dispatch.c	2007-05-14 16:53:48.000000000 +0200
+@@ -0,0 +1,190 @@
 +/* sysklogd-dispatch.c -- 
 + * Copyright 2007 Red Hat Inc., Durham, North Carolina.
 + * All Rights Reserved.
@@ -232,8 +232,13 @@
 +	pid = fork();
 +	switch(pid) {
 +		case 0:	// child
-+			dup2(disp_pipe[0], 0);
-+			close(disp_pipe[0]);
++			/* in case stdin was closed before sockerpair(),
++			   disp_pipe[0] --eq 0. It's usual because syslogd 
++			   run as daemon. */
++			if( disp_pipe[0] != 0 ) {
++				dup2(disp_pipe[0], 0);
++				close(disp_pipe[0]);
++			}
 +			close(disp_pipe[1]);
 +			setsid();
 +			execl(config->dispatcher, config->dispatcher, NULL);
@@ -334,8 +339,8 @@
 +	} else
 +		n_errs = 0;
 +}
---- sysklogd-1.4.2rh/syslogd.c.dispatcher	2007-04-16 19:27:44.000000000 +0200
-+++ sysklogd-1.4.2rh/syslogd.c	2007-04-16 19:27:44.000000000 +0200
+--- sysklogd-1.4.2rh/syslogd.c.dispatcher	2007-05-14 16:53:48.000000000 +0200
++++ sysklogd-1.4.2rh/syslogd.c	2007-05-14 17:00:50.000000000 +0200
 @@ -507,6 +507,8 @@
  #endif
  #include "version.h"
@@ -440,7 +445,20 @@
  	case F_USERS:
  	case F_WALL:
  		f->f_time = now;
-@@ -2868,7 +2898,15 @@
+@@ -2338,6 +2368,12 @@
+ 		logmsg(LOG_SYSLOG|LOG_INFO, buf, LocalHostName, ADDDATE);
+ 	}
+ 
++	/* Terminate dispatcher */
++	if (disp.dispatcher != NULL) {
++		shutdown_dispatcher();
++		disp.dispatcher = NULL;
++	}
++
+ 	/* Close the UNIX sockets. */
+         for (i = 0; i < nfunix; i++)
+ 		if (funix[i] != -1)
+@@ -2868,7 +2904,15 @@
  		if (strcmp(p, ctty) == 0)
  			f->f_type = F_CONSOLE;
  		break;


Index: sysklogd.spec
===================================================================
RCS file: /cvs/extras/rpms/sysklogd/F-7/sysklogd.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sysklogd.spec	16 Apr 2007 18:15:26 -0000	1.54
+++ sysklogd.spec	7 Jun 2007 07:23:12 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -118,6 +118,10 @@
 %{_includedir}/sysklogd/sysklogd-dispatch.h
 
 %changelog
+* Thu Jun 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-6
+- fix realtime interface
+- terminate parent of syslogd daemon on SIGCHLD
+
 * Mon Apr 16 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-5
 - sysklogd provides new realtime interface (#236356)