diff --git a/SOURCES/xinetd-2.3.15-man-reload.patch b/SOURCES/xinetd-2.3.15-man-reload.patch new file mode 100644 index 0000000..8d1bce5 --- /dev/null +++ b/SOURCES/xinetd-2.3.15-man-reload.patch @@ -0,0 +1,17 @@ +--- a/xinetd/xinetd.man ++++ b/xinetd/xinetd.man +@@ -45,6 +45,12 @@ provide features such as access control and logging. Furthermore, + .I /etc/services. + Therefore, anybody can use \fBxinetd\fP to start special-purpose + servers. ++.LP ++BEWARE of xinetd reload termination handling. ++For services with type = INTERNAL, SIGTERM signal will be sent. ++For services without type = INTERNAL, SIGKILL signall will be sent. ++Take this into an account when dealing with proper handling of the SIGTERM and SIGKILL. ++It is important to be aware of this as your xinetd service could be killed on a xinetd reload. + .\" *************************** OPTIONS ********************************* + .SH OPTIONS + .TP +-- +1.9.3 diff --git a/SPECS/xinetd.spec b/SPECS/xinetd.spec index 52cc8da..58ffb24 100644 --- a/SPECS/xinetd.spec +++ b/SPECS/xinetd.spec @@ -1,7 +1,7 @@ Summary: A secure replacement for inetd Name: xinetd Version: 2.3.15 -Release: 12%{?dist} +Release: 13%{?dist} License: xinetd Group: System Environment/Daemons Epoch: 2 @@ -59,6 +59,8 @@ Patch28: xinetd-2.3.15-context-exepath.patch Patch29: xinetd-2.3.15-creds.patch # Fix #1037565 - xinetd segfaults when connecting to tcpmux service Patch30: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch +# Fix #1147538 - modify the xinetd man page to make it more clear on what happens to services on xinetd reload +Patch31: xinetd-2.3.15-man-reload.patch BuildRequires: autoconf, automake BuildRequires: libselinux-devel >= 1.30 @@ -116,6 +118,7 @@ located in the /etc/xinetd.d directory. %patch28 -p1 -b .context-exepath %patch29 -p1 -b .creds %patch30 -p1 +%patch31 -p1 aclocal autoconf @@ -163,6 +166,9 @@ install -m 600 %SOURCE3 $RPM_BUILD_ROOT/etc/sysconfig/xinetd %{_mandir}/*/* %changelog +* Thu Mar 3 2016 Jan Synáček - 2:2.3.15-13 +- modify the xinetd man page to make it more clear on what happens to services on xinetd reload (#1147538) + * Fri Jan 24 2014 Daniel Mach - 2:2.3.15-12 - Mass rebuild 2014-01-24