OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Feb-2006 20:07:00
Branch: HEAD Handle: 2006020419065800
Modified files:
openpkg-src/openpkg HISTORY shtool
Log:
upgrade to GNU shtool 2.0.4
Summary:
Revision Changes Path
1.310 +1 -0 openpkg-src/openpkg/HISTORY
1.32 +54 -37 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.309 -r1.310 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Feb 2006 09:39:16 -0000 1.309
+++ openpkg-src/openpkg/HISTORY 4 Feb 2006 19:06:58 -0000 1.310
@@ -2,6 +2,7 @@
2005
====
+20060204 upgrade to GNU shtool 2.0.4
20060204 apply Bash 3.1 vendor patches 001 to 007
20060115 upgrade to OSSP uuid 1.4.0
20060101 upgrade to GNU config 20051231
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.31 -r1.32 shtool
--- openpkg-src/openpkg/shtool 2 Oct 2005 15:18:23 -0000 1.31
+++ openpkg-src/openpkg/shtool 4 Feb 2006 19:06:58 -0000 1.32
@@ -1,12 +1,12 @@
#!/bin/sh
##
## GNU shtool -- The GNU Portable Shell Tool
-## Copyright (c) 1994-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 1994-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
-## Version: 2.0.3 (02-Oct-2005)
+## Version: 2.0.4 (04-Feb-2006)
## Contents: all available modules
##
@@ -59,17 +59,42 @@
## path Deal with program paths
##
+# maximum Bourne-Shell compatibility
+if [ ".$ZSH_VERSION" != . ] && (emulate sh) >/dev/null 2>&1; then
+ # reconfigure zsh(1)
+ emulate sh
+ NULLCMD=:
+ alias -g '${1+"$@"}'='"$@"'
+elif [ ".$BASH_VERSION" != . ] && (set -o posix) >/dev/null 2>&1; then
+ # reconfigure bash(1)
+ set -o posix
+fi
+
+# maximum independence of NLS nuisances
+for var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $var=C; export $var) 2>&1`"); then
+ eval $var=C; export $var
+ else
+ unset $var
+ fi
+done
+
+# initial command line handling
if [ $# -eq 0 ]; then
echo "$0:Error: invalid command line" 1>&2
echo "$0:Hint: run \`$0 -h' for usage" 1>&2
exit 1
fi
if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
- echo "This is GNU shtool, version 2.0.3 (02-Oct-2005)"
- echo "Copyright (c) 1994-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>"
- echo "Report bugs to <[EMAIL PROTECTED]>"
+ echo "This is GNU shtool, version 2.0.4 (04-Feb-2006)"
+ echo 'Copyright (c) 1994-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>'
+ echo 'Report bugs to <[EMAIL PROTECTED]>'
echo ''
- echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>]
[<cmd-args>]]"
+ echo 'Usage: shtool [<options>] [<cmd-name> [<cmd-options>]
[<cmd-args>]]'
echo ''
echo 'Available global <options>:'
echo ' -v, --version display shtool version information'
@@ -132,7 +157,7 @@
exit 0
fi
if [ ".$1" = ".-v" ] || [ ".$1" = ".--version" ]; then
- echo "GNU shtool 2.0.3 (02-Oct-2005)"
+ echo "GNU shtool 2.0.4 (04-Feb-2006)"
exit 0
fi
if [ ".$1" = ".-r" ] || [ ".$1" = ".--recreate" ]; then
@@ -314,7 +339,7 @@
opt_d=""
opt_u=""
opt_g=""
- opt_e="CVS,\\.cvsignore,\\.[oa]\$"
+ opt_e="CVS,\\.cvsignore,\\.svn,\\.[oa]\$"
;;
subst )
str_tool="subst"
@@ -622,7 +647,7 @@
echo )
##
## echo -- Print string with optional construct expansion
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
text="$*"
@@ -921,7 +946,7 @@
##
## mdate -- Pretty-print modification time of a file or dir
## Copyright (c) 1995-1997 Free Software Foundation, Inc.
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
fod="$1"
@@ -937,11 +962,6 @@
shtool_exit 1
fi
- # prevent "date" giving response in another language
- LANG=C; export LANG
- LC_ALL=C; export LC_ALL
- LC_TIME=C; export LC_TIME
-
# GNU ls changes its time format in response to the TIME_STYLE
# variable. Since we cannot assume "unset" works, revert this
# variable to its documented default.
@@ -1054,7 +1074,7 @@
table )
##
## table -- Pretty-print a field-separated list as a table
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
if [ $opt_c -gt 4 ]; then
@@ -1119,7 +1139,7 @@
prop )
##
## prop -- Display progress with a running propeller
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
perl=''
@@ -1165,7 +1185,7 @@
move )
##
## move -- Move files with simultaneous substitution
- ## Copyright (c) 1999-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
src="$1"
@@ -1257,7 +1277,7 @@
install )
##
## install -- Install a program, script or datafile
- ## Copyright (c) 1997-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1997-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# special case: "shtool install -d <dir> [...]" internally
@@ -1420,7 +1440,7 @@
mkdir )
##
## mkdir -- Make one or more directories
- ## Copyright (c) 1996-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1996-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
errstatus=0
@@ -1508,7 +1528,7 @@
mkln )
##
## mkln -- Make link with calculation of relative paths
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# determine source(s) and destination
@@ -1659,7 +1679,7 @@
mkshadow )
##
## mkshadow -- Make a shadow tree through symbolic links
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# source and destination directory
@@ -1777,7 +1797,7 @@
fixperm )
##
## fixperm -- Fix file permissions inside a source tree
- ## Copyright (c) 1996-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1996-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
paths="$*"
@@ -1834,7 +1854,7 @@
rotate )
##
## rotate -- Logfile rotation
- ## Copyright (c) 2001-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2001-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# make sure we have at least one file to rotate
@@ -2198,7 +2218,7 @@
tarball )
##
## tarball -- Roll distribution tarballs
- ## Copyright (c) 1999-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
srcs="$*"
@@ -2362,7 +2382,7 @@
subst )
##
## subst -- Apply sed(1) substitution operations
- ## Copyright (c) 2001-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2001-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# remember optional list of file(s)
@@ -2523,7 +2543,7 @@
platform )
##
## platform -- Platform Identification Utility
- ## Copyright (c) 2003-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2003-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
# option post-processing
@@ -3071,7 +3091,7 @@
arx )
##
## arx -- Extended archive command
- ## Copyright (c) 1999-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
ar_prg="$opt_C"
@@ -3150,7 +3170,7 @@
slo )
##
## slo -- Separate linker options by library class
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
DIFS="$IFS"
@@ -3309,7 +3329,7 @@
scpp )
##
## scpp -- Sharing C Pre-Processor
- ## Copyright (c) 1999-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
srcs="$*"
@@ -3529,7 +3549,7 @@
version )
##
## version -- Maintain a version information file
- ## Copyright (c) 1994-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1994-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
file="$1"
@@ -3690,13 +3710,10 @@
# determine string out of filename
# (do NOT try to optimize this in any way because of portability)
- filestr=`echo $file |\
- tr 'abcdefghijklmnopqrstuvwxyz./%+' \
- 'ABCDEFGHIJKLMNOPQRSTUVWXYZ____' | sed -e 's/-/_/g'`
+ filestr=`echo $file | util_upper | tr './%+' '____' | sed -e
's/-/_/g'`
# generate uppercase prefix
- prefixupper=`echo $prefix |\
- tr 'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ prefixupper=`echo $prefix | util_upper`
# create the version file according the the selected language
echo "new version: ${vLong}"
@@ -3824,7 +3841,7 @@
path )
##
## path -- Deal with program paths
- ## Copyright (c) 1998-2005 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2006 Ralf S. Engelschall <[EMAIL PROTECTED]>
##
namelist="$*"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
