From d92d0513c09c3e28a4c5961c4fc5a62aaac263d8 Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 26 May 2020 08:40:40 -0400 Subject: [PATCH] Update install-sh to v1.16.2. No version bump for some reason. https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commit;h=6774c9b219cd78445964cd694588cfc4df9b8316 --- doc/RELEASE.md | 2 +- src/build/install-sh | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/RELEASE.md b/doc/RELEASE.md index cdb45b1ba..29e36edd7 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -152,7 +152,7 @@ git push origin integration These scripts are required by `src/config` and should be updated after each release, when needed. Note that these files are updated very infrequently. -Check the latest version of `automake` and see if it is > `1.16.1`: +Check the latest version of `automake` and see if it is > `1.16.2`: ``` https://git.savannah.gnu.org/gitweb/?p=automake.git ``` diff --git a/src/build/install-sh b/src/build/install-sh index 8175c640f..20d8b2eae 100755 --- a/src/build/install-sh +++ b/src/build/install-sh @@ -451,7 +451,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. #