From 54abd87e3258152907e366b2088dfcd4297a5846fcfc98d97f6e8636e0f4d303 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 14 Jan 2014 12:40:57 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=195
---
 powerd.changes                 |  6 +++++
 sysvinit-2.88+dsf-sulogin.diff | 44 ++++++++++++++++++++++++++++++++++
 sysvinit.changes               |  5 ++++
 sysvinit.spec                  |  3 +++
 4 files changed, 58 insertions(+)
 create mode 100644 powerd.changes
 create mode 100644 sysvinit-2.88+dsf-sulogin.diff

diff --git a/powerd.changes b/powerd.changes
new file mode 100644
index 0000000..e6d0960
--- /dev/null
+++ b/powerd.changes
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Tue Jan 14 12:28:42 UTC 2014 - werner@suse.de
+
+- Split off powerd from sysvinit
+- Support systemd unit file
+
diff --git a/sysvinit-2.88+dsf-sulogin.diff b/sysvinit-2.88+dsf-sulogin.diff
new file mode 100644
index 0000000..4d9f0a3
--- /dev/null
+++ b/sysvinit-2.88+dsf-sulogin.diff
@@ -0,0 +1,44 @@
+Index: src/killall5.c
+===================================================================
+--- src/killall5.c	(revision 116)
++++ src/killall5.c	(working copy)
+@@ -508,9 +508,11 @@
+ 
+ 		/* Read SID & statname from it. */
+ 		if ((fp = fopen(path, "r")) != NULL) {
+-			if (!fgets(buf, sizeof(buf), fp))
+-				buf[0] = '\0';
++			size_t len;
+ 
++			len = fread(buf, sizeof(char), sizeof(buf)-1, fp);
++			buf[len] = '\0';
++
+ 			if (buf[0] == '\0') {
+ 				nsyslog(LOG_ERR,
+ 					"can't read from %s\n", path);
+Index: src/shutdown.c
+===================================================================
+--- src/shutdown.c	(revision 116)
++++ src/shutdown.c	(working copy)
+@@ -76,7 +76,7 @@
+ 
+ char *clean_env[] = {
+ 	"HOME=/",
+-	"PATH=/bin:/usr/bin:/sbin:/usr/sbin",
++	"PATH=" PATH_DEFAULT,
+ 	"TERM=dumb",
+ 	"SHELL=/bin/sh",
+ 	NULL,
+Index: src/sulogin.c
+===================================================================
+--- src/sulogin.c	(revision 116)
++++ src/sulogin.c	(working copy)
+@@ -987,7 +998,7 @@
+ 			}
+ 			if (alarm_rised) {
+ 				tcfinal(con);
+-				printf("Timed out.\n\r");
++				fprintf(stderr, "Timed out.\n\r");
+ 			}
+ 			/*
+ 			 *	User may pressed Control-D.
diff --git a/sysvinit.changes b/sysvinit.changes
index 848f61d..0c779e7 100644
--- a/sysvinit.changes
+++ b/sysvinit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 14 12:31:53 UTC 2014 - werner@suse.de
+
+- killall5: handle strange names of executables 
+
 -------------------------------------------------------------------
 Tue Jan 14 11:04:52 UTC 2014 - werner@suse.de
 
diff --git a/sysvinit.spec b/sysvinit.spec
index fb2f591..9b54056 100644
--- a/sysvinit.spec
+++ b/sysvinit.spec
@@ -68,6 +68,8 @@ Patch8:         %{name}-%{version}dsf-blowfish.dif
 Patch9:         %{name}-2.88dsf-no-kill.patch
 Patch10:        %{name}-%{version}dsf-env.patch
 Patch11:        %{name}-%{version}dsf-dostat.patch
+# PATCH-FIX-UPSTREAM -- killall5: handle strange names of executables
+Patch12:        %{name}-%{version}dsf-sulogin.diff
 Patch30:        killproc-%{KPVER}.dif
 Patch40:        showconsole-%{SCVER}.dif
 Patch41:        showconsole-1.16-deadlock.diff
@@ -131,6 +133,7 @@ Just some symlinks and manual page for sysvinit
 %patch9  -p0 -b .no-kill
 %patch10 -p0 -b .env
 %patch11 -p0 -b .dostat
+%patch12 -p0 -b .ka5
 %patch
 pushd doc
   mkdir killproc showconsole