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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:59:05 +0000 (Fri, 24 Jul 2009)
New Revision: 1523

Removed:
   sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
Drop patch 81_killall_avoid_init now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:57:42 UTC (rev 1522)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:59:05 UTC (rev 1523)
@@ -37,6 +37,7 @@
     - Drop patch 71_wall_hostname now included upstream.
     - Drop patch 80_killall_pidof now included upstream.
     - Drop patch 80_killall_sched now included upstream.
+    - Drop patch 81_killall_avoid_init now included upstream.
     - Drop patch 82_killall_exclude_pids now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:57:42 UTC (rev 1522)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:59:05 UTC (rev 1523)
@@ -9,7 +9,6 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##81_killall_avoid_init
 ##82_killall_retval
 ##83_killall_manref
 ##84_killall_fuse

Deleted: sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch	2009-07-24 13:57:42 UTC (rev 1522)
+++ sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch	2009-07-24 13:59:05 UTC (rev 1523)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_killall_avoid_init.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure we do not try to kill init (pid 1) by mistake.  Patch
-## DP: from SuSe.
-
- at DPATCH@
-diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
---- trunk~/src/killall5.c	2008-03-26 09:31:20.000000000 +0100
-+++ trunk/src/killall5.c	2008-03-26 09:31:20.000000000 +0100
-@@ -633,11 +633,11 @@
- 		exit(1);
- 	}
- 
--	/* Now kill all processes except our session. */
-+	/* Now kill all processes except init (pid 1) and our session. */
- 	sid = (int)getsid(0);
- 	pid = (int)getpid();
- 	for (p = plist; p; p = p->next)
--		if (p->pid != pid && p->sid != sid && !p->kernel)
-+		if (p->pid != 1 && p->pid != pid && p->sid != sid && !p->kernel)
- 			kill(p->pid, sig);
- 
- 	/* And let them continue. */