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 openpkg-web Date: 05-Oct-2003 12:59:50
Branch: HEAD Handle: 2003100511594802
Modified files:
openpkg-src/openpkg HISTORY aux.wrapsrc.sh openpkg.spec
openpkg-web news.txt
Log:
check availability of unpacking tools in .src.sh script
Summary:
Revision Changes Path
1.62 +1 -0 openpkg-src/openpkg/HISTORY
1.9 +33 -0 openpkg-src/openpkg/aux.wrapsrc.sh
1.225 +1 -1 openpkg-src/openpkg/openpkg.spec
1.6856 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.61 -r1.62 HISTORY
--- openpkg-src/openpkg/HISTORY 29 Sep 2003 13:04:17 -0000 1.61
+++ openpkg-src/openpkg/HISTORY 5 Oct 2003 10:59:50 -0000 1.62
@@ -2,6 +2,7 @@
2003
====
+20031005 check availability of unpacking tools in .src.sh script
20030929 upgrade to latest OSSP platform script to recognize even more platforms
20030928 add partial UnixWare 7.1.x support to bootstrap; add IRIX, UnixWare and
QNX support to "platform"
20030927 make %{error:<msg>} really stop SPEC processing
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapsrc.sh
============================================================================
$ cvs diff -u -r1.8 -r1.9 aux.wrapsrc.sh
--- openpkg-src/openpkg/aux.wrapsrc.sh 29 Jul 2003 10:19:38 -0000 1.8
+++ openpkg-src/openpkg/aux.wrapsrc.sh 5 Oct 2003 10:59:50 -0000 1.9
@@ -34,6 +34,31 @@
export LC_CTYPE
umask 022
+# make sure all essential unpacking tools are available
+# (the build tools are checked later from within openpkg.spec)
+for tool in /bin/sh uudecode mkdir cat tar rm chown chgrp sed; do
+ found=0
+ case $tool in
+ /* )
+ if [ -f $tool ]; then
+ found=1
+ fi
+ ;;
+ * )
+ for p in `IFS=:; echo $PATH`; do
+ if [ -f "$p/$tool" ]; then
+ found=1
+ break
+ fi
+ done
+ ;;
+ esac
+ if [ $found -eq 0 ]; then
+ echo "$me: unable to find bootstrap tool \"$tool\"" 1>&2
+ exit 1
+ fi
+done
+
# pre-parse command line options
help=0
prefix=''
@@ -79,6 +104,10 @@
# extract the tarball
echo "$me: extracting to $dir..."
uudecode $me || exit 1
+if [ ! -f $tgz ]; then
+ echo "$me: failed to uudecode \"$me\" into tarball \"$tgz\"" 1>&2
+ exit 1
+fi
rm -rf $dir >/dev/null 2>&1
mkdir $dir || exit 1
cat $tgz | (cd $dir; tar x${v}f - 2>/dev/null)
@@ -87,6 +116,10 @@
chown -R -h $cusr . >/dev/null 2>&1 || true
chgrp -R -h $cgrp . >/dev/null 2>&1 || true
) || exit 1
+fi
+if [ ! -f $dir/openpkg.boot ]; then
+ echo "$me: failed to unpack tarball \"$tgz\" into directory \"$dir\"" 1>&2
+ exit 1
fi
echo "$me: extraction done."
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.224 -r1.225 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 29 Sep 2003 13:04:17 -0000 1.224
+++ openpkg-src/openpkg/openpkg.spec 5 Oct 2003 10:59:50 -0000 1.225
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030929
+%define V_openpkg 20031005
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6855 -r1.6856 news.txt
--- openpkg-web/news.txt 4 Oct 2003 18:25:46 -0000 1.6855
+++ openpkg-web/news.txt 5 Oct 2003 10:59:48 -0000 1.6856
@@ -1,3 +1,4 @@
+05-Oct-2003: Upgraded package: P<openpkg-20031005-20031005>
04-Oct-2003: Upgraded package: P<gnutls-0.8.11-20031004>
04-Oct-2003: Upgraded package: P<scribus-1.1.1-20031004>
04-Oct-2003: Upgraded package: P<mplayer-1.0pre1-20031004>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
