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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-24 14:15:47 +0000 (Fri, 24 Jul 2009)
New Revision: 1529

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

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

Deleted: sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch	2009-07-24 14:15:08 UTC (rev 1528)
+++ sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch	2009-07-24 14:15:47 UTC (rev 1529)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 93_sulogin_fallback.dpatch by Petter Reinholdtsen
-
-Let sulogin fall back to the staticly linked /bin/sash if both roots
-shell and /bin/sh fail to execute.  Add suggests for sysvinit-utils to
-sah, for those that want this extra level of redundancy (Closes
-#43317).
-
- at DPATCH@
-diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
---- trunk~/src/sulogin.c	2008-03-26 09:34:25.000000000 +0100
-+++ trunk/src/sulogin.c	2008-03-26 09:34:25.000000000 +0100
-@@ -40,6 +40,7 @@
- #define F_PASSWD	"/etc/passwd"
- #define F_SHADOW	"/etc/shadow"
- #define BINSH		"/bin/sh"
-+#define STATICSH	"/bin/sash"
- 
- char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels at cistron.nl";
- 
-@@ -366,6 +367,12 @@
- 	setenv("SHELL", BINSH, 1);
- 	execl(BINSH, profile ? "-sh" : "sh", NULL);
- 	perror(BINSH);
-+
-+	/* Fall back to staticly linked shell if both the users shell
-+	   and /bin/sh failed to execute. */
-+	setenv("SHELL", STATICSH, 1);
-+	execl(STATICSH, STATICSH, NULL);
-+	perror(STATICSH);
- }
- 
- void usage(void)