rpms/coreutils/devel coreutils-authors.patch, NONE, 1.1 coreutils-who_texinfo.patch, NONE, 1.1 coreutils.spec, 1.219, 1.220

[Ondrej Vasik (ovasik)]

Author: ovasik

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

Modified Files:
	coreutils.spec 
Added Files:
	coreutils-authors.patch coreutils-who_texinfo.patch 
Log Message:
fix authors of basename/echo, add missing option to who info pages, print last runlevel in who -r only for printable chars

coreutils-authors.patch:

--- NEW FILE coreutils-authors.patch ---
Signed-off-by: Ondřej Vašík <ovasik at redhat.com>
Signed-off-by: Jim Meyering <meyering at redhat.com>

* 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 proper_name ("FIXME unknown")
+#define AUTHORS proper_name ("David MacKenzie")
 
 void
 usage (int status)
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: Torbjörn 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: Torbjörn 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,9 @@
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "echo"
 
-#define AUTHORS proper_name ("FIXME unknown")
+#define AUTHORS \
+  proper_name ("Brian Fox"), \
+  proper_name ("Chet Ramey")
 
 /* echo [-neE] [arg ...]
 Output the ARGs.  If -n is specified, the trailing newline is

coreutils-who_texinfo.patch:

--- NEW FILE coreutils-who_texinfo.patch ---
>From 63467fa18794f02497c7a46e3b7783ba1180f8fc Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
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
<http://bugzilla.redhat.com/453249>.
---
 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 <sys/types.h>
 #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?= <ovasik at redhat.com>
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.
 
+ at item -p
+ at itemx --process
+ at opindex -p
+ at opindex --process
+List active processes spawned by init.
+
+ at item -r
+ at itemx --runlevel
+ at opindex -r
+ at opindex --runlevel
+Print the current (and maybe previous) run-level of the init process. 
+
+ at item -t
+ at itemx --time
+ at opindex -t
+ at opindex --time
+Print last system clock change. 
+
 @item -w
 @itemx -T
 @itemx --mesg
-- 
1.5.2.2



Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- coreutils.spec	16 Jun 2008 14:50:18 -0000	1.219
+++ coreutils.spec	4 Jul 2008 15:18:41 -0000	1.220
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 6.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -19,6 +19,8 @@
 
 # From upstream
 Patch1: coreutils-futimensatkoji.patch
+Patch2: coreutils-authors.patch
+Patch3: coreutils-who_texinfo.patch
 
 # Our patches
 Patch100: coreutils-6.10-configuration.patch
@@ -100,6 +102,8 @@
 
 # From upstream
 %patch1 -p1 -b .kojifutimensat
+%patch2 -p1 -b .authors
+%patch3 -p1 -b .whotexinfo
 
 # Our patches
 %patch100 -p1 -b .configure
@@ -312,6 +316,11 @@
 /sbin/runuser
 
 %changelog
+* Fri Jul 04 2008 Ondrej Vasik <ovasik at redhat.com> - 6.12-5
+- fix authors for basename and echo
+- fix who info pages, print last runlevel only for printable
+  chars
+
 * Mon Jun 16 2008 Ondrej Vasik <ovasik at redhat.com> - 6.12-4
 - print verbose output of chcon with newline after each 
   message (#451478)