packages: upstart-SysVinit/upstart-SysVinit.spec, upstart-SysVinit/sysvinit...

[jajcus]

Author: jajcus                       Date: Wed May 26 11:50:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- stop killall5 from 'killing' the init process (it may trigger re-exec or some other funny things)

---- Files affected:
packages/upstart-SysVinit:
   upstart-SysVinit.spec (1.21 -> 1.22) , sysvinit-killall5_no_kill_init.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/upstart-SysVinit/upstart-SysVinit.spec
diff -u packages/upstart-SysVinit/upstart-SysVinit.spec:1.21 packages/upstart-SysVinit/upstart-SysVinit.spec:1.22
--- packages/upstart-SysVinit/upstart-SysVinit.spec:1.21	Tue May 11 19:28:40 2010
+++ packages/upstart-SysVinit/upstart-SysVinit.spec	Wed May 26 13:50:29 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Wsparcie dla System V w upstart
 Name:		upstart-SysVinit
 Version:	2.86
-Release:	26
+Release:	27
 License:	GPL
 Group:		Base
 Source0:	ftp://ftp.cistron.nl/pub/people/miquels/software/sysvinit-%{version}.tar.gz
@@ -26,6 +26,7 @@
 Patch11:	sysvinit-nopowerstates-single.patch
 Patch12:	sysvinit-lastlog.patch
 Patch13:	sysvinit-alt-fixes.patch
+Patch14:	sysvinit-killall5_no_kill_init.patch
 %if %{with selinux}
 BuildRequires:	libselinux-devel >= 1.28
 BuildRequires:	libsepol-devel
@@ -119,6 +120,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 %{__make} -C src \
@@ -210,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2010/05/26 11:50:29  jajcus
+- stop killall5 from 'killing' the init process (it may trigger re-exec or some other funny things)
+
 Revision 1.21  2010/05/11 17:28:40  jajcus
 - C: rc-scripts < 0.4.3.2
 - Release: 26

================================================================
Index: packages/upstart-SysVinit/sysvinit-killall5_no_kill_init.patch
diff -u /dev/null packages/upstart-SysVinit/sysvinit-killall5_no_kill_init.patch:1.1
--- /dev/null	Wed May 26 13:50:35 2010
+++ packages/upstart-SysVinit/sysvinit-killall5_no_kill_init.patch	Wed May 26 13:50:29 2010
@@ -0,0 +1,11 @@
+--- sysvinit-2.86/src/killall5.c.orig	2010-05-26 13:43:02.000000000 +0200
++++ sysvinit-2.86/src/killall5.c	2010-05-26 13:44:52.000000000 +0200
+@@ -621,7 +621,7 @@
+ 	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 != pid && p->sid != sid && !p->kernel && p->pid != 1)
+ 			kill(p->pid, sig);
+ 
+ 	/* And let them continue. */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/upstart-SysVinit/upstart-SysVinit.spec?r1=1.21&r2=1.22&f=u