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

Fri Jul 24 13:39:04 UTC 2009

Author: pere
Date: 2009-07-24 13:39:03 +0000 (Fri, 24 Jul 2009)
New Revision: 1516

Removed:
   sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch
   sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch
   sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/patches/00list
Log:
  - Drop patch 64_init_reexec_env now included upstream.
  - Drop patch 64_init_set_PATH now included upstream.
  - Drop patch 65_init_u_in_06 now included upstream.

Modified: sysvinit/trunk/debian/changelog
===================================================================

--- sysvinit/trunk/debian/changelog	2009-07-24 13:37:45 UTC (rev 1515)
+++ sysvinit/trunk/debian/changelog	2009-07-24 13:39:03 UTC (rev 1516)
@@ -26,6 +26,9 @@
     - Drop patch 60_init_race now included upstream.
     - Drop patch 61_init_msg now included upstream.
     - Drop patch 63_init_longer_procname now included upstream.
+    - Drop patch 64_init_reexec_env now included upstream.
+    - Drop patch 64_init_set_PATH now included upstream.
+    - Drop patch 65_init_u_in_06 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:37:45 UTC (rev 1515)
+++ sysvinit/trunk/debian/patches/00list	2009-07-24 13:39:03 UTC (rev 1516)
@@ -8,9 +8,6 @@
 46_pidof_symlinkman
 54_bootlogd_findptyfail
 62_init_freebsdterm
-##64_init_set_PATH
-##64_init_reexec_env
-##65_init_u_in_06
 ##66_init_emerg_tty
 ##67_init_hddown
 #68_init_quiet

Deleted: sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch	2009-07-24 13:37:45 UTC (rev 1515)
+++ sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch	2009-07-24 13:39:03 UTC (rev 1516)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 64_init_reexec_env.dpatch by Petter Reinholdtsen
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure the environment is passed on to the new init program
-## DP: when re-exec is used.  The patch is sysvinit-2.86-environ.patch
-## from Fedora.
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:34:05.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:34:05.000000000 +0100
-@@ -1899,7 +1899,7 @@
- 	 *	The existing init process execs a new init binary.
- 	 */
- 	env = init_buildenv(0);
--	execl(myname, myname, "--init", NULL, env);
-+	execle(myname, myname, "--init", NULL, env);
- 
- 	/*
- 	 *	We shouldn't be here, something failed. 

Deleted: sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch	2009-07-24 13:37:45 UTC (rev 1515)
+++ sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch	2009-07-24 13:39:03 UTC (rev 1516)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 64_init_set_PATH.dpatch by Thomas Hood
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set PATH to a sane value if it is unset on re-exec.
-## DP: Use setenv() instead of putenv() to set PATH since the latter
-## DP: allows the default PATH string to be clobbered, rendering it
-## DP: not reusable on re-exec.
-
- at DPATCH@
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:34:08.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:34:08.000000000 +0100
-@@ -2427,7 +2427,7 @@
-   	/*
- 	 *	Set default PATH variable.
- 	 */
--  	putenv(PATH_DFL);
-+  	setenv("PATH", PATH_DEFAULT, 1 /* Overwrite */);
- 
-   	/*
- 	 *	Initialize /var/run/utmp (only works if /var is on
-@@ -2466,6 +2466,11 @@
- 	initlog(L_CO, bootmsg, "reloading");
- 	sigfillset(&sgt);
- 	sigprocmask(SIG_UNBLOCK, &sgt, NULL);
-+
-+  	/*
-+	 *	Set default PATH variable.
-+	 */
-+  	setenv("PATH", PATH_DEFAULT, 0 /* Don't overwrite */);
-   }
-   start_if_needed();
- 
-diff -urNad trunk~/src/init.h trunk/src/init.h
---- trunk~/src/init.h	2008-03-26 09:33:39.000000000 +0100
-+++ trunk/src/init.h	2008-03-26 09:34:08.000000000 +0100
-@@ -24,7 +24,7 @@
- #define SLEEPTIME  300			/* Disable time */
- 
- /* Default path inherited by every child. */
--#define PATH_DFL   "PATH=/bin:/usr/bin:/sbin:/usr/sbin"
-+#define PATH_DEFAULT   "/sbin:/usr/sbin:/bin:/usr/bin"
- 
- 
- /* Prototypes. */

Deleted: sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch	2009-07-24 13:37:45 UTC (rev 1515)
+++ sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch	2009-07-24 13:39:03 UTC (rev 1516)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 65_init_u_in_06.dpatch by Thomas Hood
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow 'telinit u' in runlevels 0 and 6
-
- at DPATCH@
-diff -urNad trunk~/man/init.8 trunk/man/init.8
---- trunk~/man/init.8	2008-03-26 09:34:10.000000000 +0100
-+++ trunk/man/init.8	2008-03-26 09:34:10.000000000 +0100
-@@ -159,7 +159,7 @@
- .IP "\fBU\fP or \fBu\fP"
- tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of 
- \fB/etc/inittab\fP file happens. Run level should be one of
--\fBSs12345\fP
-+\fBSs0123456\fP
- otherwise request would be silently ignored.
- .PP
- \fBtelinit\fP can tell \fBinit\fP how long it should wait
-diff -urNad trunk~/src/init.c trunk/src/init.c
---- trunk~/src/init.c	2008-03-26 09:34:10.000000000 +0100
-+++ trunk/src/init.c	2008-03-26 09:34:10.000000000 +0100
-@@ -1850,7 +1850,7 @@
- 	char		**env;
- 	int		fd;
- 
--	if (strchr("S12345",runlevel) == NULL)
-+	if (strchr("S0123456",runlevel) == NULL)
- 		return;
- 
- 	/*


