rpms/coreutils/devel coreutils-6.9-du-ls-upstream.patch, NONE, 1.1 coreutils-6.9-requiresecuritycontext.patch, 1.1, 1.2 coreutils.spec, 1.181, 1.182
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Fri Nov 2 14:27:24 UTC 2007
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17487
Modified Files:
coreutils-6.9-requiresecuritycontext.patch coreutils.spec
Added Files:
coreutils-6.9-du-ls-upstream.patch
Log Message:
du report size for unreadable dirs(#250089), some new supported dircolors TERMs(upstream+#239266)+ some symlink ls upstream tunning
coreutils-6.9-du-ls-upstream.patch:
--- NEW FILE coreutils-6.9-du-ls-upstream.patch ---
Fixes some small bugs (merged upstream patches)
Fixed RedHat Bugzillas: 250089(fix by jplans at redhat.com), 239266
diff -Naurp coreutils-5.2.1/lib/fts.c coreutils-5.2.1.new/lib/fts.c
--- coreutils-5.2.1/lib/fts.c 2003-12-20 10:05:23.000000000 -0800
+++ coreutils-5.2.1.new/lib/fts.c 2007-06-14 11:38:00.696001000 -0700
@@ -685,7 +685,7 @@ fts_read(sp)
/* If fts_build's call to fts_safe_changedir failed
because it was not able to fchdir into a
subdirectory, tell the caller. */
- if (p->fts_errno)
+ if (p->fts_errno && p->fts_info != FTS_DNR)
p->fts_info = FTS_ERR;
LEAVE_DIR (sp, p, "2");
return (p);
}
diff -ur coreutils-6.9-orig/src/du.c coreutils-6.9/src/du.c
--- coreutils-6.9-orig/src/du.c
+++ coreutils-6.9/src/du.c
duinfo_add (&dulvl[level].ent, &dui);
/* Even if this directory is unreadable or we can't chdir into it,
- do let its size contribute to the total, ... */
+ do let its size contribute to the total. */
duinfo_add (&tot_dui, &dui);
- /* ... but don't print out a total for it, since without the size(s)
- of any potential entries, it could be very misleading. */
- if (ent->fts_info == FTS_DNR)
- return ok;
-
/* If we're not counting an entry, e.g., because it's a hard link
to a file we've already counted (and --count-links), then don't
print a line for it. */
diff -urNp coreutils-6.9-orig/src/dircolors.hin coreutils-6.9/src/dircolors.hin
--- coreutils-6.9-orig/src/dircolors.hin 2007-03-18 22:36:43.000000000 +0100
+++ coreutils-6.9/src/dircolors.hin 2007-11-02 12:27:03.000000000 +0100
@@ -27,6 +27,7 @@ TERM cons25
TERM console
TERM cygwin
TERM dtterm
+TERM eterm-color
TERM gnome
TERM konsole
TERM kterm
@@ -40,6 +40,7 @@ TERM rxvt-cygwin
TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM screen
+TERM screen-256color
TERM screen-bce
TERM screen-w
TERM screen.linux
@@ -46,7 +47,9 @@ TERM screen-w
TERM screen.linux
TERM vt100
TERM xterm
+TERM xterm-16color
TERM xterm-256color
+TERM xterm-88color
TERM xterm-color
TERM xterm-debian
diff -ur a/src/ls.c b/src/ls.c
--- a/src/ls.c
+++ b/src/ls.c
@@ -1168,7 +1168,7 @@ main (int argc, char **argv)
{
/* Avoid following symbolic links when possible. */
if (is_colored (C_ORPHAN)
- || is_colored (C_EXEC)
+ || (is_colored (C_EXEC) && color_symlink_as_referent)
|| (is_colored (C_MISSING) && format == long_format))
check_symlink_color = true;
@@ -2713,6 +2713,12 @@ gobble_file (char const *name, enum filetype type, ino_t inode,
free (linkname);
}
+ /* When not distinguishing types of symlinks, pretend we know that
+ it is stat'able, so that it will be colored as a regular symlink,
+ and not as an orphan. */
+ if (S_ISLNK (f->stat.st_mode) && !check_symlink_color)
+ f->linkok = true;
+
if (S_ISLNK (f->stat.st_mode))
f->filetype = symbolic_link;
else if (S_ISDIR (f->stat.st_mode))
coreutils-6.9-requiresecuritycontext.patch:
Index: coreutils-6.9-requiresecuritycontext.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.9-requiresecuritycontext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-6.9-requiresecuritycontext.patch 30 Oct 2007 16:30:38 -0000 1.1
+++ coreutils-6.9-requiresecuritycontext.patch 2 Nov 2007 14:27:20 -0000 1.2
@@ -1,6 +1,6 @@
diff -ur coreutils-6.9-orig/src/install.c coreutils-6.9/src/install.c
---- a/src/install.c 2007-10-30 12:34:07.000000000 +0100
-+++ b/src/install.c 2007-10-30 15:41:15.000000000 +0100
+--- coreutils-6.9-orig/src/install.c 2007-10-30 12:34:07.000000000 +0100
++++ coreutils-6.9/src/install.c 2007-10-30 15:41:15.000000000 +0100
@@ -174,6 +174,7 @@
x->preserve_mode = false;
x->preserve_timestamps = false;
@@ -10,8 +10,8 @@
x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false;
diff -ur coreutils-6.9-orig/src/mv.c coreutils-6.9/src/mv.c
---- a/src/mv.c 2007-10-30 12:34:07.000000000 +0100
-+++ b/src/mv.c 2007-10-30 15:34:37.000000000 +0100
+--- coreutils-6.9-orig/src/mv.c 2007-10-30 12:34:07.000000000 +0100
++++ coreutils-6.9/src/mv.c 2007-10-30 15:34:37.000000000 +0100
@@ -131,6 +131,7 @@
x->preserve_timestamps = true;
x->preserve_security_context = selinux_enabled;
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- coreutils.spec 30 Oct 2007 16:30:38 -0000 1.181
+++ coreutils.spec 2 Nov 2007 14:27:20 -0000 1.182
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.9
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -20,6 +20,7 @@
Patch1: coreutils-futimens.patch
Patch2: coreutils-ls-x.patch
Patch3: coreutils-6.9-cp-i-u.patch
+Patch4: coreutils-6.9-du-ls-upstream.patch
# Our patches
Patch100: coreutils-chgrp.patch
@@ -89,6 +90,7 @@
%patch1 -p1 -b .futimens
%patch2 -p1 -b .ls-x
%patch3 -p1 -b .cp-i-u
+%patch4 -p1 -b .du-ls
# Our patches
%patch100 -p1 -b .chgrp
@@ -285,6 +287,11 @@
/sbin/runuser
%changelog
+* Fri Nov 02 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-12
+- added some upstream supported dircolors TERMs(#239266)
+- fixed du output for unaccesible dirs(#250089)
+- a bit of upstream tunning for symlinks
+
* Tue Oct 30 2007 Ondrej Vasik <ovasik at redhat.com> - 6.9-11
- allow cp -a to rewrite file on different filesystem(#219900)
(based on upstream patch)
More information about the fedora-extras-commits
mailing list