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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 14:13:45 +0000 (Fri, 24 Jul 2009)
New Revision: 1526

Removed:
   sysvinit/trunk/debian/patches/84_killall_fuse.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
- Drop patch 84_killall_fuse now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 14:13:00 UTC (rev 1525)
+++ sysvinit/trunk/debian/changelog	2009-07-24 14:13:45 UTC (rev 1526)
@@ -44,6 +44,7 @@
     - Drop patch 85_killall_safecwd now included upstream.
 
   * XXX Need to remove debian patches now included in the new upstream release.
+  * - Drop patch 84_killall_fuse now included upstream.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 24 Jul 2009 11:26:26 +0200
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 14:13:00 UTC (rev 1525)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 14:13:45 UTC (rev 1526)
@@ -9,7 +9,6 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##84_killall_fuse
 ##90_shutdown_H
 ##91_sulogin_lockedpw
 ##92_sata-hddown

Deleted: sysvinit/trunk/debian/patches/84_killall_fuse.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/84_killall_fuse.dpatch	2009-07-24 14:13:00 UTC (rev 1525)
+++ sysvinit/trunk/debian/patches/84_killall_fuse.dpatch	2009-07-24 14:13:45 UTC (rev 1526)
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 84_killall_fuse.dpatch by Goswin von Brederlow.
-
-Goal:
-
-  Make killall5 work better with user space file systems, needing
-  running processes to do stat().  Avoid stat() when the information
-  isn't used, and lock process in memory to avoid paging when fuse
-  user space process is stopped.
-
-Fixes:               #476695
-Status wrt upstream: Should be sent upstream.  Not done yet.
-Notes:   
- 
- at DPATCH@
-Index: trunk/src/killall5.c
-===================================================================
---- trunk/src/killall5.c	(revision 1266)
-+++ trunk/src/killall5.c	(working copy)
-@@ -40,10 +40,13 @@
- #include <syslog.h>
- #include <getopt.h>
- #include <stdarg.h>
-+#include <sys/mman.h>
- 
- char *Version = "@(#)killall5 2.86 31-Jul-2004 miquels at cistron.nl";
- 
- #define STATNAMELEN	15
-+#define DO_STAT 1
-+#define NO_STAT 0
- 
- /* Info about a process. */
- typedef struct proc {
-@@ -166,7 +169,7 @@
- /*
-  *	Read the proc filesystem.
-  */
--int readproc()
-+int readproc(int do_stat)
- {
- 	DIR		*dir;
- 	FILE		*fp;
-@@ -306,7 +309,7 @@
- 
- 		/* Try to stat the executable. */
- 		snprintf(path, sizeof(path), "/proc/%s/exe", d->d_name);
--		if (stat(path, &st) == 0) {
-+		if (do_stat && stat(path, &st) == 0) {
- 			p->dev = st.st_dev;
- 			p->ino = st.st_ino;
- 		}
-@@ -519,7 +522,7 @@
- 	argv += optind;
- 
- 	/* Print out process-ID's one by one. */
--	readproc();
-+	readproc(DO_STAT);
- 	for(f = 0; f < argc; f++) {
- 		if ((q = pidof(argv[f])) != NULL) {
- 			spid = 0;
-@@ -595,12 +598,15 @@
- 	signal(SIGSTOP, SIG_IGN);
- 	signal(SIGKILL, SIG_IGN);
- 
-+	/* lock us into memory */
-+	mlockall(MCL_CURRENT | MCL_FUTURE);
-+
- 	/* Now stop all processes. */
- 	kill(-1, SIGSTOP);
- 	sent_sigstop = 1;
- 
- 	/* Read /proc filesystem */
--	if (readproc() < 0) {
-+	if (readproc(NO_STAT) < 0) {
- 		kill(-1, SIGCONT);
- 		exit(1);
- 	}