[Lunar-commits] <moonbase> coreutils: updated to 6.11, mktemp moved to /bin
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Wed Apr 23 03:41:46 CEST 2008
commit dce76a7e026ebc90509186f06111e07cb45ad112
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Wed Apr 23 03:41:46 2008 +0200
coreutils: updated to 6.11, mktemp moved to /bin
This commit updates coreutils to 6.11 version.
mktemp is now installed to /bin and coreutils will install its own mktemp to /usr/bin.
You will end up with /bin/mktemp (the original one from mktemp module) and
/usr/bin/mktemp installed by coreutils. From Lunar point of view this does not matter very much
as /bin/mktemp is used by Lunar as first choice. The /usr/bin/mktemp will be used by Lunar only when /bin/mktemp will disappear.
So this change makes no change in daily use but prepares for mktemp module removal at later time.
This improves system security as mktemp is very important and widely used command in many basic operations in Lunar.
---
utils/coreutils/BUILD | 11 ++++++++++-
utils/coreutils/DETAILS | 24 ++++++++++--------------
utils/coreutils/POST_INSTALL | 14 +++++++++++++-
utils/coreutils/PRE_BUILD | 2 ++
utils/mktemp/BUILD | 7 +++++++
utils/mktemp/DETAILS | 2 +-
6 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index 6dcf7f3..d18ae26 100644
--- a/utils/coreutils/BUILD
+++ b/utils/coreutils/BUILD
@@ -15,6 +15,9 @@
OPTS="$OPTS --disable-nls"
fi
+ # This option resolves conflicts with shadow/heimdal, net-tools and procps
+ OPTS="$OPTS --enable-no-install-program=arch,hostname,su,groups,kill,uptime"
+
# tchan added this hack for coreutils > 6.x
export CHGRPPROG=/bin/chgrp
export CHMODPROG=/bin/chmod
@@ -39,6 +42,12 @@
fi &&
# also, bash will need to rehash, but doesn't:
/bin/mv -f /usr/bin/chroot /usr/sbin
- )
+ ) &&
+
+# Some apps use fixed paths to /usr/bin so we add symlinks to make
+# them happy. For example see config.log of any compiled app to see that
+# autoconf looks for these coreutils apps only inside /usr/bin
+ln -sf /bin/uname /usr/bin/uname &&
+ln -sf /bin/arch /usr/bin/arch
) > $C_FIFO 2>&1
diff --git a/utils/coreutils/DETAILS b/utils/coreutils/DETAILS
index bd86974..2dbf1d4 100644
--- a/utils/coreutils/DETAILS
+++ b/utils/coreutils/DETAILS
@@ -1,20 +1,16 @@
MODULE=coreutils
- 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
+ VERSION=6.11
+ SOURCE=$MODULE-$VERSION.tar.gz
+ SOURCE2=$MODULE-6.10-uname_PIC-1.patch
+ SOURCE_URL[0]=$GNU_URL/$MODULE/
+ SOURCE_URL[1]=ftp://ftp.gnu.org/gnu/$MODULE/
+ SOURCE2_URL=$PATCH_URL/
+ SOURCE_VFY=sha1:238dc7cb815659abe69ba52a1cbb7fb7f481dc0e
+ SOURCE2_VFY=sha1:fdecc911341aa15a54be5aab85194fca16722ced
WEB_SITE=http://www.gnu.org/software/coreutils/
ENTERED=20030217
- UPDATED=20070807
+ UPDATED=20080422
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
@@ -55,6 +51,7 @@ md5sum -- compute and check MD5 messsage digest
mkdir -- creates directories
mkfifo -- creates FIFOs (named pipes)
mknod -- creates special files
+mktemp -- make temporary file handling safe and simple
mv -- renames
nice -- modifies scheduling priority
nl -- number lines of files
@@ -94,7 +91,6 @@ 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
vdir -- long directory listing (like ls -l)
wc -- prints the number of bytes, words, and lines in files
diff --git a/utils/coreutils/POST_INSTALL b/utils/coreutils/POST_INSTALL
index 51f685a..f5a70da 100644
--- a/utils/coreutils/POST_INSTALL
+++ b/utils/coreutils/POST_INSTALL
@@ -12,7 +12,19 @@
if module_installed textutils ; then
remove_module textutils
- remove_depends textutils
+ remove_depends textutils
fi
+# Just in case reinstall all modules old coreutils may conflict with
+# When all users will migrate to new coreutils all these lines can be removed:
+OLDVER=`installed_version $MODULE`
+OLDVERA=`echo $OLDVER | cut -d. -f1`
+OLDVERB=`echo $OLDVER | cut -d. -f2`
+if [ "$OLDVERA" -le 6 ] && [ "$OLDVERB" -lt 10 ]; then
+ lin shadow procps mktemp
+ if module_installed net-tools ; then
+ lin net-tools
+ fi
+fi
+
)
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
new file mode 100644
index 0000000..ebd8203
--- /dev/null
+++ b/utils/coreutils/PRE_BUILD
@@ -0,0 +1,2 @@
+lin -c mktemp
+default_pre_build
diff --git a/utils/mktemp/BUILD b/utils/mktemp/BUILD
new file mode 100644
index 0000000..bf513e6
--- /dev/null
+++ b/utils/mktemp/BUILD
@@ -0,0 +1,7 @@
+(
+
+sedit 's/install: install-dirs install-binaries install-man/install: install-dirs install-binaries/' Makefile.in &&
+OPTS="$OPTS --bindir=/bin"
+default_build
+
+) > $C_FIFO 2>&1
diff --git a/utils/mktemp/DETAILS b/utils/mktemp/DETAILS
index cdfaf37..a018b3d 100644
--- a/utils/mktemp/DETAILS
+++ b/utils/mktemp/DETAILS
@@ -5,7 +5,7 @@
SOURCE_URL[1]=ftp://ftp.courtesan.com/pub/mktemp/
WEB_SITE=http://www.mktemp.org/
ENTERED=20020307
- UPDATED=20040707
+ UPDATED=20080422
SHORT="simple utility designed to make temporary file handling in shells scripts be safe and simple."
cat << EOF
What/why is mktemp?
More information about the Lunar-commits
mailing list