Index: ossp-pkg/shtool/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v rcsdiff -q -kk '-r1.186' '-r1.187' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null --- ChangeLog 2003/05/09 09:50:13 1.186 +++ ChangeLog 2003/05/16 08:46:26 1.187 @@ -11,6 +11,10 @@ Changes between 1.6.2 and 2.0b0 (02-Nov-2002 to xx-May-2003): + *) When patching a file with "shtool subst" try to make it + writeable first in case it has permissions set differently. + [Ralf S. Engelschall ] + *) Fix calculation of effective source path in "shtool mkln" command for destination paths containing "/./" sequence and for source paths consisting of no directory parts at all. Index: ossp-pkg/shtool/sh.subst RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.subst,v rcsdiff -q -kk '-r1.7' '-r1.8' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.subst,v' 2>/dev/null --- sh.subst 2003/02/11 13:00:50 1.7 +++ sh.subst 2003/05/16 08:46:26 1.8 @@ -124,10 +124,12 @@ fi if [ ".$opt_t" = .yes ]; then echo "\$ cp -p $file $file$orig" + echo "\$ chmod u+w $file" echo "\$ $sedcmd <$file$orig >$file" fi if [ ".$opt_n" = .no ]; then cp -p $file $file$orig + chmod u+w $file >/dev/null 2>&1 || true eval "$sedcmd <$file$orig >$file" fi