[Pkg-sysvinit-commits] r1259 - in sysvinit/trunk/debian: . patches
pere at alioth.debian.org
pere at alioth.debian.org
Wed Mar 26 08:40:49 UTC 2008
Author: pere
Date: 2008-03-26 08:40:48 +0000 (Wed, 26 Mar 2008)
New Revision: 1259
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/patches/11_doc_mountpoint.dpatch
sysvinit/trunk/debian/patches/27_last_usageopts.dpatch
sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch
sysvinit/trunk/debian/patches/60_init_race.dpatch
sysvinit/trunk/debian/patches/61_init_msg.dpatch
sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
sysvinit/trunk/debian/patches/63_init_longer_procname.dpatch
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
sysvinit/trunk/debian/patches/66_init_emerg_tty.dpatch
sysvinit/trunk/debian/patches/69_init_waiting.dpatch
sysvinit/trunk/debian/patches/80_killall_pidof.dpatch
sysvinit/trunk/debian/patches/80_killall_sched.dpatch
sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch
sysvinit/trunk/debian/patches/82_killall_exclude_pids.dpatch
sysvinit/trunk/debian/patches/82_killall_retval.dpatch
sysvinit/trunk/debian/patches/83_killall_manref.dpatch
sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
sysvinit/trunk/debian/patches/92_sata-hddown.dpatch
sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch
Log:
* Updated all patches to make sure they apply without offset and
fuzzying to the current source.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/changelog 2008-03-26 08:40:48 UTC (rev 1259)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-55) UNRELEASED; urgency=low
+sysvinit (2.86.ds1-55~1) UNRELEASED; urgency=low
* Use $(MAKE) instead of make in debian/rules, to make it easier to
use make -j.
@@ -9,8 +9,10 @@
before $remote_fs and need to run after both udev and hostname.
* Change update-rc.d to warn about scripts missing LSB style
dependency information.
+ * Updated all patches to make sure they apply without offset and
+ fuzzying to the current source.
- -- Petter Reinholdtsen <pere at localhost> Sun, 02 Mar 2008 11:27:34 +0100
+ -- Petter Reinholdtsen <pere at debian.org> Sun, 02 Mar 2008 11:27:34 +0100
sysvinit (2.86.ds1-54) unstable; urgency=low
Modified: sysvinit/trunk/debian/patches/11_doc_mountpoint.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/11_doc_mountpoint.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/11_doc_mountpoint.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,9 +5,10 @@
## DP: Use correct section number in manual page.
@DPATCH@
---- sysvinit-2.86.ds1.orig/man/mountpoint.1
-+++ sysvinit-2.86.ds1/man/mountpoint.1
-@@ -1,5 +1,5 @@
+diff -urNad trunk~/man/mountpoint.1 trunk/man/mountpoint.1
+--- trunk~/man/mountpoint.1 2008-03-26 09:32:43.000000000 +0100
++++ trunk/man/mountpoint.1 2008-03-26 09:32:45.000000000 +0100
+@@ -1,4 +1,4 @@
-.TH MOUNTPOINT 8 "Mar 15, 2004" "" "Linux System Administrator's Manual"
+.TH MOUNTPOINT 1 "Mar 15, 2004" "" "Linux System Administrator's Manual"
.SH NAME
Modified: sysvinit/trunk/debian/patches/27_last_usageopts.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/27_last_usageopts.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/27_last_usageopts.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,9 +5,10 @@
debian bug #415525.
@DPATCH@
---- sysvinit-2.86/src/last.c (revision 1201)
-+++ sysvinit-2.86/src/last.c (working copy)
-@@ -492,7 +492,7 @@
+diff -urNad trunk~/src/last.c trunk/src/last.c
+--- trunk~/src/last.c 2008-03-26 09:33:53.000000000 +0100
++++ trunk/src/last.c 2008-03-26 09:33:54.000000000 +0100
+@@ -496,7 +496,7 @@
{
fprintf(stderr, "Usage: %s [-num | -n num] [-f file] "
"[-t YYYYMMDDHHMMSS] "
Modified: sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/45_pidof_symlink.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,11 +5,10 @@
## DP: Make pidof an absolute symlink
@DPATCH@
-Index: trunk/src/Makefile
-===================================================================
---- trunk/src/Makefile.orig 2005-12-19 22:49:03.000000000 +0100
-+++ trunk/src/Makefile 2005-12-19 22:50:15.000000000 +0100
-@@ -139,7 +139,7 @@
+diff -urNad trunk~/src/Makefile trunk/src/Makefile
+--- trunk~/src/Makefile 2008-03-26 09:33:56.000000000 +0100
++++ trunk/src/Makefile 2008-03-26 09:33:56.000000000 +0100
+@@ -143,7 +143,7 @@
ln -sf halt $(ROOT)/sbin/reboot
ln -sf halt $(ROOT)/sbin/poweroff
ln -sf init $(ROOT)/sbin/telinit
Modified: sysvinit/trunk/debian/patches/60_init_race.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/60_init_race.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/60_init_race.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,11 +6,10 @@
## DP: found in SuSe. Fixes bug #327612.
@DPATCH@
-Index: sysvinit/src/init.c
-===================================================================
---- sysvinit/src/init.c (revisjon 62)
-+++ sysvinit/src/init.c (arbeidskopi)
-@@ -966,6 +966,7 @@
+diff -urNad trunk~/src/init.c trunk/src/init.c
+--- trunk~/src/init.c 2008-03-26 09:33:58.000000000 +0100
++++ trunk/src/init.c 2008-03-26 09:33:58.000000000 +0100
+@@ -971,6 +971,7 @@
dup(f);
dup(f);
}
@@ -18,7 +17,7 @@
if ((pid = fork()) < 0) {
initlog(L_VB, "cannot fork");
exit(1);
-@@ -978,7 +979,6 @@
+@@ -983,7 +984,6 @@
SETSIG(sa, SIGINT, SIG_IGN, SA_RESTART);
SETSIG(sa, SIGTSTP, SIG_IGN, SA_RESTART);
SETSIG(sa, SIGQUIT, SIG_IGN, SA_RESTART);
Modified: sysvinit/trunk/debian/patches/61_init_msg.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/61_init_msg.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/61_init_msg.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,13 +5,12 @@
## DP: Improve error message if fork() fail. Patch found in Suse.
@DPATCH@
-Index: sysvinit/src/init.c
-===================================================================
---- sysvinit/src/init.c (revisjon 62)
-+++ sysvinit/src/init.c (arbeidskopi)
-@@ -967,7 +967,8 @@
- dup(f);
+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",
@@ -19,7 +18,7 @@
exit(1);
}
if (pid > 0) {
-@@ -997,7 +998,8 @@
+@@ -1002,7 +1003,8 @@
* this with a temporary process.
*/
if ((pid = fork()) < 0) {
Modified: sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/62_init_freebsdterm.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,10 +5,10 @@
## DP: Make sure TERM is set on FreeBSD. Closes debian bug #335023.
@DPATCH@
-diff -ur sysvinit-2.86.ds1.old/src/init.c sysvinit-2.86.ds1/src/init.c
---- sysvinit-2.86.ds1.old/src/init.c 2004-07-30 14:16:20.000000000 +0200
-+++ sysvinit-2.86.ds1/src/init.c 2005-10-21 15:53:03.000000000 +0200
-@@ -685,6 +685,14 @@
+diff -urNad trunk~/src/init.c trunk/src/init.c
+--- trunk~/src/init.c 2008-03-26 09:34:01.000000000 +0100
++++ trunk/src/init.c 2008-03-26 09:34:01.000000000 +0100
+@@ -690,6 +690,14 @@
return;
}
Modified: sysvinit/trunk/debian/patches/63_init_longer_procname.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/63_init_longer_procname.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/63_init_longer_procname.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,10 +6,10 @@
## DP: name can be one character longer
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.aSvxrG/trunk/src/init.c
---- ./src/init.c 2006-01-04 17:44:08.000000000 +0100
-+++ /tmp/dpep-work.aSvxrG/trunk/src/init.c 2006-01-04 17:44:20.000000000 +0100
-@@ -615,9 +615,9 @@
+diff -urNad trunk~/src/init.c trunk/src/init.c
+--- trunk~/src/init.c 2008-03-26 09:34:03.000000000 +0100
++++ trunk/src/init.c 2008-03-26 09:34:03.000000000 +0100
+@@ -469,9 +469,9 @@
len = vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
Modified: sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/64_init_reexec_env.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -7,9 +7,10 @@
## from Fedora.
@DPATCH@
---- sysvinit-2.86/src/init.c.these-are-not-the-droids-you-are-looking-for 2005-12-19 15:48:55.000000000 -0500
-+++ sysvinit-2.86/src/init.c 2005-12-19 15:49:20.000000000 -0500
-@@ -1884,7 +1884,7 @@
+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);
Modified: sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/64_init_set_PATH.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -8,10 +8,10 @@
## DP: not reusable on re-exec.
@DPATCH@
-diff -ur sysvinit-2.86.ds1/src/init.c_ORIG sysvinit-2.86.ds1/src/init.c
---- sysvinit-2.86.ds1/src/init.c_ORIG 2005-12-31 11:51:03.000000000 +0100
-+++ sysvinit-2.86.ds1/src/init.c 2005-12-31 11:58:48.000000000 +0100
-@@ -2573,7 +2573,7 @@
+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.
*/
@@ -20,7 +20,7 @@
/*
* Initialize /var/run/utmp (only works if /var is on
-@@ -2612,6 +2612,11 @@
+@@ -2466,6 +2466,11 @@
initlog(L_CO, bootmsg, "reloading");
sigfillset(&sgt);
sigprocmask(SIG_UNBLOCK, &sgt, NULL);
@@ -32,9 +32,9 @@
}
start_if_needed();
-diff -urNad --exclude=CVS --exclude=.svn ./src/init.h /tmp/dpep-work.2oIDao/trunk/src/init.h
---- sysvinit-2.86.ds1/src/init.h_ORIG 2005-12-02 17:22:57.000000000 +0100
-+++ sysvinit-2.86.ds1/src/init.h 2005-12-31 11:56:18.000000000 +0100
+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 */
Modified: sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/65_init_u_in_06.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,9 +5,9 @@
## DP: Allow 'telinit u' in runlevels 0 and 6
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./man/init.8 /tmp/dpep-work.ZhzV9R/trunk/man/init.8
---- ./man/init.8 2006-01-04 11:38:11.000000000 +0100
-+++ /tmp/dpep-work.ZhzV9R/trunk/man/init.8 2006-01-04 11:38:26.000000000 +0100
+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
@@ -17,10 +17,10 @@
otherwise request would be silently ignored.
.PP
\fBtelinit\fP can tell \fBinit\fP how long it should wait
-diff -urNad --exclude=CVS --exclude=.svn ./src/init.c /tmp/dpep-work.ZhzV9R/trunk/src/init.c
---- ./src/init.c 2006-01-04 11:38:12.000000000 +0100
-+++ /tmp/dpep-work.ZhzV9R/trunk/src/init.c 2006-01-04 11:38:12.000000000 +0100
-@@ -1996,7 +1996,7 @@
+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;
Modified: sysvinit/trunk/debian/patches/66_init_emerg_tty.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/66_init_emerg_tty.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/66_init_emerg_tty.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,11 +6,10 @@
## DP: booting with 'emergency' kernel option. Closes bug #374543.
@DPATCH@
-Index: sysvinit/src/init.c
-===================================================================
---- sysvinit/src/init.c (revisjon 808)
-+++ sysvinit/src/init.c (arbeidskopi)
-@@ -89,7 +89,7 @@
+diff -urNad trunk~/src/init.c trunk/src/init.c
+--- trunk~/src/init.c 2008-03-26 09:34:13.000000000 +0100
++++ trunk/src/init.c 2008-03-26 09:34:14.000000000 +0100
+@@ -94,7 +94,7 @@
CHILD *newFamily = NULL; /* The list after inittab re-read */
CHILD ch_emerg = { /* Emergency shell */
@@ -19,10 +18,9 @@
"~~",
"S",
3,
-Index: sysvinit/src/sulogin.c
-===================================================================
---- sysvinit/src/sulogin.c (revisjon 808)
-+++ sysvinit/src/sulogin.c (arbeidskopi)
+diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
+--- trunk~/src/sulogin.c 2008-03-26 09:34:13.000000000 +0100
++++ trunk/src/sulogin.c 2008-03-26 09:34:14.000000000 +0100
@@ -23,6 +23,7 @@
#include <pwd.h>
#include <shadow.h>
@@ -31,17 +29,15 @@
#include <sys/ioctl.h>
#if defined(__GLIBC__)
# include <crypt.h>
-@@ -427,7 +428,12 @@
+@@ -447,6 +448,11 @@
} else
close(fd);
}
-- }
+ } else if (getpid() == 1) {
+ /* We are init. We hence need to set a session anyway */
+ setsid();
+ if (ioctl(0, TIOCSCTTY, (char *)1))
+ perror("ioctl(TIOCSCTTY)");
-+ }
+ }
/*
- * Get the root password.
Modified: sysvinit/trunk/debian/patches/69_init_waiting.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/69_init_waiting.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/69_init_waiting.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -8,9 +8,10 @@
https://bugzilla.redhat.com/show_bug.cgi?id=143289
@DPATCH@
---- sysvinit-2.86/src/init.c.wait 2006-08-09 15:05:01.000000000 -0400
-+++ sysvinit-2.86/src/init.c 2006-08-09 15:05:59.000000000 -0400
-@@ -187,6 +187,7 @@
+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},
Modified: sysvinit/trunk/debian/patches/80_killall_pidof.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/80_killall_pidof.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/80_killall_pidof.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -5,9 +5,10 @@
## DP: Modify pidof to not print empty line if no pid was found. (bug: #225476)
@DPATCH@
---- sysvinit-2.86.ds1.orig/src/killall5.c
-+++ sysvinit-2.86.ds1/src/killall5.c
-@@ -378,8 +391,8 @@
+diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
+--- trunk~/src/killall5.c 2008-03-26 09:30:38.000000000 +0100
++++ trunk/src/killall5.c 2008-03-26 09:31:14.000000000 +0100
+@@ -378,8 +378,8 @@
int foundone = 0;
int ok = 0;
@@ -18,7 +19,7 @@
/* Get basename of program. */
if ((s = strrchr(prog, '/')) == NULL)
-@@ -387,9 +400,16 @@
+@@ -387,9 +387,16 @@
else
s++;
@@ -35,7 +36,7 @@
/* First try to find a match based on dev/ino pair. */
if (dostat) {
for (p = plist; p; p = p->next) {
-@@ -404,15 +424,35 @@
+@@ -404,15 +411,35 @@
if (!foundone) for (p = plist; p; p = p->next) {
ok = 0;
@@ -78,7 +79,7 @@
}
/*
-@@ -423,7 +463,7 @@
+@@ -423,7 +450,7 @@
(p->argv0 == NULL ||
p->argv0[0] == 0 ||
strchr(p->argv0, ' '))) {
@@ -87,7 +88,7 @@
}
if (ok) add_pid_to_q(q, p);
}
-@@ -548,7 +588,8 @@
+@@ -548,7 +575,8 @@
}
}
}
Modified: sysvinit/trunk/debian/patches/80_killall_sched.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/80_killall_sched.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/80_killall_sched.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,11 +6,10 @@
## DP: from SuSe.
@DPATCH@
-Index: sysvinit/src/killall5.c
-===================================================================
---- sysvinit/src/killall5.c (revisjon 64)
-+++ sysvinit/src/killall5.c (arbeidskopi)
-@@ -618,5 +618,8 @@
+diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
+--- trunk~/src/killall5.c 2008-03-26 09:31:17.000000000 +0100
++++ trunk/src/killall5.c 2008-03-26 09:31:17.000000000 +0100
+@@ -646,5 +646,8 @@
/* Done. */
closelog();
Modified: sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/81_killall_avoid_init.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,11 +6,10 @@
## DP: from SuSe.
@DPATCH@
-Index: sysvinit/src/killall5.c
-===================================================================
---- sysvinit/src/killall5.c (revisjon 64)
-+++ sysvinit/src/killall5.c (arbeidskopi)
-@@ -605,11 +605,11 @@
+diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
+--- trunk~/src/killall5.c 2008-03-26 09:31:20.000000000 +0100
++++ trunk/src/killall5.c 2008-03-26 09:31:20.000000000 +0100
+@@ -633,11 +633,11 @@
exit(1);
}
Modified: sysvinit/trunk/debian/patches/82_killall_exclude_pids.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/82_killall_exclude_pids.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/82_killall_exclude_pids.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -7,9 +7,9 @@
## DP: processes that are e.g. implementing the root filesystem.
@DPATCH@
-diff -urNad sysvinit-2.86.ds1~/man/killall5.8 sysvinit-2.86.ds1/man/killall5.8
---- sysvinit-2.86.ds1~/man/killall5.8 2004-06-09 13:47:45.000000000 +0100
-+++ sysvinit-2.86.ds1/man/killall5.8 2007-08-06 13:39:29.000000000 +0100
+diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
+--- trunk~/man/killall5.8 2008-03-26 09:31:24.000000000 +0100
++++ trunk/man/killall5.8 2008-03-26 09:31:24.000000000 +0100
@@ -4,12 +4,19 @@
.SH SYNOPSIS
.B killall5
@@ -30,10 +30,10 @@
.SH EXIT STATUS
The program return zero if it killed processes. It return 2 if no
process were killed, and 1 if it was unable to find any processes
-diff -urNad sysvinit-2.86.ds1~/src/killall5.c sysvinit-2.86.ds1/src/killall5.c
---- sysvinit-2.86.ds1~/src/killall5.c 2007-08-06 13:39:28.000000000 +0100
-+++ sysvinit-2.86.ds1/src/killall5.c 2007-08-06 13:39:29.000000000 +0100
-@@ -596,11 +596,15 @@
+diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
+--- trunk~/src/killall5.c 2008-03-26 09:31:24.000000000 +0100
++++ trunk/src/killall5.c 2008-03-26 09:31:24.000000000 +0100
+@@ -583,11 +583,15 @@
@@ -48,8 +48,8 @@
+ int i, oind, omit = 0;
int sig = SIGKILL;
- /* Get program name. */
-@@ -617,10 +621,34 @@
+ /* return non-zero if no process was killed */
+@@ -607,10 +611,34 @@
return main_pidof(argc, argv);
/* Right, so we are "killall". */
@@ -87,7 +87,7 @@
}
/* First get the /proc filesystem online. */
-@@ -649,11 +677,20 @@
+@@ -639,11 +667,20 @@
/* Now kill all processes except init (pid 1) and our session. */
sid = (int)getsid(0);
pid = (int)getpid();
@@ -95,7 +95,6 @@
- if (p->pid != 1 && p->pid != pid && p->sid != sid && !p->kernel) {
- kill(p->pid, sig);
- retval = 0;
-- }
+ for (p = plist; p; p = p->next) {
+ if (p->pid == 1 || p->pid == pid || p->sid == sid || p->kernel)
+ continue;
@@ -106,7 +105,7 @@
+ /* On a match, continue with the for loop above. */
+ if (i < oind)
+ continue;
-+ }
+ }
+ kill(p->pid, sig);
+ retval = 0;
+ }
Modified: sysvinit/trunk/debian/patches/82_killall_retval.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/82_killall_retval.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/82_killall_retval.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,10 +6,9 @@
if there are no processes left to wait for.
@DPATCH@
-Index: sysvinit/man/killall5.8
-===================================================================
---- sysvinit/man/killall5.8 (revision 856)
-+++ sysvinit/man/killall5.8 (working copy)
+diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
+--- trunk~/man/killall5.8 2008-03-26 09:30:38.000000000 +0100
++++ trunk/man/killall5.8 2008-03-26 09:31:29.000000000 +0100
@@ -10,6 +10,10 @@
kernel threads and the processes in its own session, so it won't kill
the shell that is running the script it was called from. Its primary
@@ -21,11 +20,10 @@
.SH SEE ALSO
.BR halt (8),
.BR reboot (8)
-Index: sysvinit/src/killall5.c
-===================================================================
---- sysvinit/src/killall5.c (revision 856)
-+++ sysvinit/src/killall5.c (working copy)
-@@ -603,6 +603,9 @@
+diff -urNad trunk~/src/killall5.c trunk/src/killall5.c
+--- trunk~/src/killall5.c 2008-03-26 09:31:28.000000000 +0100
++++ trunk/src/killall5.c 2008-03-26 09:31:29.000000000 +0100
+@@ -590,6 +590,9 @@
int pid, sid = -1;
int sig = SIGKILL;
@@ -35,9 +33,9 @@
/* Get program name. */
if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0];
-@@ -643,15 +646,17 @@
+@@ -630,15 +633,17 @@
/* Read /proc filesystem */
- if (readproc(1) < 0) {
+ if (readproc() < 0) {
kill(-1, SIGCONT);
- exit(1);
+ return(1);
@@ -55,7 +53,7 @@
/* And let them continue. */
kill(-1, SIGCONT);
-@@ -662,5 +667,5 @@
+@@ -649,5 +654,5 @@
/* Force the kernel to run the scheduler */
usleep(1);
Modified: sysvinit/trunk/debian/patches/83_killall_manref.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/83_killall_manref.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/83_killall_manref.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/man/killall5.8 trunk/man/killall5.8
---- trunk~/man/killall5.8 2008-01-20 16:14:43.000000000 +0100
-+++ trunk/man/killall5.8 2008-01-20 16:14:44.000000000 +0100
+--- trunk~/man/killall5.8 2008-03-26 09:31:31.000000000 +0100
++++ trunk/man/killall5.8 2008-03-26 09:31:31.000000000 +0100
@@ -17,12 +17,16 @@
.SH OPTIONS
.IP "-o \fIomitpid\fP"
@@ -27,8 +27,8 @@
.SH AUTHOR
Miquel van Smoorenburg, miquels at cistron.nl
diff -urNad trunk~/man/pidof.8 trunk/man/pidof.8
---- trunk~/man/pidof.8 2008-01-20 16:14:43.000000000 +0100
-+++ trunk/man/pidof.8 2008-01-20 16:14:44.000000000 +0100
+--- trunk~/man/pidof.8 2008-03-26 09:31:31.000000000 +0100
++++ trunk/man/pidof.8 2008-03-26 09:31:31.000000000 +0100
@@ -50,6 +50,7 @@
.BR shutdown (8),
.BR init (8),
Modified: sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/91_sulogin_lockedpw.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -7,11 +7,10 @@
## DP: Patch from Ubuntu and Thom May. Fixes debian bug #326678.
@DPATCH@
-Index: sysvinit/src/sulogin.c
-===================================================================
---- sysvinit/src/sulogin.c (revisjon 113)
-+++ sysvinit/src/sulogin.c (arbeidskopi)
-@@ -234,7 +234,11 @@
+diff -urNad trunk~/src/sulogin.c trunk/src/sulogin.c
+--- trunk~/src/sulogin.c 2008-03-26 09:34:22.000000000 +0100
++++ trunk/src/sulogin.c 2008-03-26 09:34:22.000000000 +0100
+@@ -240,7 +240,11 @@
fprintf(stderr, "%s: no entry for root\n", F_SHADOW);
strcpy(pwd.pw_passwd, "");
}
@@ -24,7 +23,7 @@
fprintf(stderr, "%s: root password garbled\n", F_SHADOW);
strcpy(pwd.pw_passwd, ""); }
return &pwd;
-@@ -436,6 +440,14 @@
+@@ -462,6 +466,14 @@
fprintf(stderr, "sulogin: cannot open password database!\n");
sleep(2);
}
Modified: sysvinit/trunk/debian/patches/92_sata-hddown.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/92_sata-hddown.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/92_sata-hddown.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -6,8 +6,9 @@
## DP: disk individually. See also http://linux-ata.org/shutdown.html
@DPATCH@
---- sysvinit/src/hddown.c
-+++ sysvinit/src/hddown.c 2007-06-12 19:24:34.351142441 +0200
+diff -urNad trunk~/src/hddown.c trunk/src/hddown.c
+--- trunk~/src/hddown.c 2008-03-26 09:32:51.000000000 +0100
++++ trunk/src/hddown.c 2008-03-26 09:32:51.000000000 +0100
@@ -5,6 +5,9 @@
*/
char *v_hddown = "@(#)hddown.c 1.02 22-Apr-2003 miquels at cistron.nl";
@@ -18,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-@@ -18,6 +21,326 @@ char *v_hddown = "@(#)hddown.c 1.02 22
+@@ -18,6 +21,326 @@
#include <sys/ioctl.h>
#include <linux/hdreg.h>
@@ -345,9 +346,9 @@
#define MAX_DISKS 64
#define PROC_IDE "/proc/ide"
#define DEV_BASE "/dev"
-@@ -104,7 +427,7 @@ int hddown(void)
+@@ -154,7 +477,7 @@
- return 0;
+ return (result1 ? result1 : result2);
}
-
+#endif /* ! USE_SYSFS */
Modified: sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch
===================================================================
--- sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch 2008-03-20 08:34:23 UTC (rev 1258)
+++ sysvinit/trunk/debian/patches/93_sulogin_fallback.dpatch 2008-03-26 08:40:48 UTC (rev 1259)
@@ -7,11 +7,10 @@
#43317).
@DPATCH@
-Index: sysvinit/src/sulogin.c
-===================================================================
---- sysvinit/src/sulogin.c (revision 1227)
-+++ sysvinit/src/sulogin.c (working copy)
-@@ -34,6 +34,7 @@
+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"
@@ -19,7 +18,7 @@
char *Version = "@(#)sulogin 2.85-3 23-Apr-2003 miquels at cistron.nl";
-@@ -341,6 +342,12 @@
+@@ -366,6 +367,12 @@
setenv("SHELL", BINSH, 1);
execl(BINSH, profile ? "-sh" : "sh", NULL);
perror(BINSH);
More information about the Pkg-sysvinit-commits
mailing list