rpms/sysklogd/F-7 sysklogd-1.4.2rh-startFailed.patch, NONE, 1.1 sysklogd.spec, 1.55, 1.56
Peter Vrabec (pvrabec)
fedora-extras-commits at redhat.com
Thu Jun 7 07:38:14 UTC 2007
Author: pvrabec
Update of /cvs/extras/rpms/sysklogd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14314
Modified Files:
sysklogd.spec
Added Files:
sysklogd-1.4.2rh-startFailed.patch
Log Message:
terminate dispatcher on exit
sysklogd-1.4.2rh-startFailed.patch:
--- NEW FILE sysklogd-1.4.2rh-startFailed.patch ---
--- sysklogd-1.4.2rh/syslogd.c.startFailed 2007-05-07 15:49:48.000000000 +0200
+++ sysklogd-1.4.2rh/syslogd.c 2007-05-07 15:53:50.000000000 +0200
@@ -788,6 +788,7 @@
void exit_signal_handler(int sig);
#ifndef TESTING
void doexit(int sig);
+void doExitFail(int sig);
#endif
void init();
void cfline(char *line, register struct filed *f);
@@ -945,7 +946,8 @@
dprintf("Checking pidfile.\n");
if (!check_pid(PidFile))
{
- signal (SIGTERM, doexit);
+ signal(SIGTERM, doexit);
+ signal(SIGCHLD, doExitFail);
if (fork()) {
/*
* Parent process
@@ -962,6 +964,7 @@
exit(1);
}
signal (SIGTERM, SIG_DFL);
+ signal (SIGCHLD, SIG_DFL);
num_fds = getdtablesize();
for (i= 0; i < num_fds; i++)
(void) close(i);
@@ -2408,6 +2411,13 @@
{
exit (0);
}
+
+void doExitFail(sig)
+ int sig;
+{
+ exit (1);
+}
+
#endif
/*
Index: sysklogd.spec
===================================================================
RCS file: /cvs/extras/rpms/sysklogd/F-7/sysklogd.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sysklogd.spec 7 Jun 2007 07:23:12 -0000 1.55
+++ sysklogd.spec 7 Jun 2007 07:37:40 -0000 1.56
@@ -1,7 +1,7 @@
Summary: System logging and kernel message trapping daemons
Name: sysklogd
Version: 1.4.2
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPL
Group: System Environment/Daemons
URL: http://www.infodrom.org/projects/sysklogd/
@@ -16,6 +16,7 @@
Patch1: sysklogd-1.4.2rh.timezone.patch
Patch2: sysklogd-1.4.2rh-includeFacPri.patch
Patch3: sysklogd-1.4.2rh-dispatcher.patch
+Patch4: sysklogd-1.4.2rh-startFailed.patc
Conflicts: logrotate < 3.5.2
Requires: logrotate
Requires: bash >= 2.0
@@ -47,6 +48,7 @@
%patch1 -p1 -b .timezone
%patch2 -p1 -b .includeFacPri
%patch3 -p1 -b .dispatcher
+%patch4 -p1 -b .startFailed
%build
make %{?_smp_mflags}
@@ -118,6 +120,9 @@
%{_includedir}/sysklogd/sysklogd-dispatch.h
%changelog
+* Thu Jun 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-7
+- terminate dispatcher on exit
+
* Thu Jun 07 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-6
- fix realtime interface
- terminate parent of syslogd daemon on SIGCHLD
More information about the fedora-extras-commits
mailing list