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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 13:34:13 +0000 (Fri, 24 Jul 2009)
New Revision: 1513

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 13:32:15 UTC (rev 1512)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:34:13 UTC (rev 1513)
@@ -24,6 +24,7 @@
     - Drop patch 52_bootlogd_createlogfile now included upstream.
     - Drop patch 53_bootlogd_ttyB now included upstream.
     - Drop patch 60_init_race now included upstream.
+    - Drop patch 61_init_msg 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:32:15 UTC (rev 1512)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:34:13 UTC (rev 1513)
@@ -7,7 +7,6 @@
 21_ifdown_kfreebsd
 46_pidof_symlinkman
 54_bootlogd_findptyfail
-##61_init_msg
 ##62_init_freebsdterm
 ##63_init_longer_procname
 ##64_init_set_PATH

Deleted: sysvinit/trunk/debian/patches/61_init_msg.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/61_init_msg.dpatch	2009-07-24 13:32:15 UTC (rev 1512)
+++ sysvinit/trunk/debian/patches/61_init_msg.dpatch	2009-07-24 13:34:13 UTC (rev 1513)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 61_init_msg.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improve error message if fork() fail.  Patch found in Suse.
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:32:49.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:32:49.000000000 +0100
-@@ -973,7 +973,8 @@
- 			}
- 			SETSIG(sa, SIGCHLD, SIG_DFL, SA_RESTART);
- 			if ((pid = fork()) < 0) {
--  				initlog(L_VB, "cannot fork");
-+  				initlog(L_VB, "cannot fork: %s",
-+					strerror(errno));
- 				exit(1);
- 			}
- 			if (pid > 0) {
-@@ -1002,7 +1003,8 @@
- 				 *	this with a temporary process.
- 				 */
- 				if ((pid = fork()) < 0) {
--  					initlog(L_VB, "cannot fork");
-+  					initlog(L_VB, "cannot fork: %s",
-+						strerror(errno));
- 					exit(1);
- 				}
- 				if (pid == 0) {