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: 15-May-2007 21:36:32
Branch: HEAD Handle: 2007051520363200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec shtool
Log:
upgrade to newer GNU shtool snapshot which fixes "shtool mkln" and
"shtool install" commands
Summary:
Revision Changes Path
1.450 +1 -0 openpkg-src/openpkg/HISTORY
1.585 +1 -1 openpkg-src/openpkg/openpkg.spec
1.36 +15 -10 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.449 -r1.450 HISTORY
--- openpkg-src/openpkg/HISTORY 11 May 2007 13:11:30 -0000 1.449
+++ openpkg-src/openpkg/HISTORY 15 May 2007 19:36:32 -0000 1.450
@@ -2,6 +2,7 @@
2007
====
+20070514 upgrade to newer GNU shtool snapshot which fixes "shtool mkln" and
"shtool install" commands
20070511 upgrade to "openpkg" executable version 2.0.1-C, do not rise
privileges for "openpkg rpm" when given -[bt]* options
20070507 workaround PIC/DSO related problems under FreeBSD on sparc64 by
enforcing -fPIC
20070419 meticulously obey order when creating user, group, login shell
relationships
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.584 -r1.585 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 11 May 2007 13:11:30 -0000 1.584
+++ openpkg-src/openpkg/openpkg.spec 15 May 2007 19:36:32 -0000 1.585
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070511
+%define V_openpkg 20070515
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.35 -r1.36 shtool
--- openpkg-src/openpkg/shtool 29 Sep 2006 06:54:05 -0000 1.35
+++ openpkg-src/openpkg/shtool 15 May 2007 19:36:32 -0000 1.36
@@ -1375,12 +1375,12 @@
if [ ".$opt_t" = .yes ]; then
echo "cp $src $dsttmp" 1>&2
fi
- cp $src $dsttmp || shtool_exit $?
+ cp "$src" "$dsttmp" || shtool_exit $?
else
if [ ".$opt_t" = .yes ]; then
echo "mv $src $dsttmp" 1>&2
fi
- mv $src $dsttmp || shtool_exit $?
+ mv "$src" "$dsttmp" || shtool_exit $?
fi
# adjust the target file
@@ -1391,7 +1391,7 @@
do
sed="$sed -e '$e'"
done
- cp $dsttmp $dsttmp.old
+ cp "$dsttmp" "$dsttmp.old"
chmod u+w $dsttmp
eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $?
rm -f $dsttmp.old
@@ -1426,7 +1426,7 @@
quick=no
if [ ".$opt_C" = .yes ]; then
if [ -r $dst ]; then
- if cmp -s $src $dst; then
+ if cmp -s "$src" "$dst"; then
quick=yes
fi
fi
@@ -1645,12 +1645,17 @@
# determine source prefix which is the reverse directory
# step-up corresponding to the destination directory
srcpre=""
-
- isroot=0
- if [ ".$prefix" = . ] || [ ".$prefix" = ./ ]; then
- isroot=1
- fi
- if [ $oneisabs = 0 ] || [ $isroot = 0 ]; then
+ allow_relative_srcpre=no
+ if [ ".$prefix" != . ] && [ ".$prefix" != ./ ]; then
+ allow_relative_srcpre=yes
+ fi
+ if [ $oneisabs = 0 ]; then
+ allow_relative_srcpre=yes
+ fi
+ if [ ".$opt_s" != .yes ]; then
+ allow_relative_srcpre=no
+ fi
+ if [ ".$allow_relative_srcpre" = .yes ]; then
pl="$dstdir/"
OIFS="$IFS"; IFS='/'
for pe in $pl; do
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
