diff --git a/coreutils-6.10-whorunlevel.patch b/coreutils-6.10-whorunlevel.patch new file mode 100644 index 0000000..eb376e7 --- /dev/null +++ b/coreutils-6.10-whorunlevel.patch @@ -0,0 +1,78 @@ +From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Fri, 4 Jul 2008 16:34:39 +0200 +Subject: [PATCH] who -r: don't print "last=" when the corresponding byte is unprintable + +* src/who.c (print_runlevel): Print last=%c only when the "preceding +run-level" byte is printable. Reported by Gian Piero De Lolliis in +. +--- + src/who.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/who.c b/src/who.c +index 5529618..0bba912 100644 +--- a/src/who.c ++++ b/src/who.c +@@ -30,6 +30,7 @@ + #include + #include "system.h" + ++#include "c-ctype.h" + #include "canon-host.h" + #include "readutmp.h" + #include "error.h" +@@ -511,7 +512,7 @@ print_runlevel (const STRUCT_UTMP *utmp_ent) + sprintf (comment, "%s%c", _("last="), (last == 'N') ? 'S' : last); + + print_line (-1, "", ' ', -1, runlevline, time_string (utmp_ent), +- "", "", comment, ""); ++ "", "", c_isprint (last) ? comment : "", ""); + + return; + } +-- +1.5.6.1.206.g8dcaf96 + +From 10db2e5e05c67eea205b3ec76a2408f46356a7fd Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= +Date: Wed, 2 Jul 2008 14:11:05 +0200 +Subject: [PATCH] doci: describe who's -p -r and -t options + +* doc/coreutils.texi (who invocation): +--- + doc/coreutils.texi | 18 ++++++++++++++++++ + 1 files changed, 18 insertions(+), 0 deletions(-) + +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index 155ba8d..c0ea237 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -12710,6 +12710,24 @@ automatic dial-up internet access. + @opindex --heading + Print a line of column headings. + ++@item -p ++@itemx --process ++@opindex -p ++@opindex --process ++List active processes spawned by init. ++ ++@item -r ++@itemx --runlevel ++@opindex -r ++@opindex --runlevel ++Print the current (and maybe previous) run-level of the init process. ++ ++@item -t ++@itemx --time ++@opindex -t ++@opindex --time ++Print last system clock change. ++ + @item -w + @itemx -T + @itemx --mesg +-- +1.5.2.2 + diff --git a/coreutils-authors.patch b/coreutils-authors.patch new file mode 100644 index 0000000..c88c944 --- /dev/null +++ b/coreutils-authors.patch @@ -0,0 +1,59 @@ +Signed-off-by: Ondřej Vašík +Signed-off-by: Jim Meyering + +* src/echo.c (AUTHORS) : Use bash builtin echo authors instead of FIXME unknown +* src/basename.c (AUTHORS): List David as the author. +* AUTHORS: Update here, too. +--- + AUTHORS | 4 ++-- + src/basename.c | 2 +- + src/echo.c | 4 +++- + 3 files changed, 6 insertions(+), 4 deletions(-) +diff --git a/src/basename.c b/src/basename.c +index 38e8879..69b708f 100644 +--- a/src/basename.c ++++ b/src/basename.c +@@ -37,7 +37,7 @@ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "basename" + +-#define AUTHORS "FIXME unknown" ++#define AUTHORS "David MacKenzie" + + /* The name this program was run with. */ + char *program_name; +diff --git a/AUTHORS b/AUTHORS +index 404cf70..666edc1 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -3,7 +3,7 @@ each followed by the name(s) of its author(s). + + arch: David MacKenzie, Karel Zak + base64: Simon Josefsson +-basename: FIXME unknown ++basename: David MacKenzie + cat: Torbjorn Granlund, Richard M. Stallman + chcon: Russell Coker, Jim Meyering + chgrp: David MacKenzie, Jim Meyering +@@ -22,7 +22,7 @@ dir: Richard M. Stallman, David MacKenzie + dircolors: H. Peter Anvin + dirname: David MacKenzie, Jim Meyering + du: Torbjorn Granlund, David MacKenzie, Paul Eggert, Jim Meyering +-echo: FIXME unknown ++echo: Brian Fox, Chet Ramey + env: Richard Mlynarik, David MacKenzie + expand: David MacKenzie + expr: Mike Parker +diff --git a/src/echo.c b/src/echo.c +index ebbf5b8..11e648e 100644 +--- a/src/echo.c ++++ b/src/echo.c +@@ -24,7 +24,7 @@ + /* The official name of this program (e.g., no `g' prefix). */ + #define PROGRAM_NAME "echo" + +-#define AUTHORS "FIXME unknown" ++#define AUTHORS "Brian Fox", "Chet Ramey" + + /* echo [-neE] [arg ...] + Output the ARGs. If -n is specified, the trailing newline is diff --git a/coreutils.spec b/coreutils.spec index cb65db2..3baa21c 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -25,6 +25,8 @@ Patch4: coreutils-6.10-lonebackslash.patch Patch5: coreutils-6.10-mkscontextsegfault.patch Patch6: coreutils-6.10-md5sha1sum.patch Patch7: coreutils-6.11-matchpathconinstall.patch +Patch8: coreutils-authors.patch +Patch9: coreutils-6.10-whorunlevel.patch # Our patches Patch100: coreutils-chgrp.patch @@ -111,6 +113,8 @@ cd %name-%version %patch5 -p1 -b .mksegfault %patch6 -p1 -b .mda5sum %patch7 -p1 -b .matchpathcon +%patch8 -p1 -b .authors +%patch9 -p1 -b .whorunlevel # Our patches %patch100 -p1 -b .chgrp @@ -321,6 +325,11 @@ fi /sbin/runuser %changelog +* Fri Jul 04 2008 Ondrej Vasik - 6.10-27 +- who -r should not show last runlevel for nonprintable chars + (like \0) - #453249,add few missing who options to texinfo + documentation, add missing authors for basename and echo + * Mon Jun 16 2008 Ondrej Vasik - 6.10-26 - print verbose output of chcon with newline after each message (#451478)