Dr. Werner Fink 2014-01-14 12:40:57 +00:00 committed by Git OBS Bridge
parent cec8b0cf8e
commit 54abd87e32
4 changed files with 58 additions and 0 deletions

6
powerd.changes Normal file
View File

@ -0,0 +1,6 @@
-------------------------------------------------------------------
Tue Jan 14 12:28:42 UTC 2014 - werner@suse.de
- Split off powerd from sysvinit
- Support systemd unit file

View File

@ -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.

View File

@ -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

View File

@ -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