[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY shtool
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:
RevisionChanges 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 - 1.309
+++ openpkg-src/openpkg/HISTORY 4 Feb 2006 19:06:58 - 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/shtool2 Oct 2005 15:18:23 - 1.31
+++ openpkg-src/openpkg/shtool4 Feb 2006 19:06:58 - 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 [] [ []
[]]"
+echo 'Usage: shtool [] [ []
[]]'
echo ''
echo 'Available global :'
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
-#
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY shtool
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: 13-May-2005 20:59:13
Branch: HEAD Handle: 2005051319591300
Modified files:
openpkg-src/openpkg HISTORY shtool
Log:
upgrade to latest CVS snapshot of GNU shtool to support IBM OS/400
PASE
Summary:
RevisionChanges Path
1.258 +1 -0 openpkg-src/openpkg/HISTORY
1.26+3 -0 openpkg-src/openpkg/shtool
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.257 -r1.258 HISTORY
--- openpkg-src/openpkg/HISTORY 13 May 2005 07:36:36 - 1.257
+++ openpkg-src/openpkg/HISTORY 13 May 2005 18:59:13 - 1.258
@@ -2,6 +2,7 @@
2005
+20050513 upgrade to latest CVS snapshot of GNU shtool to support IBM OS/400
PASE
20050513 upgrade to latest version 20050513 of GNU config.* scripts
20050405 upgrade to cURL 7.13.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
$ cvs diff -u -r1.25 -r1.26 shtool
--- openpkg-src/openpkg/shtool24 Feb 2005 19:46:18 - 1.25
+++ openpkg-src/openpkg/shtool13 May 2005 18:59:13 - 1.26
@@ -2868,6 +2868,9 @@
if [ ".`/usr/sbin/lsattr -El ${cpu_id} | grep -i powerpc`"
!= . ]; then
cpu_arch=powerpc
fi
+elif [ -d /QOpenSys ]; then
+# IBM i5/OS (aka OS/400) with PASE (Portable Application
Solutions Environment)
+cpu_arch=powerpc
fi
if [ -x /usr/bin/oslevel ]; then
os_level=`/usr/bin/oslevel`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY shtool
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: 24-Feb-2005 20:46:18
Branch: HEAD Handle: 2005022419461800
Modified files:
openpkg-src/openpkg HISTORY shtool
Log:
upgrade to GNU shtool 2.0.1
Summary:
RevisionChanges Path
1.249 +1 -0 openpkg-src/openpkg/HISTORY
1.25+19 -3 openpkg-src/openpkg/shtool
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.248 -r1.249 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Feb 2005 19:42:32 - 1.248
+++ openpkg-src/openpkg/HISTORY 24 Feb 2005 19:46:18 - 1.249
@@ -2,6 +2,7 @@
2005
+20050224 upgrade to GNU shtool 2.0.1
20050224 update aux.prereq.sh for OpenPKG 2.3's list of platforms
20050223 RELEASE AS PART OF OPENPKG 2.3.0 ***
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
$ cvs diff -u -r1.24 -r1.25 shtool
--- openpkg-src/openpkg/shtool2 Jul 2004 13:24:01 - 1.24
+++ openpkg-src/openpkg/shtool24 Feb 2005 19:46:18 - 1.25
@@ -6,7 +6,7 @@
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
-## Version: 2.0.0 (02-Jul-2004)
+## Version: 2.0.1 (11-Aug-2004)
## Contents: all available modules
##
@@ -65,7 +65,7 @@
exit 1
fi
if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
-echo "This is GNU shtool, version 2.0.0 (02-Jul-2004)"
+echo "This is GNU shtool, version 2.0.1 (11-Aug-2004)"
echo "Copyright (c) 1994-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>"
echo "Report bugs to <[EMAIL PROTECTED]>"
echo ''
@@ -132,7 +132,7 @@
exit 0
fi
if [ ".$1" = ".-v" ] || [ ".$1" = ".--version" ]; then
-echo "GNU shtool 2.0.0 (02-Jul-2004)"
+echo "GNU shtool 2.0.1 (11-Aug-2004)"
exit 0
fi
if [ ".$1" = ".-r" ] || [ ".$1" = ".--recreate" ]; then
@@ -3736,6 +3736,22 @@
echo >>$file "#endif /* _${filestr}_AS_HEADER_ */"
echo >>$file ""
;;
+m4 )
+echo >>$file "##"
+echo >>$file "## ${file} -- Version Information for ${name}
(syntax: M4)"
+echo >>$file "## [automatically generated and maintained by
GNU shtool]"
+echo >>$file "##"
+echo >>$file ""
+echo >>$file "m4_define([v_hex], [${vHex}])"
+echo >>$file "m4_define([v_short], [${vShort}])"
+echo >>$file "m4_define([v_long], [${vLong}])"
+echo >>$file "m4_define([v_tex], [${vTeX}])"
+echo >>$file "m4_define([v_gnu], [${vGNU}])"
+echo >>$file "m4_define([v_web], [${vWeb}])"
+echo >>$file "m4_define([v_sccs], [${vSCCS}])"
+echo >>$file "m4_define([v_rcs], [${vRCS}])"
+echo >>$file ""
+;;
perl )
echo >>$file "##"
echo >>$file "## ${file} -- Version Information for ${name}
(syntax: Perl)"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY shtool
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Jul-2004 15:24:02 Branch: HEAD Handle: -NONE- Modified files: openpkg-src/openpkg HISTORY shtool Log: upgrade to GNU shtool 2.0.0 Summary: RevisionChanges Path 1.195 +1 -0 openpkg-src/openpkg/HISTORY 1.24+27 -10 openpkg-src/openpkg/shtool patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.194 -r1.195 HISTORY --- openpkg-src/openpkg/HISTORY 2 Jul 2004 07:27:17 - 1.194 +++ openpkg-src/openpkg/HISTORY 2 Jul 2004 13:24:01 - 1.195 @@ -2,6 +2,7 @@ 2004 +20040702 upgrade to GNU shtool 2.0.0 20040702 update platform prerequisite checks for OpenPKG 2.1 platform set 20040701 add support for openpkg-audit package 20040609 add support for recognizing package class in old 1.3 Distribution headers during building @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/shtool $ cvs diff -u -r1.23 -r1.24 shtool --- openpkg-src/openpkg/shtool7 Jun 2004 15:17:17 - 1.23 +++ openpkg-src/openpkg/shtool2 Jul 2004 13:24:01 - 1.24 @@ -6,7 +6,7 @@ ## See http://www.gnu.org/software/shtool/ for more information. ## See ftp://ftp.gnu.org/gnu/shtool/ for latest version. ## -## Version: 2.0b3 (08-May-2004) +## Version: 2.0.0 (02-Jul-2004) ## Contents: all available modules ## @@ -65,7 +65,7 @@ exit 1 fi if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then -echo "This is GNU shtool, version 2.0b3 (08-May-2004)" +echo "This is GNU shtool, version 2.0.0 (02-Jul-2004)" echo "Copyright (c) 1994-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>" echo "Report bugs to <[EMAIL PROTECTED]>" echo '' @@ -107,9 +107,10 @@ echo ' [-c|--compress ] [-d|--directory ] [-u|--user' echo ' ] [-g|--group ] [-e|--exclude ]' echo '[ ...]' -echo ' subst[-v|--verbose] [-t|--trace] [-n|--nop] [-q|--quiet]' -echo ' [-s|--stealth] [-i|--interactive] [-b|--backup ]' -echo ' [-e|--exec ] [-f|--file ] [] [...]' +echo ' subst[-v|--verbose] [-t|--trace] [-n|--nop] [-w|--warning]' +echo ' [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup' +echo ' ] [-e|--exec ] [-f|--file ] []' +echo ' [...]' echo ' platform [-F|--format ] [-S|--sep ] [-C|--conc' echo ' ] [-L|--lower] [-U|--upper] [-v|--verbose]' echo ' [-c|--concise] [-n|--no-newline] [-t|--type ]' @@ -131,7 +132,7 @@ exit 0 fi if [ ".$1" = ".-v" ] || [ ".$1" = ".--version" ]; then -echo "GNU shtool 2.0b3 (08-May-2004)" +echo "GNU shtool 2.0.0 (02-Jul-2004)" exit 0 fi if [ ".$1" = ".-r" ] || [ ".$1" = ".--recreate" ]; then @@ -317,14 +318,15 @@ ;; subst ) str_tool="subst" -str_usage="[-v|--verbose] [-t|--trace] [-n|--nop] [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup ] [-e|--exec ] [-f|--file ] [] [...]" +str_usage="[-v|--verbose] [-t|--trace] [-n|--nop] [-w|--warning] [-q|--quiet] [-s|--stealth] [-i|--interactive] [-b|--backup ] [-e|--exec ] [-f|--file ] [] [...]" gen_tmpfile=yes arg_spec="0+" -opt_spec="v.t.n.q.s.i.b:e+f:" - opt_alias="v:verbose,t:trace,n:nop,q:quiet,s:stealth,i:interactive,b:backup,e:exec,f:file" +opt_spec="v.t.n.w.q.s.i.b:e+f:" + opt_alias="v:verbose,t:trace,n:nop,w:warning,q:quiet,s:stealth,i:interactive,b:backup,e:exec,f:file" opt_v=no opt_t=no opt_n=no +opt_w=no opt_q=no opt_s=no opt_i=no @@ -2347,6 +2349,7 @@ # remember optional list of file(s) files="$*" +files_num="$#" # parameter consistency check if [ $# -eq 0 ] && [ ".$opt_b" != . ]; then @@ -2386,6 +2389,7 @@ # apply sed(1) operation(s) if [ ".$files" != . ]; then # apply operation(s) to files +substdone=no for file in $files; do test ".$file" = . && continue if [ ! -f $file ]; then @@ -2455,7 +2459,11 @@ # optionally check whether any content change actually occurred if [ ".$op
