rpms/coreutils/devel coreutils-selinux.patch, 1.19, 1.20 coreutils.spec, 1.109, 1.110
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 20 11:39:17 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26172
Modified Files:
coreutils-selinux.patch coreutils.spec
Log Message:
* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
- Make 'ls -Z' output more consistent with other output formats.
coreutils-selinux.patch:
README | 4
config.hin | 27 +--
configure.ac | 7
man/Makefile.am | 4
man/Makefile.in | 56 +++----
man/chcon.1 | 64 ++++++++
man/chcon.x | 4
man/cp.1 | 5
man/dir.1 | 14 +
man/id.1 | 3
man/install.1 | 5
man/ls.1 | 14 +
man/mkdir.1 | 2
man/mkfifo.1 | 3
man/mknod.1 | 3
man/runcon.1 | 43 +++++
man/runcon.x | 14 +
man/stat.1 | 6
man/vdir.1 | 14 +
src/Makefile.am | 23 +-
src/chcon.c | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++
src/copy.c | 49 ++++++
src/copy.h | 3
src/cp.c | 64 +++++++-
src/id.c | 68 ++++++++
src/install.c | 99 ++++++++++++
src/ls.c | 296 ++++++++++++++++++++++++++++++++-----
src/mkdir.c | 30 +++
src/mkfifo.c | 29 +++
src/mknod.c | 30 +++
src/mv.c | 12 +
src/runcon.c | 253 +++++++++++++++++++++++++++++++
src/stat.c | 142 ++++++++++++++---
tests/help-version | 4
34 files changed, 1691 insertions(+), 124 deletions(-)
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- coreutils-selinux.patch 24 Mar 2006 13:48:34 -0000 1.19
+++ coreutils-selinux.patch 20 Apr 2006 11:39:12 -0000 1.20
@@ -1160,8 +1160,8 @@
+ }
+ return 1; /* can't reach this statement.... */
+}
---- coreutils-5.94/src/ls.c.selinux 2006-03-24 13:23:38.000000000 +0000
-+++ coreutils-5.94/src/ls.c 2006-03-24 13:23:45.000000000 +0000
+--- coreutils-5.94/src/ls.c 2006-03-24 13:23:45.000000000 +0000
++++ coreutils-5.94/src/ls.c 2006-04-20 12:24:40.000000000 +0100
@@ -135,6 +135,18 @@
#define AUTHORS "Richard Stallman", "David MacKenzie"
@@ -1692,10 +1692,7 @@
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\
-@@ -4244,3 +4403,83 @@
- }
- exit (status);
- }
+@@ -4246,0 +4406,67 @@
+
+#ifdef WITH_SELINUX
+
@@ -1734,23 +1731,10 @@
+
+ /* print standard user and group */
+
-+ user_name = f->stat_failed ? "?" :
-+ (numeric_ids ? NULL : getuser (f->stat.st_uid));
-+ if (user_name)
-+ (void) sprintf (p, "%-8.8s ", user_name);
-+ else
-+ (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
-+ p += strlen (p);
-+
-+ if ( print_group ) {
-+ group_name = f->stat_failed ? "?" :
-+ (numeric_ids ? NULL : getgroup (f->stat.st_gid));
-+ if (group_name)
-+ (void) sprintf (p, "%-8.8s ", group_name);
-+ else
-+ (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_gid);
-+ p += strlen (p);
-+ }
++ DIRED_FPUTS (buf, stdout, p - buf);
++ format_user (f->stat.st_uid, owner_width, f->stat_failed);
++ format_group (f->stat.st_gid, group_width, f->stat_failed);
++ p = buf;
+ }
+
+ (void) sprintf (p, "%-32s ", f->scontext ?: "");
Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- coreutils.spec 24 Mar 2006 13:48:34 -0000 1.109
+++ coreutils.spec 20 Apr 2006 11:39:12 -0000 1.110
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 5.94
-Release: 2
+Release: 3
License: GPL
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -261,6 +261,9 @@
/sbin/runuser
%changelog
+* Thu Apr 20 2006 Tim Waugh <twaugh at redhat.com> 5.94-3
+- Make 'ls -Z' output more consistent with other output formats.
+
* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 5.94-2
- 5.94.
More information about the fedora-cvs-commits
mailing list