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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 14:16:12 +0000 (Fri, 24 Jul 2009)
New Revision: 1530

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

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-24 14:15:47 UTC (rev 1529)
+++ sysvinit/trunk/debian/changelog	2009-07-24 14:16:12 UTC (rev 1530)
@@ -48,6 +48,7 @@
   * - Drop patch 90_shutdown_H now included upstream.
   * - Drop patch 92_sata-hddown now included upstream.
   * - Drop patch 93_sulogin_fallback now included upstream.
+  * - Drop patch 95_halt-name 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:15:47 UTC (rev 1529)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 14:16:12 UTC (rev 1530)
@@ -11,6 +11,5 @@
 #68_init_quiet
 ##91_sulogin_lockedpw
 94_fstab-decode
-##95_halt-name
 96_shutdown_acctoff
 97_init_starttest

Deleted: sysvinit/trunk/debian/patches/95_halt-name.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/95_halt-name.dpatch	2009-07-24 14:15:47 UTC (rev 1529)
+++ sysvinit/trunk/debian/patches/95_halt-name.dpatch	2009-07-24 14:16:12 UTC (rev 1530)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 95_halt-name.dpatch by Dale R. Worley and Fedora.
-
-Fix halt when used as login shell.  ARGV[0] is -halt or -reboot in
-this case.  See
-<URL:https://bugzilla.redhat.com/show_bug.cgi?id=104062> for the
-details.
-
- at DPATCH@
---- sysvinit-2.86/src/halt.c.foo	2005-12-20 15:09:35.000000000 -0500
-+++ sysvinit-2.86/src/halt.c	2005-12-20 15:09:25.000000000 -0500
-@@ -178,6 +178,8 @@
- 	/*
- 	 *	Find out who we are
- 	 */
-+	/* Remove dash passed on in argv[0] when used as login shell. */
-+	if (argv[0][0] == '-') argv[0]++;
- 	if ((progname = strrchr(argv[0], '/')) != NULL)
- 		progname++;
- 	else