rpms/coreutils/F-11 coreutils-7.2-ls-infloop.patch, 1.1, 1.2 coreutils-DIR_COLORS, 1.7, 1.8 coreutils-DIR_COLORS.256color, 1.6, 1.7 coreutils-DIR_COLORS.lightbgcolor, 1.2, 1.3 coreutils.spec, 1.262, 1.263
Ondrej Vasik
ovasik at fedoraproject.org
Thu Jan 14 08:31:12 UTC 2010
Author: ovasik
Update of /cvs/pkgs/rpms/coreutils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13709
Modified Files:
coreutils-7.2-ls-infloop.patch coreutils-DIR_COLORS
coreutils-DIR_COLORS.256color
coreutils-DIR_COLORS.lightbgcolor coreutils.spec
Log Message:
fix typo in DIR_COLORS* files, remove .orig file from patch
coreutils-7.2-ls-infloop.patch:
doc/coreutils.texi | 5 +++--
src/ls.c | 1 +
tests/ls/infloop | 24 +++++++++++++-----------
3 files changed, 17 insertions(+), 13 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 coreutils-7.2-ls-infloop.patchIndex: coreutils-7.2-ls-infloop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-7.2-ls-infloop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- coreutils-7.2-ls-infloop.patch 12 Jan 2010 14:58:44 -0000 1.1
+++ coreutils-7.2-ls-infloop.patch 14 Jan 2010 08:31:12 -0000 1.2
@@ -13,15560 +13,6 @@ diff -urNp coreutils-7.2-orig/doc/coreut
@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
-+* Formatting file contents:: fmt pr fold
-+* Output of parts of files:: head tail split csplit
-+* Summarizing files:: wc sum cksum md5sum sha1sum sha2
-+* Operating on sorted files:: sort shuf uniq comm ptx tsort
[...15169 lines suppressed...]
-+
-+ at smallexample
-+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
-+> tr -s ' ' '\n' | ...
-+ at end smallexample
-+
-+This command turns blanks into newlines. The @option{-s} option squeezes
-+multiple newline characters in the output into just one. This helps us
-+avoid blank lines. (The @samp{>} is the shell's ``secondary prompt.''
-+This is what the shell prints when it notices you haven't finished
-+typing in all of a command.)
-+
-+We now have data consisting of one word per line, no punctuation, all one
-+case. We're ready to count each word:
-+
-+ at smallexample
-+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
-+> tr -s ' ' '\n' | sort | uniq -c | ...
-+ at end smallexample
-+
-+At this point, the data might look something like this:
-+
-+ at example
-+ 60 a
-+ 2 able
-+ 6 about
-+ 1 above
-+ 2 accomplish
-+ 1 acquire
-+ 1 actually
-+ 2 additional
-+ at end example
-+
-+The output is sorted by word, not by count! What we want is the most
-+frequently used words first. Fortunately, this is easy to accomplish,
-+with the help of two more @command{sort} options:
-+
-+ at table @code
-+ at item -n
-+do a numeric sort, not a textual one
-+
-+ at item -r
-+reverse the order of the sort
-+ at end table
-+
-+The final pipeline looks like this:
-+
-+ at smallexample
-+$ tr '[:upper:]' '[:lower:]' < whats.gnu | tr -cd '[:alnum:]_ \n' |
-+> tr -s ' ' '\n' | sort | uniq -c | sort -n -r
-+ at print{} 156 the
-+ at print{} 60 a
-+ at print{} 58 to
-+ 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
Index: coreutils-DIR_COLORS
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- coreutils-DIR_COLORS 12 Jan 2010 14:58:44 -0000 1.7
+++ coreutils-DIR_COLORS 14 Jan 2010 08:31:12 -0000 1.8
@@ -79,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.)
-MULTIHARDLINK 00 # regular file with more than one link
+HARDLINK 44;37 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 01;35 # socket
DOOR 01;35 # door
Index: coreutils-DIR_COLORS.256color
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS.256color,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- coreutils-DIR_COLORS.256color 12 Jan 2010 14:58:44 -0000 1.6
+++ coreutils-DIR_COLORS.256color 14 Jan 2010 08:31:12 -0000 1.7
@@ -55,7 +55,7 @@ RESET 0 # reset to "normal" color
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.)
-MULTIHARDLINK 44;38;5;15 # regular file with more than one link
+HARDLINK 44;38;5;15 # regular file with more than one link
FIFO 40;38;5;11 # pipe
SOCK 38;5;13 # socket
DOOR 38;5;5 # door
Index: coreutils-DIR_COLORS.lightbgcolor
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils-DIR_COLORS.lightbgcolor,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- coreutils-DIR_COLORS.lightbgcolor 12 Jan 2010 14:58:44 -0000 1.2
+++ coreutils-DIR_COLORS.lightbgcolor 14 Jan 2010 08:31:12 -0000 1.3
@@ -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.)
-MULTIHARDLINK 00 # regular file with more than one link
+HARDLINK 44;37 # regular file with more than one link
FIFO 40;33 # pipe
SOCK 00;35 # socket
DOOR 00;35 # door
Index: coreutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coreutils/F-11/coreutils.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- coreutils.spec 12 Jan 2010 14:58:44 -0000 1.262
+++ coreutils.spec 14 Jan 2010 08:31:12 -0000 1.263
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
Version: 7.2
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -338,6 +338,9 @@ fi
/sbin/runuser
%changelog
+* Thu Jan 14 2010 Ondrej Vasik <ovasik at redhat.com> - 7.2-7
+- fix typo in DIR_COLORS* files
+
* 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
More information about the scm-commits
mailing list