[Lunar-commits] coreutils: Properly fix conflicts with shadow and heimdal
Stefan Wold
ratler at lunar-linux.org
Sun Dec 16 11:43:11 CET 2007
commit b2f61bda07b8033600e455d5d76f881020033b07
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun Dec 16 11:43:11 2007 +0100
coreutils: Properly fix conflicts with shadow and heimdal
* Added patch to stop coreutils from building and installing
hostname, su and groups
* Cleaned up DETAILS message
* Cleaned up BUILD file a little
---
utils/coreutils/BUILD | 13 ++++--
utils/coreutils/DETAILS | 108 +++++++++++++++++++++++-----------------------
2 files changed, 62 insertions(+), 59 deletions(-)
diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index 0d865bc..f6a3a5e 100644
--- a/utils/coreutils/BUILD
+++ b/utils/coreutils/BUILD
@@ -1,9 +1,13 @@
(
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+ patch_it $SOURCE2 1 &&
+ # This patch resolve conflicts with shadow and heimdal
+ patch_it $SOURCE3 1 &&
# This should go away in version > 6.9
- sed -i "s at futimens@hassan_&@" $(echo `find . -type f -print | xargs grep -li 'futimens'`)
+ for i in lib/utimens.{c,h} src/{copy,touch}.c ; do
+ sedit 's/futimens/gl_&/' $i
+ done &&
bad_flags -malign-double
@@ -37,10 +41,9 @@
if [ -f /usr/bin/mv ] ; then
cp /usr/bin/mv /bin/mv &&
rm /usr/bin/mv
- fi
+ fi &&
# also, bash will need to rehash, but doesn't:
- /bin/mv -f /usr/bin/chroot /usr/sbin &&
- /bin/rm -f /usr/bin/hostname
+ /bin/mv -f /usr/bin/chroot /usr/sbin
)
) > $C_FIFO 2>&1
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index 7b19eea..bd86974 100644
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -2,103 +2,103 @@
VERSION=6.9
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=$MODULE-$VERSION-uname-1.patch.bz2
+ SOURCE3=$MODULE-6.9-unwanted_files.patch
SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/$MODULE/
SOURCE_URL[1]=$GNU_URL/$MODULE/
SOURCE2_URL=$PATCH_URL
+ SOURCE3_URL=$PATCH_URL
SOURCE_VFY=sha1:10310a78c4e1d9f742f3815ac28e9bf1086a5885
SOURCE2_VFY=sha1:0a7b05f254e2a2978a72d704c2867db0b81b93f6
+ SOURCE3_VFY=sha1:963af169d6d45fcc670e66dce787c7359b5de1fa
WEB_SITE=http://www.gnu.org/software/coreutils/
ENTERED=20030217
UPDATED=20070807
- SHORT="contains latest sh-utils, textutils and fileutils"
+ SHORT="Contains latest sh-utils, textutils and fileutils"
cat << EOF
Tools included perform the following file operations:
-basename -- removes the path prefix from a given pathname
-cat -- concatenates and prints files on the standard output
+basename -- removes the path prefix from a given pathname
+cat -- concatenates and prints files on the standard output
chgrp -- changes group ownership
chmod -- changes permissions
chown -- changes ownership
-chroot -- changes the root directory
-cksum -- checksum and count the bytes in a file
-comm -- compares two sorted files line by line
+chroot -- changes the root directory
+cksum -- checksum and count the bytes in a file
+comm -- compares two sorted files line by line
cp -- copies
-csplit -- splits a file into sections determined by context lines
-cut -- remove sections from each line of files
+csplit -- splits a file into sections determined by context lines
+cut -- remove sections from each line of files
date -- prints the system date and time
dd -- copies and converts
df -- shows filesystem disk usage.
dir -- gives brief directory listing
dircolors -- setup program for the color version of GNU ls
-dirname -- removes the last level or filename from a pathname
+dirname -- removes the last level or filename from a pathname
du -- shows disk usage
-echo -- prints a line of text
-env -- displays/modifies the environment
-expand -- convert tabs to spaces
-expr -- evaluates expressions
-factor -- prints prime factor
-false -- returns an unsuccessful exit status
-fmt -- simple optimal text formatter
-fold -- wrap each input line to fit in specified width
-groups -- prints the groups the user belongs to
-head -- output the first part of files
+echo -- prints a line of text
+env -- displays/modifies the environment
+expand -- convert tabs to spaces
+expr -- evaluates expressions
+factor -- prints prime factor
+false -- returns an unsuccessful exit status
+fmt -- simple optimal text formatter
+fold -- wrap each input line to fit in specified width
+head -- output the first part of files
hostid -- print the numeric id (in hex) for the current host
-hostname -- prints or sets the machine name
id -- print real/effective/uid/gid
install -- copies and sets permissions
-join -- join lines of two files on a common field
+join -- join lines of two files on a common field
ln -- creates links
-logname -- prints current login name
+logname -- prints current login name
ls -- lists directory contents
-md5sum -- compute and check MD5 messsage digest
+md5sum -- compute and check MD5 messsage digest
mkdir -- creates directories
mkfifo -- creates FIFOs (named pipes)
mknod -- creates special files
mv -- renames
nice -- modifies scheduling priority
-nl -- number lines of files
-nohup -- lets a command keep running after logging out
-od -- dump files in octal and other formats
-paste -- merge lines of files
-pathchk -- checks file name portability
-pinky -- lightweight 'finger' program; prints user information
-pr -- convert text files for printing
-printenv -- prints environment variables
-printf -- formats and prints data
-ptx -- produce a permuted index of file contents
-pwd -- prints the working (current) directory
+nl -- number lines of files
+nohup -- lets a command keep running after logging out
+od -- dump files in octal and other formats
+paste -- merge lines of files
+pathchk -- checks file name portability
+pinky -- lightweight 'finger' program; prints user information
+pr -- convert text files for printing
+printenv -- prints environment variables
+printf -- formats and prints data
+ptx -- produce a permuted index of file contents
+pwd -- prints the working (current) directory
readlink -- display value of a symbolic link on standard output
rm -- removes (deletes)
rmdir -- removes empty directories
seq -- prints numeric sequences
sha1sum -- print or check SHA1 (160-bit) checksums
shred -- deletes a file securely
-sleep -- suspends execution for a specified time
-sort -- sort lines of text files
-split -- split a file into pieces
+sleep -- suspends execution for a specified time
+sort -- sort lines of text files
+split -- split a file into pieces
stat -- display file or filesystem status
-stty -- prints/changes terminal settings
-su -- lets you adopt the ID of another user or superuser
-sum -- checksum and count the blocks in a file
+stty -- prints/changes terminal settings
+sum -- checksum and count the blocks in a file
sync -- synchronizes memory and disk
-tac -- concatenates and prints files in reverse
-tail -- outputs the last part of files
-tee -- sends output to multiple files
-test -- evaluates an expression
+tac -- concatenates and prints files in reverse
+tail -- outputs the last part of files
+tee -- sends output to multiple files
+test -- evaluates an expression
touch -- changes filestamps
tr -- translates or deletes characters
-true -- returns a successful exit status
-tsort -- perform topological sort
-tty -- prints terminal name
-uname -- prints system information
-unexpand -- convert spaces to tabs
-uniq -- remove duplicate lines from a sorted file
+true -- returns a successful exit status
+tsort -- perform topological sort
+tty -- prints terminal name
+uname -- prints system information
+unexpand -- convert spaces to tabs
+uniq -- remove duplicate lines from a sorted file
unlink -- call the unlink function to remove the specified FILE
-uptime -- tells how long the system has been running
-users -- prints current user names
+uptime -- tells how long the system has been running
+users -- prints current user names
vdir -- long directory listing (like ls -l)
wc -- prints the number of bytes, words, and lines in files
-who -- prints a list of all users currently logged in
-whoami -- prints effective user ID
+who -- prints a list of all users currently logged in
+whoami -- prints effective user ID
yes -- prints a string indefinitely
EOF
More information about the Lunar-commits
mailing list