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

[Petter Reinholdtsen]

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

Removed:
   sysvinit/trunk/debian/patches/83_killall_manref.dpatch
   sysvinit/trunk/debian/patches/85_killall_safecwd.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  - Drop patch 83_killall_manref now included upstream.
  - Drop patch 85_killall_safecwd now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 14:11:49 UTC (rev 1524)
+++ sysvinit/trunk/debian/changelog	2009-07-24 14:13:00 UTC (rev 1525)
@@ -40,6 +40,8 @@
     - Drop patch 81_killall_avoid_init now included upstream.
     - Drop patch 82_killall_exclude_pids now included upstream.
     - Drop patch 82_killall_retval now included upstream.
+    - Drop patch 83_killall_manref now included upstream.
+    - Drop patch 85_killall_safecwd 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 14:11:49 UTC (rev 1524)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 14:13:00 UTC (rev 1525)
@@ -9,9 +9,7 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##83_killall_manref
 ##84_killall_fuse
-##85_killall_safecwd
 ##90_shutdown_H
 ##91_sulogin_lockedpw
 ##92_sata-hddown

Deleted: sysvinit/trunk/debian/patches/83_killall_manref.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/83_killall_manref.dpatch	2009-07-24 14:11:49 UTC (rev 1524)
+++ sysvinit/trunk/debian/patches/83_killall_manref.dpatch	2009-07-24 14:13:00 UTC (rev 1525)
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 83_killall_manref.dpatch by Petter Reinholdtsen
-
-Add references between killall5 and pidof, and mention pidof in
-killall5(8) (Closes: #461160).
- 
- at DPATCH@
-diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
---- trunk~/man/killall5.8	2008-03-26 09:31:31.000000000 +0100
-+++ trunk/man/killall5.8	2008-03-26 09:31:31.000000000 +0100
-@@ -17,12 +17,16 @@
- .SH OPTIONS
- .IP "-o \fIomitpid\fP"
- Tells \fIkillall5\fP to omit processes with that process id.
-+.SH NOTES
-+\fIkillall5\fP can also be invoked as pidof, which is simply a
-+(symbolic) link to the \fIkillall5\fP program.
- .SH EXIT STATUS
- The program return zero if it killed processes.  It return 2 if no
- process were killed, and 1 if it was unable to find any processes
- (/proc/ is missing).
- .SH SEE ALSO
- .BR halt (8),
--.BR reboot (8)
-+.BR reboot (8),
-+.BR pidof (8)
- .SH AUTHOR
- Miquel van Smoorenburg, miquels at cistron.nl
-diff -urNad trunk~/man/pidof.8 trunk/man/pidof.8
---- trunk~/man/pidof.8	2008-03-26 09:31:31.000000000 +0100
-+++ trunk/man/pidof.8	2008-03-26 09:31:31.000000000 +0100
-@@ -50,6 +50,7 @@
- .BR shutdown (8),
- .BR init (8),
- .BR halt (8),
--.BR reboot (8)
-+.BR reboot (8),
-+.BR killall5 (8)
- .SH AUTHOR
- Miquel van Smoorenburg, miquels at cistron.nl

Deleted: sysvinit/trunk/debian/patches/85_killall_safecwd.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/85_killall_safecwd.dpatch	2009-07-24 14:11:49 UTC (rev 1524)
+++ sysvinit/trunk/debian/patches/85_killall_safecwd.dpatch	2009-07-24 14:13:00 UTC (rev 1525)
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 85_killall_safecwd.dpatch by Goswin von Brederlow, modified by Kel Modderman.
-
-Goal:
- Avoid deadlocks with fuse filesystems.
-
- After stopping all processes all filesystem access must be relative
- and restricted to /proc/.
-
-Fixes:               part of #476698
-Status wrt upstream: Should be sent upstream.  Not done yet.
-
- at DPATCH@
-diff -urNad sysvinit~/src/killall5.c sysvinit/src/killall5.c
---- sysvinit~/src/killall5.c	2009-07-11 17:49:04.000000000 +1000
-+++ sysvinit/src/killall5.c	2009-07-11 17:49:18.000000000 +1000
-@@ -168,6 +168,7 @@
- 
- /*
-  *	Read the proc filesystem.
-+ *	CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse).
-  */
- int readproc(int do_stat)
- {
-@@ -183,7 +184,11 @@
- 	int		pid, f;
- 
- 	/* Open the /proc directory. */
--	if ((dir = opendir("/proc")) == NULL) {
-+	if (chdir("/proc") == -1) {
-+		nsyslog(LOG_ERR, "chdir /proc failed");
-+		return -1;
-+	}
-+	if ((dir = opendir(".")) == NULL) {
- 		nsyslog(LOG_ERR, "cannot opendir(/proc)");
- 		return -1;
- 	}
-@@ -209,10 +214,10 @@
- 		memset(p, 0, sizeof(PROC));
- 
- 		/* Open the status file. */
--		snprintf(path, sizeof(path), "/proc/%s/stat", d->d_name);
-+		snprintf(path, sizeof(path), "%s/stat", d->d_name);
- 
- 		/* Read SID & statname from it. */
-- 		if ((fp = fopen(path, "r")) != NULL) {
-+		if ((fp = fopen(path, "r")) != NULL) {
- 			buf[0] = 0;
- 			fgets(buf, sizeof(buf), fp);
- 
-@@ -226,7 +231,7 @@
- 				if (q == NULL) {
- 					p->sid = 0;
- 					nsyslog(LOG_ERR,
--					"can't get program name from %s\n",
-+					"can't get program name from /proc/%s\n",
- 						path);
- 					free(p);
- 					continue;
-@@ -263,7 +268,7 @@
- 			continue;
- 		}
- 
--		snprintf(path, sizeof(path), "/proc/%s/cmdline", d->d_name);
-+		snprintf(path, sizeof(path), "%s/cmdline", d->d_name);
- 		if ((fp = fopen(path, "r")) != NULL) {
- 
- 			/* Now read argv[0] */