rpms/sysvinit/devel 81_killall_avoid_init.dpatch, NONE, 1.1 sysvinit.spec, 1.64, 1.65

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13830

Modified Files:
	sysvinit.spec 
Added Files:
	81_killall_avoid_init.dpatch 
Log Message:
don't kill pid 1 with killall



--- NEW FILE 81_killall_avoid_init.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 81_killall_avoid_init.dpatch by Petter Reinholdtsen
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make sure we do not try to kill init (pid 1) by mistake.  Patch
## DP: from SuSe.

@DPATCH@
Index: sysvinit/src/killall5.c
===================================================================
--- sysvinit/src/killall5.c	(revisjon 64)
+++ sysvinit/src/killall5.c	(arbeidskopi)
@@ -605,11 +605,11 @@
 		exit(1);
 	}
 
-	/* Now kill all processes except our session. */
+	/* Now kill all processes except init (pid 1) and our session. */
 	sid = (int)getsid(0);
 	pid = (int)getpid();
 	for (p = plist; p; p = p->next)
-		if (p->pid != pid && p->sid != sid && !p->kernel)
+		if (p->pid != 1 && p->pid != pid && p->sid != sid && !p->kernel)
 			kill(p->pid, sig);
 
 	/* And let them continue. */


Index: sysvinit.spec
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sysvinit.spec	15 Feb 2008 22:09:33 -0000	1.64
+++ sysvinit.spec	29 Feb 2008 05:54:02 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
 Version: 2.86
-Release: 20
+Release: 22
 License: GPLv2+
 Group: System Environment/Base
 Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
@@ -27,12 +27,14 @@
 Patch19: sysvinit-2.86-console-open.patch
 Patch20: sysvinit-selinux.patch
 Patch21: sysvinit-no-abort.patch
+Patch22: 81_killall_avoid_init.dpatch
 Source1: change_console.c
 Source2: change_console.8
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.66-5
 Requires: filesystem >= 2.2.4-1
 Requires: libselinux >= 1.21.10-1 libsepol >= 1.3.5
+Requires: sysvinit-tools = %{version}-%{release}
 Obsoletes: SysVinit < 2.86-17
 Provides: SysVinit = %{version}-%{release}
 BuildRequires: libselinux-devel >= 1.21.10-1 libsepol-devel >= 1.3.5
@@ -44,6 +46,14 @@
 system boots. Init then controls the startup, running, and shutdown
 of all other programs.
 
+%package tools
+Summary: Tools used for process and utmp management.
+Group: System Environment/Base
+
+%description tools
+The sysvinit-tools package contains various tools used for process
+management.
+
 %prep
 %setup -q -n sysvinit-%{version}
 # We use a shell, not sulogin. Other random man fixes go here (such as #192804)
@@ -89,7 +99,8 @@
 %patch19 -p1 -b .console-open
 # SELinux support for init - loading policy, etc.
 %patch20 -p1 -b .selinux
-%patch21 -p1 -b .abort
+%patch21 -p1 -b .no-abort
+%patch22 -p1 -b .nopid1
 
 %build
 make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -C src
@@ -125,24 +136,44 @@
 /bin/mountpoint
 /sbin/halt
 /sbin/init
-/sbin/killall5
-/sbin/pidof
 /sbin/poweroff
 /sbin/reboot
 /sbin/runlevel
 /sbin/shutdown
-/sbin/sulogin
 /sbin/telinit
 /sbin/change_console
-/usr/bin/last
-/usr/bin/lastb
-/usr/bin/mesg
-/usr/bin/utmpdump
 %attr(2555,root,tty)  /usr/bin/wall
 %{_includedir}/initreq.h
-%{_mandir}/*/*
+%{_mandir}/man5/*
+%{_mandir}/man8/halt*
+%{_mandir}/man8/init*
+%{_mandir}/man8/poweroff*
+%{_mandir}/man8/reboot*
+%{_mandir}/man8/runlevel*
+%{_mandir}/man8/shutdown*
+%{_mandir}/man8/telinit*
+
+%files tools
+%defattr(-,root,root)
+%doc doc/Changelog
+%{_bindir}/*
+/sbin/change_console
+/sbin/pidof
+/sbin/killall5
+/sbin/sulogin
+%{_mandir}/man1/*
+%{_mandir}/man8/change_console*
+%{_mandir}/man8/killall5*
+%{_mandir}/man8/pidof*
+%{_mandir}/man8/sulogin*
 
 %changelog
+* Fri Feb 29 2008 Bill Nottingham <notting at redhat.com> - 2.86-22
+- don't kill pid 1 with killall5
+
+* Fri Feb 15 2008 Bill Nottingham <notting at redhat.com> - 2.86-21
+- split off a -tools subpackage to avoid upstart conflicts (#431110)
+
 * Fri Feb 15 2008 Bill Nottingham <notting at redhat.com> - 2.86-20
 - don't abort if policy is already loaded (#431113)