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: 21-Jan-2004 21:44:57
Branch: HEAD Handle: 2004012120445600
Modified files:
openpkg-src/openpkg HISTORY shtool
Log:
upgrade to latest GNU shtool snapshot for better RHL/RHEL detection
and naming
Summary:
Revision Changes Path
1.110 +1 -0 openpkg-src/openpkg/HISTORY
1.15 +41 -42 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.109 -r1.110 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Jan 2004 13:47:33 -0000 1.109
+++ openpkg-src/openpkg/HISTORY 21 Jan 2004 20:44:56 -0000 1.110
@@ -2,6 +2,7 @@
2004
====
+20040121 upgrade to latest GNU shtool snapshot for better RHL/RHEL detection and
naming
20040121 cleanup openpkg.spec by sorting SourceX headers
20040120 add OSSP uuid and companion uuid.sh frontend to provide new
<prefix>/etc/openpkg/uuid
20040120 embed %post section from openpkg.spec into bootstrap script *.src.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.14 -r1.15 shtool
--- openpkg-src/openpkg/shtool 13 Dec 2003 21:55:02 -0000 1.14
+++ openpkg-src/openpkg/shtool 21 Jan 2004 20:44:56 -0000 1.15
@@ -1,7 +1,7 @@
#!/bin/sh
##
## GNU shtool -- The GNU Portable Shell Tool
-## Copyright (c) 1994-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+## Copyright (c) 1994-2004 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.
@@ -66,7 +66,7 @@
fi
if [ ".$1" = ".-h" ] || [ ".$1" = ".--help" ]; then
echo "This is GNU shtool, version 2.0b0 (13-Dec-2003)"
- echo "Copyright (c) 1994-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>"
+ echo "Copyright (c) 1994-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>"
echo "Report bugs to <[EMAIL PROTECTED]>"
echo ''
echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
@@ -608,7 +608,7 @@
echo )
##
## echo -- Print string with optional construct expansion
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for WML as buildinfo
##
@@ -1030,7 +1030,7 @@
table )
##
## table -- Pretty-print a field-separated list as a table
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for Apache
##
@@ -1094,7 +1094,7 @@
prop )
##
## prop -- Display progress with a running propeller
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for mod_ssl
##
@@ -1139,7 +1139,7 @@
move )
##
## move -- Move files with simultaneous substitution
- ## Copyright (c) 1999-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for shtool
##
@@ -1231,7 +1231,7 @@
install )
##
## install -- Install a program, script or datafile
- ## Copyright (c) 1997-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1997-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for shtool
##
@@ -1393,7 +1393,7 @@
mkdir )
##
## mkdir -- Make one or more directories
- ## Copyright (c) 1996-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1996-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for public domain by Noah Friedman <[EMAIL PROTECTED]>
## Cleaned up and enhanced for shtool
##
@@ -1482,7 +1482,7 @@
mkln )
##
## mkln -- Make link with calculation of relative paths
- ## Copyright (c) 1999-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for shtool
##
@@ -1632,7 +1632,7 @@
mkshadow )
##
## mkshadow -- Make a shadow tree through symbolic links
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for Apache
##
@@ -1749,7 +1749,7 @@
fixperm )
##
## fixperm -- Fix file permissions inside a source tree
- ## Copyright (c) 1996-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1996-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for ePerl
##
@@ -1805,7 +1805,7 @@
rotate )
##
## rotate -- Logfile rotation
- ## Copyright (c) 2001-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2001-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for use in OpenPKG
##
@@ -2168,7 +2168,7 @@
tarball )
##
## tarball -- Roll distribution tarballs
- ## Copyright (c) 1999-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for shtool
##
@@ -2331,7 +2331,7 @@
subst )
##
## subst -- Apply sed(1) substitution operations
- ## Copyright (c) 2001-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2001-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for OpenPKG's rpmtool
##
@@ -2469,7 +2469,7 @@
platform )
##
## platform -- Platform Identification Utility
- ## Copyright (c) 2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 2003-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for use in OpenPKG
##
@@ -2662,29 +2662,28 @@
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
-e 's/^#.*$//'`
- t=""
- if [ ".${n}" = .redhat ]; then
- t=`head -1 /etc/${tagfile} | \
- sed -e 's/^/#/' \
- -e 's/^#.*Red Hat Enterprise Linux
\([AEW]S\).*$/\1/' \
- -e 's/^#.*$//'`
- fi
case "`util_lower ${n}`" in
- debian ) n="Debian[ GNU/Linux]" ;;
- fedora ) n="Fedora[ GNU/Linux]" ;;
- redhat ) n="RedHat[ Linux]" ;;
- suse ) n="SuSE[ Linux]" ;;
- mandrake ) n="Mandrake[ Linux]" ;;
- gentoo ) n="Gentoo[ Linux]" ;;
- slackware ) n="Slackware[ Linux]" ;;
- turbolinux ) n="TurboLinux" ;;
- unitedlinux ) n="UnitedLinux" ;;
- * ) n="${n}[ GNU/Linux]" ;;
+ redhat )
+ if [ ".`grep 'Red Hat Enterprise Linux'
/etc/${tagfile}`" != . ]; then
+ n="<R>ed <H>at <E>nterprise <L>inux"
+ else
+ n="<R>ed <H>at <L>inux"
+ fi
+ ;;
+ debian ) n="Debian[ GNU/Linux]" ;;
+ fedora ) n="<Fedora> Core[ GNU/Linux]" ;;
+ suse ) n="SuSE[ Linux]" ;;
+ mandrake ) n="Mandrake[ Linux]" ;;
+ gentoo ) n="Gentoo[ GNU/Linux]" ;;
+ slackware ) n="Slackware[ Linux]" ;;
+ turbolinux ) n="TurboLinux" ;;
+ unitedlinux ) n="UnitedLinux" ;;
+ * ) n="${n}[ GNU/Linux]" ;;
+ esac
+ case "$n" in
+ *"<"*">"* ) SP="$n <$v>" ;;
+ * ) SP="$n $v" ;;
esac
- if [ ".${t}" != . ]; then
- n="${n} ${t}"
- fi
- SP="$n $v"
break
done
fi
@@ -2952,7 +2951,7 @@
val_C=`echo ":$val" | \
sed -e 's/^://' \
-e 's;\[\([^]]*\)\];;g' \
- -e 's;[^<]*<\([^>]*\)>;\1;g' \
+ -e 's;[^<]*<\([^>]*\)>[^<]*;\1;g' \
-e "s; ;§§;g" \
-e "s;/;%%;g" \
-e "s;§§;${opt_S};g" \
@@ -3012,7 +3011,7 @@
arx )
##
## arx -- Extended archive command
- ## Copyright (c) 1999-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for shtool
##
@@ -3090,7 +3089,7 @@
slo )
##
## slo -- Separate linker options by library class
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for Apache
##
@@ -3248,7 +3247,7 @@
scpp )
##
## scpp -- Sharing C Pre-Processor
- ## Copyright (c) 1999-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1999-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for GNU Pth
##
@@ -3467,7 +3466,7 @@
version )
##
## version -- Maintain a version information file
- ## Copyright (c) 1994-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1994-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for ePerl, rewritten from scratch for shtool
##
@@ -3745,7 +3744,7 @@
path )
##
## path -- Deal with program paths
- ## Copyright (c) 1998-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+ ## Copyright (c) 1998-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>
## Originally written for Apache
##
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
