rpms/coreutils/F-11 coreutils-7.2-ls-derefdanglinginode.patch, NONE, 1.1 coreutils-7.2-ls-infloop.patch, NONE, 1.1 coreutils-7.2-trueexecve.patch, NONE, 1.1 coreutils-DIR_COLORS, 1.6, 1.7 coreutils-DIR_COLORS.256color, 1.5, 1.6 coreutils-DIR_COLORS.lightbgcolor, 1.1, 1.2 coreutils-colorls.sh, 1.13, 1.14 coreutils.spec, 1.261, 1.262
Ondrej Vasik
ovasik at fedoraproject.org
Tue Jan 12 14:58:44 UTC 2010
Author: ovasik
Update of /cvs/pkgs/rpms/coreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29892
Modified Files:
coreutils-DIR_COLORS coreutils-DIR_COLORS.256color
coreutils-DIR_COLORS.lightbgcolor coreutils-colorls.sh
coreutils.spec
Added Files:
coreutils-7.2-ls-derefdanglinginode.patch
coreutils-7.2-ls-infloop.patch coreutils-7.2-trueexecve.patch
Log Message:
require gmp-devel/gmp for large numbers support(#552846), various fixes from F-12/rawhide
coreutils-7.2-ls-derefdanglinginode.patch:
src/ls.c | 18 ++++++++++++++----
tests/ls/dangle | 8 ++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
--- NEW FILE coreutils-7.2-ls-derefdanglinginode.patch ---
diff -urNp coreutils-7.2-orig/src/ls.c coreutils-7.2/src/ls.c
--- coreutils-7.2-orig/src/ls.c 2010-01-12 15:54:16.000000000 +0100
+++ coreutils-7.2/src/ls.c 2010-01-12 15:54:57.000000000 +0100
@@ -3593,6 +3593,18 @@ format_group_width (gid_t g)
}
+/* Return a pointer to a formatted version of F->stat.st_ino,
+ possibly using buffer, BUF, of length BUFLEN, which must be at least
+ INT_BUFSIZE_BOUND (uintmax_t) bytes. */
+static char *
+format_inode (char *buf, size_t buflen, const struct fileinfo *f)
+{
+ assert (INT_BUFSIZE_BOUND (uintmax_t) <= buflen);
+ return (f->stat.st_ino == NOT_AN_INODE_NUMBER
+ ? (char *) "?"
+ : umaxtostr (f->stat.st_ino, buf));
+}
+
/* Print info about f in scontext format */
static void
print_scontext_format (const struct fileinfo *f)
@@ -3714,9 +3726,7 @@ print_long_format (const struct fileinfo
{
char hbuf[INT_BUFSIZE_BOUND (uintmax_t)];
sprintf (p, "%*s ", inode_number_width,
- (f->stat.st_ino == NOT_AN_INODE_NUMBER
- ? "?"
- : umaxtostr (f->stat.st_ino, hbuf)));
+ format_inode (hbuf, sizeof hbuf, f));
/* Increment by strlen (p) here, rather than by inode_number_width + 1.
The latter is wrong when inode_number_width is zero. */
p += strlen (p);
@@ -4106,7 +4116,7 @@ print_file_name_and_frills (const struct
if (print_inode)
printf ("%*s ", format == with_commas ? 0 : inode_number_width,
- umaxtostr (f->stat.st_ino, buf));
+ format_inode (buf, sizeof buf, f));
if (print_block_size)
printf ("%*s ", format == with_commas ? 0 : block_size_width,
diff -urNp coreutils-7.2-orig/tests/ls/dangle coreutils-7.2/tests/ls/dangle
--- coreutils-7.2-orig/tests/ls/dangle 2009-02-27 17:36:00.000000000 +0100
+++ coreutils-7.2/tests/ls/dangle 2010-01-12 15:54:57.000000000 +0100
@@ -26,6 +26,9 @@ fi
ln -s no-such-file dangle || framework_failure
mkdir -p dir/sub || framework_failure
ln -s dir slink-to-dir || framework_failure
+mkdir d || framework_failure
+ln -s no-such d/dangle || framework_failure
+echo '? dangle' > subdir_exp || framework_failure
fail=0
@@ -50,4 +53,9 @@ EOF
compare out exp || fail=1
+# Ensure that ls -Li prints "?" as the inode of a dangling symlink.
+rm -f out
+ls -Li d > out 2>/dev/null && fail=1
+compare out subdir_exp || fail=1
+
Exit $fail
coreutils-7.2-ls-infloop.patch:
doc/coreutils.texi | 5
doc/coreutils.texi.orig |15550 ++++++++++++++++++++++++++++++++++++++++++++++++
src/ls.c | 1
tests/ls/infloop | 24
4 files changed, 15567 insertions(+), 13 deletions(-)
--- NEW FILE coreutils-7.2-ls-infloop.patch ---
diff -urNp coreutils-7.2-orig/doc/coreutils.texi coreutils-7.2/doc/coreutils.texi
--- coreutils-7.2-orig/doc/coreutils.texi 2009-03-29 19:44:10.000000000 +0200
+++ coreutils-7.2/doc/coreutils.texi 2010-01-12 15:49:19.000000000 +0100
@@ -6100,8 +6100,9 @@ Exit status:
1 minor problems (e.g., failure to access a file or directory not
specified as a command line argument. This happens when listing a
directory in which entries are actively being removed or renamed.)
-2 serious trouble (e.g., memory exhausted, invalid option or failure
- to access file or directory specified as a command line argument)
+2 serious trouble (e.g., memory exhausted, invalid option, failure
+ to access a file or directory specified as a command line argument
+ or a directory loop)
@end display
Also see @ref{Common options}.
diff -urNp coreutils-7.2-orig/doc/coreutils.texi.orig coreutils-7.2/doc/coreutils.texi.orig
--- coreutils-7.2-orig/doc/coreutils.texi.orig 1970-01-01 01:00:00.000000000 +0100
+++ coreutils-7.2/doc/coreutils.texi.orig 2009-03-29 19:44:10.000000000 +0200
@@ -0,0 +1,15550 @@
+\input texinfo
+ at c %**start of header
+ at setfilename coreutils.info
+ at settitle @sc{gnu} Coreutils
+
+ at c %**end of header
+
+ at include version.texi
+ at include constants.texi
+
+ at c Define new indices.
+ at defcodeindex op
+ at defcodeindex fl
+
+ at c Put everything in one index (arbitrarily chosen to be the concept index).
+ at syncodeindex fl cp
+ at syncodeindex fn cp
+ at syncodeindex ky cp
+ at syncodeindex op cp
+ at syncodeindex pg cp
+ at syncodeindex vr cp
+
+ at dircategory Basics
+ at direntry
+* Coreutils: (coreutils). Core GNU (file, text, shell) utilities.
+* Common options: (coreutils)Common options. Common options.
+* File permissions: (coreutils)File permissions. Access modes.
+* Date input formats: (coreutils)Date input formats.
+ at end direntry
+
+ at c FIXME: the following need documentation
+ at c * [: (coreutils)[ invocation. File/string tests.
+ at c * pinky: (coreutils)pinky invocation. FIXME.
+ at c * mktemp: (coreutils)mktemp invocation. FIXME.
+
+ at dircategory Individual utilities
+ at direntry
+* arch: (coreutils)arch invocation. Print machine hardware name.
+* base64: (coreutils)base64 invocation. Base64 encode/decode data.
+* basename: (coreutils)basename invocation. Strip directory and suffix.
+* cat: (coreutils)cat invocation. Concatenate and write files.
+* chcon: (coreutils)chcon invocation. Change SELinux CTX of files.
+* chgrp: (coreutils)chgrp invocation. Change file groups.
+* chmod: (coreutils)chmod invocation. Change file permissions.
+* chown: (coreutils)chown invocation. Change file owners/groups.
+* chroot: (coreutils)chroot invocation. Specify the root directory.
+* cksum: (coreutils)cksum invocation. Print POSIX CRC checksum.
+* comm: (coreutils)comm invocation. Compare sorted files by line.
+* cp: (coreutils)cp invocation. Copy files.
+* csplit: (coreutils)csplit invocation. Split by context.
+* cut: (coreutils)cut invocation. Print selected parts of lines.
+* date: (coreutils)date invocation. Print/set system date and time.
+* dd: (coreutils)dd invocation. Copy and convert a file.
+* df: (coreutils)df invocation. Report file system disk usage.
+* dir: (coreutils)dir invocation. List directories briefly.
+* dircolors: (coreutils)dircolors invocation. Color setup for ls.
+* dirname: (coreutils)dirname invocation. Strip non-directory suffix.
+* du: (coreutils)du invocation. Report on disk usage.
+* echo: (coreutils)echo invocation. Print a line of text.
+* env: (coreutils)env invocation. Modify the environment.
+* expand: (coreutils)expand invocation. Convert tabs to spaces.
+* expr: (coreutils)expr invocation. Evaluate expressions.
+* factor: (coreutils)factor invocation. Print prime factors
+* false: (coreutils)false invocation. Do nothing, unsuccessfully.
+* fmt: (coreutils)fmt invocation. Reformat paragraph text.
+* fold: (coreutils)fold invocation. Wrap long input lines.
+* groups: (coreutils)groups invocation. Print group names a user is in.
+* head: (coreutils)head invocation. Output the first part of files.
+* hostid: (coreutils)hostid invocation. Print numeric host identifier.
+* hostname: (coreutils)hostname invocation. Print or set system name.
+* id: (coreutils)id invocation. Print user identity.
+* install: (coreutils)install invocation. Copy and change attributes.
+* join: (coreutils)join invocation. Join lines on a common field.
+* kill: (coreutils)kill invocation. Send a signal to processes.
+* link: (coreutils)link invocation. Make hard links between files.
+* ln: (coreutils)ln invocation. Make links between files.
+* logname: (coreutils)logname invocation. Print current login name.
+* ls: (coreutils)ls invocation. List directory contents.
+* md5sum: (coreutils)md5sum invocation. Print or check MD5 digests.
+* mkdir: (coreutils)mkdir invocation. Create directories.
+* mkfifo: (coreutils)mkfifo invocation. Create FIFOs (named pipes).
+* mknod: (coreutils)mknod invocation. Create special files.
+* mv: (coreutils)mv invocation. Rename files.
+* nice: (coreutils)nice invocation. Modify niceness.
+* nl: (coreutils)nl invocation. Number lines and write files.
+* nohup: (coreutils)nohup invocation. Immunize to hangups.
+* od: (coreutils)od invocation. Dump files in octal, etc.
+* paste: (coreutils)paste invocation. Merge lines of files.
+* pathchk: (coreutils)pathchk invocation. Check file name portability.
+* pr: (coreutils)pr invocation. Paginate or columnate files.
+* printenv: (coreutils)printenv invocation. Print environment variables.
+* printf: (coreutils)printf invocation. Format and print data.
+* ptx: (coreutils)ptx invocation. Produce permuted indexes.
+* pwd: (coreutils)pwd invocation. Print working directory.
+* readlink: (coreutils)readlink invocation. Print referent of a symlink.
+* rm: (coreutils)rm invocation. Remove files.
+* rmdir: (coreutils)rmdir invocation. Remove empty directories.
+* runcon: (coreutils)runcon invocation. Run in specified SELinux CTX.
+* seq: (coreutils)seq invocation. Print numeric sequences
+* sha1sum: (coreutils)sha1sum invocation. Print or check SHA-1 digests.
+* sha2: (coreutils)sha2 utilities. Print or check SHA-2 digests.
+* shred: (coreutils)shred invocation. Remove files more securely.
+* shuf: (coreutils)shuf invocation. Shuffling text files.
+* sleep: (coreutils)sleep invocation. Delay for a specified time.
+* sort: (coreutils)sort invocation. Sort text files.
+* split: (coreutils)split invocation. Split into fixed-size pieces.
+* stat: (coreutils)stat invocation. Report file(system) status.
+* stty: (coreutils)stty invocation. Print/change terminal settings.
+* su: (coreutils)su invocation. Modify user and group ID.
+* sum: (coreutils)sum invocation. Print traditional checksum.
+* sync: (coreutils)sync invocation. Synchronize memory and disk.
+* tac: (coreutils)tac invocation. Reverse files.
+* tail: (coreutils)tail invocation. Output the last part of files.
+* tee: (coreutils)tee invocation. Redirect to multiple files.
+* test: (coreutils)test invocation. File/string tests.
+* timeout: (coreutils)timeout invocation. Run with time limit.
+* touch: (coreutils)touch invocation. Change file timestamps.
+* tr: (coreutils)tr invocation. Translate characters.
+* true: (coreutils)true invocation. Do nothing, successfully.
+* truncate: (coreutils)truncate invocation. Shrink/extend size of a file.
+* tsort: (coreutils)tsort invocation. Topological sort.
+* tty: (coreutils)tty invocation. Print terminal name.
+* uname: (coreutils)uname invocation. Print system information.
+* unexpand: (coreutils)unexpand invocation. Convert spaces to tabs.
+* uniq: (coreutils)uniq invocation. Uniquify files.
+* unlink: (coreutils)unlink invocation. Removal via unlink(2).
+* uptime: (coreutils)uptime invocation. Print uptime and load.
+* users: (coreutils)users invocation. Print current user names.
+* vdir: (coreutils)vdir invocation. List directories verbosely.
+* wc: (coreutils)wc invocation. Line, word, and byte counts.
+* who: (coreutils)who invocation. Print who is logged in.
+* whoami: (coreutils)whoami invocation. Print effective user ID.
+* yes: (coreutils)yes invocation. Print a string indefinitely.
+ at end direntry
+
+ at copying
+This manual documents version @value{VERSION} of the @sc{gnu} core
+utilities, including the standard programs for text and file manipulation.
+
+Copyright @copyright{} 1994-1996, 2000-2009 Free Software Foundation, Inc.
+
+ at quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts. A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
+ at end quotation
+ at end copying
+
+ at titlepage
+ at title @sc{gnu} @code{Coreutils}
+ at subtitle Core GNU utilities
+ at subtitle for version @value{VERSION}, @value{UPDATED}
+ at author David MacKenzie et al.
+
+ at page
+ at vskip 0pt plus 1filll
+ at insertcopying
+ at end titlepage
+ at shortcontents
+ at contents
+
+ at ifnottex
+ at node Top
+ at top GNU Coreutils
+
+ at insertcopying
+ at end ifnottex
+
+ at cindex core utilities
+ at cindex text utilities
+ at cindex shell utilities
+ at cindex file utilities
+
+ at menu
+* Introduction:: Caveats, overview, and authors.
+* Common options:: Common options.
+* Output of entire files:: cat tac nl od
[...15226 lines suppressed...]
+ at print{} 51 of
+ at print{} 51 and
+ at dots{}
+ at end smallexample
+
+Whew! That's a lot to digest. Yet, the same principles apply. With six
+commands, on two lines (really one long one split for convenience), we've
+created a program that does something interesting and useful, in much
+less time than we could have written a C program to do the same thing.
+
+A minor modification to the above pipeline can give us a simple spelling
+checker! To determine if you've spelled a word correctly, all you have to
+do is look it up in a dictionary. If it is not there, then chances are
+that your spelling is incorrect. So, we need a dictionary.
+The conventional location for a dictionary is @file{/usr/dict/words}.
+On my GNU/Linux system, at footnote{Redhat Linux 6.1, for the November 2000
+revision of this article.}
+this is a is a sorted, 45,402 word dictionary.
+
+Now, how to compare our file with the dictionary? As before, we generate
+a sorted list of words, one per line:
+
+ at smallexample
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
+> tr -s ' ' '\n' | sort -u | ...
+ at end smallexample
+
+Now, all we need is a list of words that are @emph{not} in the
+dictionary. Here is where the @command{comm} command comes in.
+
+ at smallexample
+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
+> tr -s ' ' '\n' | sort -u |
+> comm -23 - /usr/dict/words
+ at end smallexample
+
+The @option{-2} and @option{-3} options eliminate lines that are only in the
+dictionary (the second file), and lines that are in both files. Lines
+only in the first file (standard input, our stream of words), are
+words that are not in the dictionary. These are likely candidates for
+spelling errors. This pipeline was the first cut at a production
+spelling checker on Unix.
+
+There are some other tools that deserve brief mention.
+
+ at table @command
+ at item grep
+search files for text that matches a regular expression
+
+ at item wc
+count lines, words, characters
+
+ at item tee
+a T-fitting for data pipes, copies data to files and to standard output
+
+ at item sed
+the stream editor, an advanced tool
+
+ at item awk
+a data manipulation language, another advanced tool
+ at end table
+
+The software tools philosophy also espoused the following bit of
+advice: ``Let someone else do the hard part.'' This means, take
+something that gives you most of what you need, and then massage it the
+rest of the way until it's in the form that you want.
+
+To summarize:
+
+ at enumerate 1
+ at item
+Each program should do one thing well. No more, no less.
+
+ at item
+Combining programs with appropriate plumbing leads to results where
+the whole is greater than the sum of the parts. It also leads to novel
+uses of programs that the authors might never have imagined.
+
+ at item
+Programs should never print extraneous header or trailer data, since these
+could get sent on down a pipeline. (A point we didn't mention earlier.)
+
+ at item
+Let someone else do the hard part.
+
+ at item
+Know your toolbox! Use each program appropriately. If you don't have an
+appropriate tool, build one.
+ at end enumerate
+
+As of this writing, all the programs we've discussed are available via
+anonymous @command{ftp} from: @*
+ at uref{ftp://gnudist.gnu.org/textutils/textutils-1.22.tar.gz}. (There may
+be more recent versions available now.)
+
+None of what I have presented in this column is new. The Software Tools
+philosophy was first introduced in the book @cite{Software Tools}, by
+Brian Kernighan and P.J. Plauger (Addison-Wesley, ISBN 0-201-03669-X).
+This book showed how to write and use software tools. It was written in
+1976, using a preprocessor for FORTRAN named @command{ratfor} (RATional
+FORtran). At the time, C was not as ubiquitous as it is now; FORTRAN
+was. The last chapter presented a @command{ratfor} to FORTRAN
+processor, written in @command{ratfor}. @command{ratfor} looks an awful
+lot like C; if you know C, you won't have any problem following the
+code.
+
+In 1981, the book was updated and made available as @cite{Software Tools
+in Pascal} (Addison-Wesley, ISBN 0-201-10342-7). Both books are
+still in print and are well worth
+reading if you're a programmer. They certainly made a major change in
+how I view programming.
+
+The programs in both books are available from
+ at uref{http://cm.bell-labs.com/who/bwk, Brian Kernighan's home page}.
+For a number of years, there was an active
+Software Tools Users Group, whose members had ported the original
+ at command{ratfor} programs to essentially every computer system with a
+FORTRAN compiler. The popularity of the group waned in the middle 1980s
+as Unix began to spread beyond universities.
+
+With the current proliferation of GNU code and other clones of Unix programs,
+these programs now receive little attention; modern C versions are
+much more efficient and do more than these programs do. Nevertheless, as
+exposition of good programming style, and evangelism for a still-valuable
+philosophy, these books are unparalleled, and I recommend them highly.
+
+Acknowledgment: I would like to express my gratitude to Brian Kernighan
+of Bell Labs, the original Software Toolsmith, for reviewing this column.
+
+ at node GNU Free Documentation License
+ at appendix GNU Free Documentation License
+
+ at include fdl.texi
+
+ at node Concept index
+ at unnumbered Index
+
+ at printindex cp
+
+ at bye
+
+ at c Local variables:
+ at c texinfo-column-for-description: 32
+ at c End:
diff -urNp coreutils-7.2-orig/src/ls.c coreutils-7.2/src/ls.c
--- coreutils-7.2-orig/src/ls.c 2010-01-12 15:48:41.000000000 +0100
+++ coreutils-7.2/src/ls.c 2010-01-12 15:49:19.000000000 +0100
@@ -2471,6 +2471,7 @@ print_dir (char const *name, char const
error (0, 0, _("%s: not listing already-listed directory"),
quotearg_colon (name));
closedir (dirp);
+ set_exit_status (true);
return;
}
diff -urNp coreutils-7.2-orig/tests/ls/infloop coreutils-7.2/tests/ls/infloop
--- coreutils-7.2-orig/tests/ls/infloop 2009-02-27 17:36:00.000000000 +0100
+++ coreutils-7.2/tests/ls/infloop 2010-01-12 15:49:19.000000000 +0100
@@ -2,6 +2,7 @@
# show that the following no longer makes ls infloop
# mkdir loop; cd loop; ln -s ../loop sub; ls -RL
+# Also ensure ls exits with status = 2 in that case.
# Copyright (C) 2001-2002, 2004, 2006-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
@@ -27,21 +28,22 @@ fi
mkdir loop || framework_failure
ln -s ../loop loop/sub || framework_failure
-fail=0
-
-ls -RL loop 2>err | head -n 7 > out
-# With an inf-looping ls, out will contain these 7 lines:
-cat <<EOF > bad
+cat <<\EOF > exp-out || framework_failure
loop:
sub
+EOF
-loop/sub:
-sub
-
-loop/sub/sub:
+cat <<\EOF > exp-err || framework_failure
+ls: loop/sub: not listing already-listed directory
EOF
-# Make sure we don't get the "bad" output.
-compare out bad > /dev/null 2>&1 && fail=1
+fail=0
+
+timeout 1 ls -RL loop 2>err > out
+# Ensure that ls exits with status 2 upon detecting a cycle
+test $? = 2 || fail=1
+
+compare err exp-err || fail=1
+compare out exp-out || fail=1
Exit $fail
coreutils-7.2-trueexecve.patch:
true.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
--- NEW FILE coreutils-7.2-trueexecve.patch ---
diff -urNp coreutils-7.2-orig/src/true.c coreutils-7.2/src/true.c
--- coreutils-7.2-orig/src/true.c 2009-03-29 19:43:41.000000000 +0200
+++ coreutils-7.2/src/true.c 2010-01-12 15:52:44.000000000 +0100
@@ -54,18 +54,19 @@ Usage: %s [ignored command line argument
int
main (int argc, char **argv)
{
- initialize_main (&argc, &argv);
- set_program_name (argv[0]);
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
-
- atexit (close_stdout);
/* Recognize --help or --version only if it's the only command-line
argument. */
if (argc == 2)
{
+ initialize_main (&argc, &argv);
+ set_program_name (argv[0]);
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
+ atexit (close_stdout);
+
if (STREQ (argv[1], "--help"))
usage (EXIT_STATUS);
Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-DIR_COLORS 24 Feb 2009 11:53:37 -0000 1.6
+++ coreutils-DIR_COLORS 12 Jan 2010 14:58:44 -0000 1.7
@@ -1,5 +1,5 @@
# Configuration file for the color ls utility
-# Synchronized with coreutils 7.1 dircolors
+# Synchronized with coreutils 8.1 dircolors
# This file goes in the /etc directory, and must be world readable.
# You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults.
@@ -50,6 +50,7 @@ TERM rxvt-cygwin-native
TERM rxvt-unicode
TERM screen
TERM screen-256color
+TERM screen-256color-bce
TERM screen-bce
TERM screen-w
TERM screen.linux
@@ -78,7 +79,7 @@ RESET 0 # reset to "normal" color
DIR 01;34 # directory
LINK 01;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 01;35 # socket
DOOR 01;35 # door
@@ -115,12 +116,17 @@ EXEC 01;32
.taz 01;31
.lzh 01;31
.lzma 01;31
+.tlz 01;31
+.txz 01;31
.zip 01;31
.z 01;31
.Z 01;31
.dz 01;31
.gz 01;31
+.lz 01;31
+.xz 01;31
.bz2 01;31
+.tbz 01;31
.tbz2 01;31
.bz 01;31
.tz 01;31
@@ -133,7 +139,7 @@ EXEC 01;32
.cpio 01;31
.7z 01;31
.rz 01;31
-.xz 01;31
+
# image formats (magenta)
.jpg 01;35
.jpeg 01;35
@@ -148,6 +154,8 @@ EXEC 01;32
.tif 01;35
.tiff 01;35
.png 01;35
+.svg 01;35
+.svgz 01;35
.mng 01;35
.pcx 01;35
.mov 01;35
@@ -175,13 +183,15 @@ EXEC 01;32
.xcf 01;35
.xwd 01;35
.yuv 01;35
-.svg 01;35
-.svgz 01;35
+.cgm 01;35
+.emf 01;35
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 01;35
.anx 01;35
.ogv 01;35
.ogx 01;35
+
# audio formats (cyan)
.aac 01;36
.au 01;36
@@ -194,6 +204,7 @@ EXEC 01;32
.ogg 01;36
.ra 01;36
.wav 01;36
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 01;36
.oga 01;36
Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS.256color,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- coreutils-DIR_COLORS.256color 24 Feb 2009 11:53:37 -0000 1.5
+++ coreutils-DIR_COLORS.256color 12 Jan 2010 14:58:44 -0000 1.6
@@ -1,6 +1,6 @@
# Configuration file for the 256color ls utility
# This file goes in the /etc directory, and must be world readable.
-# Synchronized with coreutils 7.1 dircolors
+# Synchronized with coreutils 8.1 dircolors
# You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults.
# In the case that you are not satisfied with supplied colors, please
@@ -52,17 +52,17 @@ EIGHTBIT 1
#NORMAL 00 # global default, no color code at all
#FILE 00 # normal file, use no color at all
RESET 0 # reset to "normal" color
-DIR 01;38;5;27 # directory
-LINK 01;38;5;51 # symbolic link (If you set this to 'target' instead of a
+DIR 38;5;27 # directory
+LINK 38;5;51 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;38;5;15; # regular file with more than one link
+MULTIHARDLINK 44;38;5;15 # regular file with more than one link
FIFO 40;38;5;11 # pipe
-SOCK 01;38;5;13 # socket
-DOOR 01;38;5;5 # door
-BLK 01;48;5;232;38;5;11 # block device driver
-CHR 01;48;5;232;38;5;3 # character device driver
-ORPHAN 01;48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file
-MISSING 01;05;48;5;232;38;5;15 # ... and the files they point to
+SOCK 38;5;13 # socket
+DOOR 38;5;5 # door
+BLK 48;5;232;38;5;11 # block device driver
+CHR 48;5;232;38;5;3 # character device driver
+ORPHAN 48;5;232;38;5;9 # symlink to nonexistent file, or non-stat'able file
+MISSING 05;48;5;232;38;5;15 # ... and the files they point to
SETUID 48;5;196;38;5;15 # file that is setuid (u+s)
SETGID 48;5;11;38;5;16 # file that is setgid (g+s)
CAPABILITY 48;5;196;38;5;226 # file with capability
@@ -71,107 +71,117 @@ OTHER_WRITABLE 48;5;10;38;5;21 # dir tha
STICKY 48;5;21;38;5;15 # dir with the sticky bit set (+t) and not other-writable
# This is for files with execute permission:
-EXEC 01;38;5;34
+EXEC 38;5;34
# List any file extensions like '.gz' or '.tar' that you would like ls
# to colorize below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#')
# executables (bright green)
-#.cmd 01;38;5;34
-#.exe 01;38;5;34
-#.com 01;38;5;34
-#.btm 01;38;5;34
-#.bat 01;38;5;34
-#.sh 01;38;5;34
-#.csh 01;38;5;34
+#.cmd 38;5;34
+#.exe 38;5;34
+#.com 38;5;34
+#.btm 38;5;34
+#.bat 38;5;34
+#.sh 38;5;34
+#.csh 38;5;34
# archives or compressed (bright red)
-.tar 01;38;5;9
-.tgz 01;38;5;9
-.arj 01;38;5;9
-.taz 01;38;5;9
-.lzh 01;38;5;9
-.lzma 01;38;5;9
-.zip 01;38;5;9
-.z 01;38;5;9
-.Z 01;38;5;9
-.dz 01;38;5;9
-.gz 01;38;5;9
-.bz2 01;38;5;9
-.tbz2 01;38;5;9
-.bz 01;38;5;9
-.tz 01;38;5;9
-.deb 01;38;5;9
-.rpm 01;38;5;9
-.jar 01;38;5;9
-.rar 01;38;5;9
-.ace 01;38;5;9
-.zoo 01;38;5;9
-.cpio 01;38;5;9
-.7z 01;38;5;9
-.rz 01;38;5;9
-.xz 01;38;5;9
+.tar 38;5;9
+.tgz 38;5;9
+.arj 38;5;9
+.taz 38;5;9
+.lzh 38;5;9
+.lzma 38;5;9
+.tlz 38;5;9
+.txz 38;5;9
+.zip 38;5;9
+.z 38;5;9
+.Z 38;5;9
+.dz 38;5;9
+.gz 38;5;9
+.lz 38;5;9
+.xz 38;5;9
+.bz2 38;5;9
+.tbz 38;5;9
+.tbz2 38;5;9
+.bz 38;5;9
+.tz 38;5;9
+.deb 38;5;9
+.rpm 38;5;9
+.jar 38;5;9
+.rar 38;5;9
+.ace 38;5;9
+.zoo 38;5;9
+.cpio 38;5;9
+.7z 38;5;9
+.rz 38;5;9
+
# image formats (magenta)
-.jpg 01;38;5;13
-.jpeg 01;38;5;13
-.gif 01;38;5;13
-.bmp 01;38;5;13
-.pbm 01;38;5;13
-.pgm 01;38;5;13
-.ppm 01;38;5;13
-.tga 01;38;5;13
-.xbm 01;38;5;13
-.xpm 01;38;5;13
-.tif 01;38;5;13
-.tiff 01;38;5;13
-.png 01;38;5;13
-.mng 01;38;5;13
-.pcx 01;38;5;13
-.mov 01;38;5;13
-.mpg 01;38;5;13
-.mpeg 01;38;5;13
-.m2v 01;38;5;13
-.mkv 01;38;5;13
-.ogm 01;38;5;13
-.mp4 01;38;5;13
-.m4v 01;38;5;13
-.mp4v 01;38;5;13
-.vob 01;38;5;13
-.qt 01;38;5;13
-.nuv 01;38;5;13
-.wmv 01;38;5;13
-.asf 01;38;5;13
-.rm 01;38;5;13
-.rmvb 01;38;5;13
-.flc 01;38;5;13
-.avi 01;38;5;13
-.fli 01;38;5;13
-.flv 01;38;5;13
-.gl 01;38;5;13
-.dl 01;38;5;13
-.xcf 01;38;5;13
-.xwd 01;38;5;13
-.yuv 01;38;5;13
-.svg 01;38;5;13
-.svgz 01;38;5;13
+.jpg 38;5;13
+.jpeg 38;5;13
+.gif 38;5;13
+.bmp 38;5;13
+.pbm 38;5;13
+.pgm 38;5;13
+.ppm 38;5;13
+.tga 38;5;13
+.xbm 38;5;13
+.xpm 38;5;13
+.tif 38;5;13
+.tiff 38;5;13
+.png 38;5;13
+.svg 38;5;13
+.svgz 38;5;13
+.mng 38;5;13
+.pcx 38;5;13
+.mov 38;5;13
+.mpg 38;5;13
+.mpeg 38;5;13
+.m2v 38;5;13
+.mkv 38;5;13
+.ogm 38;5;13
+.mp4 38;5;13
+.m4v 38;5;13
+.mp4v 38;5;13
+.vob 38;5;13
+.qt 38;5;13
+.nuv 38;5;13
+.wmv 38;5;13
+.asf 38;5;13
+.rm 38;5;13
+.rmvb 38;5;13
+.flc 38;5;13
+.avi 38;5;13
+.fli 38;5;13
+.flv 38;5;13
+.gl 38;5;13
+.dl 38;5;13
+.xcf 38;5;13
+.xwd 38;5;13
+.yuv 38;5;13
+.cgm 38;5;13
+.emf 38;5;13
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axv 01;38;5;13
-.anx 01;38;5;13
-.ogv 01;38;5;13
-.ogx 01;38;5;13
+.axv 38;5;13
+.anx 38;5;13
+.ogv 38;5;13
+.ogx 38;5;13
+
# audio formats (cyan)
-.aac 01;38;5;45
-.au 01;38;5;45
-.flac 01;38;5;45
-.mid 01;38;5;45
-.midi 01;38;5;45
-.mka 01;38;5;45
-.mp3 01;38;5;45
-.mpc 01;38;5;45
-.ogg 01;38;5;45
-.ra 01;38;5;45
-.wav 01;38;5;45
+.aac 38;5;45
+.au 38;5;45
+.flac 38;5;45
+.mid 38;5;45
+.midi 38;5;45
+.mka 38;5;45
+.mp3 38;5;45
+.mpc 38;5;45
+.ogg 38;5;45
+.ra 38;5;45
+.wav 38;5;45
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-.axa 01;38;5;45
-.oga 01;38;5;45
-.spx 01;38;5;45
-.xspf 01;38;5;45
+.axa 38;5;45
+.oga 38;5;45
+.spx 38;5;45
+.xspf 38;5;45
Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-DIR_COLORS.lightbgcolor 19 Mar 2009 14:56:48 -0000 1.1
+++ coreutils-DIR_COLORS.lightbgcolor 12 Jan 2010 14:58:44 -0000 1.2
@@ -1,5 +1,5 @@
# Configuration file for the color ls utility - modified for gray backgrounds
-# Synchronized with coreutils 7.1 dircolors
+# Synchronized with coreutils 8.1 dircolors
# This file goes in the /etc directory, and must be world readable.
# You can copy this file to .dir_colors in your $HOME directory to override
# the system defaults.
@@ -58,7 +58,7 @@ RESET 0
DIR 00;34 # directory
LINK 00;36 # symbolic link (If you set this to 'target' instead of a
# numerical value, the color is as for the file pointed to.)
-HARDLINK 44;37 # regular file with more than one link
+MULTIHARDLINK 00 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 00;35 # socket
DOOR 00;35 # door
@@ -94,12 +94,17 @@ EXEC 00;32
.taz 00;31
.lzh 00;31
.lzma 00;31
+.tlz 00;31
+.txz 00;31
.zip 00;31
.z 00;31
.Z 00;31
.dz 00;31
.gz 00;31
+.lz 00;31
+.xz 00;31
.bz2 00;31
+.tbz 00;31
.tbz2 00;31
.bz 00;31
.tz 00;31
@@ -112,7 +117,6 @@ EXEC 00;32
.cpio 00;31
.7z 00;31
.rz 00;31
-.xz 00;31
# image formats (magenta)
.jpg 00;35
.jpeg 00;35
@@ -127,6 +131,8 @@ EXEC 00;32
.tif 00;35
.tiff 00;35
.png 00;35
+.svg 00;35
+.svgz 00;35
.mng 00;35
.pcx 00;35
.mov 00;35
@@ -154,13 +160,15 @@ EXEC 00;32
.xcf 00;35
.xwd 00;35
.yuv 00;35
-.svg 00;35
-.svgz 00;35
+.cgm 00;35
+.emf 00;35
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axv 00;35
.anx 00;35
.ogv 00;35
.ogx 00;35
+
# audio formats (cyan)
.aac 00;36
.au 00;36
@@ -173,6 +181,7 @@ EXEC 00;32
.ogg 00;36
.ra 00;36
.wav 00;36
+
# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
.axa 00;36
.oga 00;36
Index: coreutils-colorls.sh
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-colorls.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- coreutils-colorls.sh 19 Mar 2009 14:56:49 -0000 1.13
+++ coreutils-colorls.sh 12 Jan 2010 14:58:44 -0000 1.14
@@ -32,7 +32,7 @@ if [ -z "$USER_LS_COLORS" ]; then
eval `dircolors --sh "$COLORS" 2>/dev/null`
[ -z "$LS_COLORS" ] && return
- egrep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
+ grep -qi "^COLOR.*none" $COLORS >/dev/null 2>/dev/null && return
fi
alias ll='ls -l --color=auto' 2>/dev/null
Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -p -r1.261 -r1.262
--- coreutils.spec 11 Dec 2009 18:50:15 -0000 1.261
+++ coreutils.spec 12 Jan 2010 14:58:44 -0000 1.262
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -24,6 +24,9 @@ Patch2: coreutils-7.4-install-SELinux.pa
Patch3: coreutils-7.5-ls-inode.patch
Patch4: coreutils-7.2-ls-fr_FR-misalignment.patch
Patch5: coreutils-CVE-2009-4135.patch
+Patch6: coreutils-7.2-ls-infloop.patch
+Patch7: coreutils-7.2-ls-derefdanglinginode.patch
+Patch8: coreutils-7.2-trueexecve.patch
# Our patches
Patch100: coreutils-6.10-configuration.patch
@@ -65,6 +68,7 @@ BuildRequires: automake >= 1.10.1
BuildRequires: libcap-devel >= 2.0.6
BuildRequires: libattr-devel
BuildRequires: attr
+BuildRequires: gmp-devel
Requires(post): libselinux >= 1.25.6-1
Requires: libattr
@@ -78,6 +82,7 @@ Requires(post): grep
%{?!nopam:Requires: pam >= 0.66-12}
Requires(post): libcap >= 2.0.6
Requires: ncurses
+Requires: gmp
# Require a C library that doesn't put LC_TIME files in our way.
Conflicts: glibc < 2.2
@@ -109,6 +114,8 @@ the old GNU fileutils, sh-utils, and tex
%patch3 -p1 -b .lsinode
%patch4 -p1 -b .frenchmonths
%patch5 -p1 -b .unsafetmp
+%patch6 -p1 -b .infloop
+%patch8 -p1 -b .execve
# Our patches
%patch100 -p1 -b .configure
@@ -136,6 +143,10 @@ the old GNU fileutils, sh-utils, and tex
%patch950 -p1 -b .selinux
%patch951 -p1 -b .selinuxman
+#upstream apply later
+%patch7 -p1 -b .inode
+
+
chmod a+x tests/misc/sort-mb-tests
sed -i 's/1.10a/1.10.1/' configure.ac
@@ -327,6 +338,18 @@ fi
/sbin/runuser
%changelog
+* Tue Jan 12 2010 Ondrej Vasik <ovasik at redhat.com> - 7.2-6
+- require gmp-devel/gmp for large numbers support(#552846)
+- use grep instead of deprecated egrep in colorls.sh script
+ (#548174)
+- fix DIR_COLORS.256color file, update /etc/DIR_COLORS* files
+- /bin/{true,false} - do not segfault with abusive
+ execve() usage (#537684)
+- ls: print "?", not "0" as inode of dereferenced dangling
+ symlink(#525400)
+- ls -LR exits with status 2, not 0, when it encounters
+ a cycle(#525402)
+
* Fri Dec 11 2009 Ondrej Vasik <ovasik at redhat.com> - 7.2-5
- CVE-2009-4135 : Unsafe temporary directory use in "distcheck" rule
More information about the scm-commits
mailing list