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: 07-May-2004 16:03:53
Branch: OPENPKG_2_0_SOLID Handle: 2004050715035100
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/openpkg HISTORY aux.prereq.sh install.sh man.sh
openpkg.boot openpkg.spec rc rpmmacros rpmpopt
rpmtool shtool
Log:
MFC: all recent changes from CURRENT except for program updates and
new platform porting
Summary:
Revision Changes Path
1.142.2.6 +16 -0 openpkg-src/openpkg/HISTORY
1.15.2.1 +52 -28 openpkg-src/openpkg/aux.prereq.sh
1.1.2.2 +1 -1 openpkg-src/openpkg/install.sh
1.1.2.3 +16 -2 openpkg-src/openpkg/man.sh
1.48.2.2 +3 -3 openpkg-src/openpkg/openpkg.boot
1.295.2.11 +6 -3 openpkg-src/openpkg/openpkg.spec
1.50.2.1 +18 -5 openpkg-src/openpkg/rc
1.59.2.2 +8 -8 openpkg-src/openpkg/rpmmacros
1.16.2.2 +3 -3 openpkg-src/openpkg/rpmpopt
1.33.2.1 +1 -1 openpkg-src/openpkg/rpmtool
1.18.2.2 +3 -3 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.142.2.5 -r1.142.2.6 HISTORY
--- openpkg-src/openpkg/HISTORY 18 Apr 2004 12:03:57 -0000 1.142.2.5
+++ openpkg-src/openpkg/HISTORY 7 May 2004 14:03:51 -0000 1.142.2.6
@@ -2,6 +2,22 @@
2004
====
+20040507 **** RELEASE AS PART OF OPENPKG 2.0.3 ***
+20040507 synchronize aux.prereq.sh platform checks with official list as of OpenPKG
2.0
+20040507 fix disk space detection in aux.prereq.sh script
+20040506 finally remove <prefix>/bin/{rpm,rpm2cpio} wrappers in preparation to
OpenPKG 2.1 (excluded in 2.0.3)
+20040505 rc: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx
checking
+20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc"
package)
+20040429 make sure <prefix>/etc/rc does not complain in cronjobs of non-privileged
setups
+20040429 port to NetBSD 1.6.2 (excluded in 2.0.3)
+20040428 fix "openpkg man" command now that OPENPKG_TOOLS_CMDPATH is not provided
+20040428 let rc point out that it searches subdirectories for unresolved file
conflicts
+20040427 fixed rpmpopt: replace hard-coded bash path and do not use reserved shell
keywords
+20040426 upgrade to cURL 7.11.2 (excluded in 2.0.3)
+20040422 backout added hack to "rpmtool cflags -O" processing because it was
incorrect (excluded in 2.0.3)
+20040421 add hack to "rpmtool cflags -O" processing because Tru64 doesn't know
plain "-O" option (excluded in 2.0.3)
+20040421 POSIX compliance: replace "head -1" with "sed -e 'q'" and "tail -1" with
"sed -n -e '$p'"
+
20040418 **** RELEASE AS PART OF OPENPKG 2.0.2 ***
20040418 port RPM to Tru64 5.1 (again) (excluded in 2.0.2)
20040418 remove left-over object files from RPM distribution tarball before building
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.15 -r1.15.2.1 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 28 Jan 2004 13:04:35 -0000 1.15
+++ openpkg-src/openpkg/aux.prereq.sh 7 May 2004 14:03:51 -0000 1.15.2.1
@@ -35,41 +35,65 @@
#
# CHECK: amount of platform support
#
-support=no
case "$platform_prod:$product_tech" in
- # platforms known to be fully supported
- *-freebsd4.[789]:* | *-freebsd5.[01]:* |\
- *-solaris2.6:* | *-solaris[89]:* |\
- *-redhat9:* | *-suse8.2:* | *-debian2.2:* | *-debian3.0:* )
- support=yes
- ;;
- # platforms which are similar and so maybe supported
- *-freebsd*:* | *-solaris*:* | *:*-linux* )
- support=maybe
- ;;
- # platforms which could be still or already support
- *-unixware*:* | *-tru64*:* | *-hpux*:* | *-darwin*:* )
- support=maybe
+ # official "forecasted" platforms
+ *-macosx*:* |\
+ *-hpux*:* |\
+ *-aix*:* |\
+ *-irix*:* )
+ support=forecasted
;;
- # platforms which are known to be not supported
+ # official "tentative" platforms
+ *-gentoo1.4.3:* |\
+ *-debian3.1:* |\
+ *-solaris10:* )
+ support=tentative
+ ;;
+ # official "supported" platforms
+ *-freebsd4.9:* |\
+ *-freebsd5.2:* |\
+ *-debian3.0:* |\
+ *-fedora1:* |\
+ *-rhel3:* |\
+ *-suse9.0:* |\
+ *-solaris[89]:* )
+ support=supported
+ ;;
+ # official "obsolete" platforms
+ *-debian2.2:* |\
+ *-rhl9:* |\
+ *-suse8.2:* |\
+ *-solaris2.6:* )
+ support=obsolete
+ ;;
+ # official "deprecated" platforms
+ *-unixware*:* |\
+ *-tru64*:* )
+ support=deprecated
+ ;;
+ # auspicious platforms
+ *-freebsd*:* |\
+ *-solaris*:* |\
+ *:*-linux* )
+ support=auspicious
+ ;;
+ # unknown platforms
*:* )
- support=no
+ support=unknown
;;
esac
case "$support" in
- yes ) support="Congratulations, definitely supported" ;;
- maybe ) support="Good luck, maybe supported" ;;
- no ) support="Sorry, not known to be supported" ;;
+ forecasted ) support="forecasted (still not known to work)" ;;
+ tentative ) support="tentative (should already work)" ;;
+ supported ) support="supported" ;;
+ obsolete ) support="obsolete (should still work)" ;;
+ deprecated ) support="deprecated (no longer known to work)" ;;
+ auspicious ) support="auspicious (expect to work)" ;;
+ unknown ) support="unknown (expect not to work)" ;;
esac
echo "++ platform product: $platform_prod"
echo "++ platform technology: $platform_tech"
-echo "++ platform support: [$support]"
-case "$support" in
- no )
- echo "ERROR: platform not supported" 1>&2
- exit 1
- ;;
-esac
+echo "++ platform support: $support"
#
# CHECK: diskspace requirement
@@ -79,12 +103,12 @@
fs_need=150000
else
fs_path="" # FIXME
- fs_need="" # FIXME
+ fs_need=0 # FIXME
fi
fs_free=""
case "$platform_tech" in
*-freebsd* | *-linux* | *-sunos* )
- fs_free=`cd $fs_path && /bin/df -k . | tail -1 | awk '{ print $4; }'`
+ fs_free=`cd $fs_path && /bin/df -k . | sed -n -e '$p' | sed -e 's;^[^ ]*;;'
-e 's; *;;' | awk '{ print $3; }'`
;;
esac
if [ ".$fs_free" != . ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 install.sh
--- openpkg-src/openpkg/install.sh 5 Apr 2004 20:01:01 -0000 1.1.2.1
+++ openpkg-src/openpkg/install.sh 7 May 2004 14:03:51 -0000 1.1.2.2
@@ -77,7 +77,7 @@
-e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.rpm.*;\\2:\\1;" \
-e
"s;^X${pkg}-\\([0-9][^-]*\\)-\\([^-][^-]*\\)\\.src\\.sh.*;\\2:\\1;" \
-e "s;^X.*;;" |\
- sort -r | head -1 |\
+ sort -r | sed -e 'q' |\
sed -e "s;^\\([^:]*\\):\\(.*\\);${pkg}-\\2-\\1;"`
if [ ".$pkg_name" != . ]; then
pkg_srpm="$url/$pkg_name.src.rpm"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/man.sh
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 man.sh
--- openpkg-src/openpkg/man.sh 5 Apr 2004 20:01:01 -0000 1.1.2.2
+++ openpkg-src/openpkg/man.sh 7 May 2004 14:03:51 -0000 1.1.2.3
@@ -40,7 +40,6 @@
exit 0
fi
if [ $# -eq 1 ]; then
- man_sect=""
man_page="$1"
elif [ $# -eq 2 ]; then
man_sect="$1"
@@ -50,11 +49,26 @@
exit 1
fi
+# determine path to commands
+openpkg_tools="${OPENPKG_TOOLS}"
+openpkg_tools_cmdpath="${OPENPKG_TOOLS_CMDPATH}"
+if [ ".${openpkg_tools}" != . -a ".${openpkg_tools_cmdpath}" = . ]; then
+ openpkg_tools_cmdpath="${openpkg_tools}/cmd:@"
+fi
+cmdpath="${prefix}/libexec/openpkg"
+if [ -d "${prefix}/libexec/openpkg-tools" ]; then
+ cmdpath="${prefix}/libexec/openpkg-tools:${cmdpath}"
+fi
+if [ ".${openpkg_tools_cmdpath}" != . ]; then
+ cmdpath=`echo "${openpkg_tools_cmdpath}" | sed -e "s;@;${cmdpath};"`
+fi
+openpkg_tools_cmdpath=`echo "${cmdpath}" | sed -e 's/::/:/g' -e 's/^://' -e
's/:$//'`
+
# search for manual page in OpenPKG Tool Chain
man_file=""
man_type=""
OIFS="$IFS"; IFS=":"
-for dir in ${OPENPKG_TOOLS_CMDPATH-"$prefix/libexec/openpkg"}; do
+for dir in ${openpkg_tools_cmdpath}; do
IFS="$OIFS"
for file in $dir/$man_page.${man_sect-"1"} $dir/$man_page.[1-9]; do
if [ -f "$file" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.48.2.1 -r1.48.2.2 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 20 Feb 2004 13:52:47 -0000 1.48.2.1
+++ openpkg-src/openpkg/openpkg.boot 7 May 2004 14:03:51 -0000 1.48.2.2
@@ -129,7 +129,7 @@
name="openpkg"
spec="$name.spec"
-version=`grep V_openpkg $spec | head -1 | awk '{ printf("%s", $3); }'`
+version=`grep V_openpkg $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
release="$version"
##
@@ -216,7 +216,7 @@
## determine distribution directory
##
-V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
+V_rpm=`grep V_rpm $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
if [ -f "../../dst/openpkg/rpm-${V_rpm}.tar.gz" ]; then
distdir="`cd ../../dst/openpkg; pwd`" # developer only
else
@@ -454,7 +454,7 @@
# use an own $HOME/.popt in order to make sure the "rpm"
# tool is able to execute its sub-tools "rpm<x>".
-V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
+V_rpm=`grep V_rpm $spec | sed -e 'q' | awk '{ printf("%s", $3); }'`
sed <$RPM_BUILD_ROOT$prefix/lib/openpkg/rpmpopt >$tmpdir/.popt \
-e
"s;^\\(rpm.*exec.*\\)\\(rpm[bdieukvq]*\\);\\1$RPM_BUILD_ROOT$prefix/lib/openpkg/\\2;"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.295.2.10 -r1.295.2.11 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 18 Apr 2004 12:03:57 -0000 1.295.2.10
+++ openpkg-src/openpkg/openpkg.spec 7 May 2004 14:03:51 -0000 1.295.2.11
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.0.2
+%define V_openpkg 2.0.3
# the used software versions
%define V_rpm 4.2.1
@@ -140,7 +140,7 @@
AutoReq: no
AutoReqProv: no
Provides: OpenPKG
-Provides: openpkg = 20040418-20040418
+Provides: openpkg = 20040507-20040507
%description
This is the bootstrap package for the RPM-based Unix Software
@@ -559,7 +559,7 @@
CC="${l_cc}" \
../bash-%{V_bash}/bash \
./configure \
- --config-cache \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--disable-nls
${l_make} || exit $?
@@ -683,6 +683,7 @@
echo "ac_cv_path___PYTHON=true"
echo "ac_cv_path___DOXYGEN=true"
echo "acl_cv_rpath=no"
+ echo "ac_cv_header_getopt_h=no"
) >config.cache
# provide platform identification
@@ -1013,6 +1014,8 @@
# install Run-Command files
sed -e "s:@l_prefix@:%{l_prefix}:g" \
+ -e "s:@l_susr@:%{l_susr}:g" \
+ -e "s:@l_musr@:%{l_musr}:g" \
<`SOURCE rc` \
>$RPM_BUILD_ROOT%{l_prefix}/etc/rc
chmod 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.50 -r1.50.2.1 rc
--- openpkg-src/openpkg/rc 28 Jan 2004 13:04:35 -0000 1.50
+++ openpkg-src/openpkg/rc 7 May 2004 14:03:51 -0000 1.50.2.1
@@ -292,13 +292,14 @@
# check for upgraded package with unresolved configuration file conflicts
if [ -d "$prefix/etc/$s_name" -a ".$eval" != .1 ]; then
- if [ ".`find $prefix/etc/$s_name -print 2>/dev/null | egrep
'.*\.rpm(new|orig|save)$'`" != . ]; then
+ if [ ".`find $prefix/etc/$s_name -type f -print 2>/dev/null | egrep -v
'.*/\.(snap|snapshot)/.*' | egrep '.*\.rpm(new|orig|save)$'`" != . ]; then
case "$cmd" in
start|restart ) type="ERROR" ;;
* ) type="WARNING" ;;
esac
echo "openpkg:rc:${type}: package \"$s_name\" has unresolved
configuration file conflicts" 1>&2
- echo "openpkg:rc:${type}: indicated by \"*.rpm(new|orig|save)\"
files in \"$prefix/etc/$s_name\"" 1>&2
+ echo "openpkg:rc:${type}: indicated by \"*.rpm(new|orig|save)\"
files in or below the" 1>&2
+ echo "openpkg:rc:${type}: directory \"$prefix/etc/$s_name\". Please
resolve first!" 1>&2
if [ ".$type" = .ERROR ]; then
continue
fi
@@ -307,7 +308,7 @@
# parse global script options
# (currently unused in OpenPKG)
- #shebangline=`head -1 $rcdir/rc.$s_name | grep "^#!rc"`
+ #shebangline=`sed -e 'q' $rcdir/rc.$s_name | grep "^#!rc"`
#if [ ".$shebangline" != . ]; then
# shebangopts=`echo "$shebangline" | sed -e "s;^#!rc *;;"`
# set -- $shebangopts;
@@ -533,8 +534,20 @@
# execute the generated script with GNU Bash
if [ ".$user" != ".$s_user" ]; then
# execute as different user
- su - $s_user -c "PATH=\"$PATH\"; $bash $tmpfile" >$outfile
2>$errfile
- rc=$?
+ if [ ".$user" = "[EMAIL PROTECTED]@" -a "[EMAIL PROTECTED]@" =
".root" ]; then
+ su - $s_user -c "PATH=\"$PATH\"; $bash $tmpfile" >$outfile
2>$errfile
+ rc=$?
+ elif [ "[EMAIL PROTECTED]@" != ".root" ]; then
+ # do not complain if we would not have any chance
+ # at all to switch the user because we are running
+ # in a non-privileged instance. Else we would just
+ # trash the mailbox of the user receiving the
+ # output of periodic run-commands.
+ rc=0
+ else
+ echo "openpkg:rc:WARNING: $prefix:$s_name:%$cmd: require root
privileges to run as user \"$s_user\"" 1>&2
+ rc=1
+ fi
else
# execute as current user
$bash $tmpfile >$outfile 2>$errfile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.59.2.1 -r1.59.2.2 rpmmacros
--- openpkg-src/openpkg/rpmmacros 5 Apr 2004 20:01:01 -0000 1.59.2.1
+++ openpkg-src/openpkg/rpmmacros 7 May 2004 14:03:51 -0000 1.59.2.2
@@ -102,26 +102,26 @@
# the *S*uper-user user/group name/id pair
%l_susr @SUSR@
%l_sgrp @SGRP@
-%l_suid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_susr}:" | head -1 | awk -F: '{ print $3; }')
-%l_sgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_sgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_suid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_susr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_sgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_sgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
# the *M*anagement user/group name/id pair
%l_musr @MUSR@
%l_mgrp @MGRP@
-%l_muid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_musr}:" | head -1 | awk -F: '{ print $3; }')
-%l_mgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_mgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_muid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_musr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_mgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_mgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
# the *R*restricted user/group name/id pair
%l_rusr @RUSR@
%l_rgrp @RGRP@
-%l_ruid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_rusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_rgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_rgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_ruid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_rusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_rgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_rgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
# the *N*on-privileged user/group name/id pair
%l_nusr @NUSR@
%l_ngrp @NGRP@
-%l_nuid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_nusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_ngid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_ngrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_nuid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_nusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_ngid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_ngrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
# backward compatibility (openpkg < 20020204)
%l_fsusr %{l_musr}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.16.2.1 -r1.16.2.2 rpmpopt
--- openpkg-src/openpkg/rpmpopt 18 Apr 2004 12:03:57 -0000 1.16.2.1
+++ openpkg-src/openpkg/rpmpopt 7 May 2004 14:03:51 -0000 1.16.2.2
@@ -86,7 +86,7 @@
# RPM extension: "rpm --test"
rpm alias --test -q --qf '%{TEST}\n' \
- --pipe "grep -v \(none\) | /openpkg-dev/lib/openpkg/bash" \
+ --pipe "grep -v \(none\) | @l_prefix@/lib/openpkg/bash" \
--POPTdesc=$"run package run-time test script (%test)"
# RPM adjustment: "rpm --setperms ..."
@@ -97,8 +97,8 @@
# RPM adjustment: "rpm --setugids ..."
rpm alias --setugids -q --qf \
- '[do %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape}
%{FILENAMES:shescape}\n]' \
- --pipe "(echo 'do () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }'; grep
-v '(none)') | @l_prefix@/lib/openpkg/bash" \
+ '[run %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape}
%{FILENAMES:shescape}\n]' \
+ --pipe "(echo 'run () { chown -- \"$1\" \"$3\"; chgrp -- \"$2\" \"$3\"; }';
grep -v '(none)') | @l_prefix@/lib/openpkg/bash" \
--POPTdesc=$"set user/group ownership of files in a package"
# RPM adjustment: improved and cleaned up "rpm -i/--info"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.33 -r1.33.2.1 rpmtool
--- openpkg-src/openpkg/rpmtool 28 Jan 2004 13:04:35 -0000 1.33
+++ openpkg-src/openpkg/rpmtool 7 May 2004 14:03:51 -0000 1.33.2.1
@@ -439,7 +439,7 @@
cflags )
tool="$1"
isgcc=no
- if [ ".`$tool --version 2>/dev/null | egrep '(2.[7-9]|3.[0-3])'`" != . ];
then
+ if [ ".`($tool -v; $tool --version) </dev/null 2>&1 | grep -i 'gcc'`" != .
]; then
isgcc=yes
fi
cflags=''
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.18.2.1 -r1.18.2.2 shtool
--- openpkg-src/openpkg/shtool 18 Apr 2004 12:03:57 -0000 1.18.2.1
+++ openpkg-src/openpkg/shtool 7 May 2004 14:03:51 -0000 1.18.2.2
@@ -2646,7 +2646,7 @@
v_kern=`echo "${UNAME_RELEASE}" |\
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/'`
v_libc=`(strings /lib/libc.so.* | grep '^GLIBC_' | sed -e 's/^GLIBC_//'
|\
- sort -n | tail -1 | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
2>/dev/null`
+ sort -n | sed -n -e '$p' | sed -e
's/^\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/') 2>/dev/null`
ST="GNU/<Linux >${v_libc}/<${v_kern}>"
if [ -f /etc/lsb-release ]; then
eval `( . /etc/lsb-release
@@ -2666,7 +2666,7 @@
[ ".${tagfile}" = .x ] && continue
[ ! -f "/etc/${tagfile}" ] && continue
n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e
's/[_-]version$//'`
- v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep
'[0-9]' | head -1 |\
+ v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep
'[0-9]' | sed -e 'q' |\
sed -e 's/^/#/' \
-e
's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
@@ -2825,7 +2825,7 @@
alpha ) AP="Alpha" ;;
esac
alpha_type=`(/usr/sbin/psrinfo -v) 2>/dev/null |\
- sed -n -e 's/^.*The alpha \([^ ][^ ]*\).*processor.*$/\1/p' | head
-n 1`
+ sed -n -e 's/^.*The alpha \([^ ][^ ]*\).*processor.*$/\1/p' | sed
-e 'q'`
AT="${AP}${alpha_type}"
AC="${AP}"
# determine system
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
