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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:51:43 +0000 (Fri, 24 Jul 2009)
New Revision: 1519

Removed:
   sysvinit/trunk/debian/patches/69_init_waiting.dpatch
   sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  - Drop patch 69_init_waiting now included upstream.
  - Drop patch 70_init_consoleopen now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:50:49 UTC (rev 1518)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:51:43 UTC (rev 1519)
@@ -31,6 +31,8 @@
     - Drop patch 65_init_u_in_06 now included upstream.
     - Drop patch 66_init_emerg_tty now included upstream.
     - Drop patch 67_init_hddown now included upstream.
+    - Drop patch 69_init_waiting now included upstream.
+    - Drop patch 70_init_consoleopen now included upstream.
     - Drop patch 70_wall_ttyname now included upstream.
     - Drop patch 71_wall_hostname now included upstream.
 

Modified: sysvinit/trunk/debian/patches/00list
===================================================================
--- sysvinit/trunk/debian/patches/00list	2009-07-24 13:50:49 UTC (rev 1518)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:51:43 UTC (rev 1519)
@@ -9,8 +9,6 @@
 54_bootlogd_findptyfail
 62_init_freebsdterm
 #68_init_quiet
-##69_init_waiting
-##70_init_consoleopen
 ##80_killall_pidof
 ##80_killall_sched
 ##81_killall_avoid_init

Deleted: sysvinit/trunk/debian/patches/69_init_waiting.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/69_init_waiting.dpatch	2009-07-24 13:50:49 UTC (rev 1518)
+++ sysvinit/trunk/debian/patches/69_init_waiting.dpatch	2009-07-24 13:51:43 UTC (rev 1519)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# 69_init_waiting.dpatch by Petter Reinholdtsen
-
-The patch is a copy of sysvinit-2.86-godot.patch from Fedora.  It make
-sure the waiting status is preserved across re-exec.  See bugs
-https://bugzilla.redhat.com/show_bug.cgi?id=199305
-https://bugzilla.redhat.com/show_bug.cgi?id=201146 and
-https://bugzilla.redhat.com/show_bug.cgi?id=143289
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:34:16.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:34:17.000000000 +0100
-@@ -190,6 +190,7 @@
- 	{"RU",RUNNING},
- 	{"DE",DEMAND},
- 	{"XD",XECUTED},
-+	{"WT",WAITING},
- 	{NULL,0}
- };
- 

Deleted: sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch	2009-07-24 13:50:49 UTC (rev 1518)
+++ sysvinit/trunk/debian/patches/70_init_consoleopen.dpatch	2009-07-24 13:51:43 UTC (rev 1519)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_init_consoleopen.dpatch by Bill Nottingham and Fedora.
-
-Allow some time for failed opens to resolve themselves (RH bug #181546).
-
- at DPATCH@
---- sysvinit-2.86/src/init.c.eieio	2006-08-10 15:34:23.000000000 -0400
-+++ sysvinit-2.86/src/init.c	2006-08-10 15:34:50.000000000 -0400
-@@ -531,8 +531,10 @@
- 	/*
- 	 *	Retry the open five times.
- 	 */
--	for(f = 0; f < 5; f++)
-+	for(f = 0; f < 5; f++) {
- 		if ((fd = open(console_dev, m)) >= 0) break;
-+		usleep(100);
-+	}
- 
- 	if (fd < 0) return fd;
-