[Pkg-sysvinit-commits] r1953 - in sysvinit/trunk/debian: . startpar/patches

[Petter Reinholdtsen]

Author: pere
Date: 2011-01-01 08:17:53 +0000 (Sat, 01 Jan 2011)
New Revision: 1953

Added:
   sysvinit/trunk/debian/startpar/patches/09_noninteractive_ignore_sigint.patch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/startpar/patches/series
Log:
Acknowledge non-maintainer upload (Closes: #582442).  Thank you Ben for the patch.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2011-01-01 08:03:27 UTC (rev 1952)
+++ sysvinit/trunk/debian/changelog	2011-01-01 08:17:53 UTC (rev 1953)
@@ -1,11 +1,22 @@
 sysvinit (2.88dsf-14) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
+  * Acknowledge non-maintainer upload (Closes: #582442).  Thank you
+    Ben for the patch.
+
   * Debconf translations:
     - Add Danish translation by Joe Dalton (Closes: #599430).
     - Add Brazilian Portuguese by Adriano Rafael Gomes (Closes: #605851).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 14 Nov 2010 23:15:40 +0100
 
+sysvinit (2.88dsf-13.1) unstable; urgency=3Dlow
+
+  * Non-maintainer upload.
+  * Disable SIGINT for non-interactive init scripts (Closes: #582442)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 01 Jan 2011 03:45:28 +0000
+
 sysvinit (2.88dsf-13) unstable; urgency=low
 
   [ Kel Modderman ]

Added: sysvinit/trunk/debian/startpar/patches/09_noninteractive_ignore_sigint.patch
===================================================================
--- sysvinit/trunk/debian/startpar/patches/09_noninteractive_ignore_sigint.patch	                        (rev 0)
+++ sysvinit/trunk/debian/startpar/patches/09_noninteractive_ignore_sigint.patch	2011-01-01 08:17:53 UTC (rev 1953)
@@ -0,0 +1,30 @@
+--- a/startpar.c
++++ b/startpar.c
+@@ -397,7 +397,6 @@
+   if (p->pid != 0)
+     return;
+ 
+-  (void)signal(SIGINT,  SIG_DFL);
+   (void)signal(SIGQUIT, SIG_DFL);
+   (void)signal(SIGSEGV, SIG_DFL);
+   (void)signal(SIGTERM, SIG_DFL);
+@@ -511,7 +510,9 @@
+ 
+   if (pid == 0)
+     {
++      /* Interactive init scripts may be interrupted */
+       (void)signal(SIGINT,  SIG_DFL);
++
+       (void)signal(SIGQUIT, SIG_DFL);
+       (void)signal(SIGSEGV, SIG_DFL);
+       (void)signal(SIGTERM, SIG_DFL);
+@@ -700,6 +701,9 @@
+   char *splashopt = 0;
+   int notty = 0;
+ 
++  /* By default, init scripts should not be interruptible */
++  (void)signal(SIGINT,  SIG_IGN);
++
+   (void)signal(SIGUSR1, sighandler_preload);
+   (void)signal(SIGUSR2, sighandler_nopreload);
+ 

Modified: sysvinit/trunk/debian/startpar/patches/series
===================================================================
--- sysvinit/trunk/debian/startpar/patches/series	2011-01-01 08:03:27 UTC (rev 1952)
+++ sysvinit/trunk/debian/startpar/patches/series	2011-01-01 08:17:53 UTC (rev 1953)
@@ -7,3 +7,4 @@
 06_stdin_notty.patch
 07_nocrash_missing_arg.patch
 08_kfreebsd_proc_error_debug.patch
+09_noninteractive_ignore_sigint.patch