diff options
| author | seb <seb@pkgsrc.org> | 2005-04-20 17:13:28 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2005-04-20 17:13:28 +0000 |
| commit | f1b1c9b9e9511400ca15112aff5038bfb4e67577 (patch) | |
| tree | 5265a2a8ad3ac1af38d8bd1518478c9d7e2f37ae /mk/install | |
| parent | 15877bb3ea909ea01623f3ccba8e06c9d8c53fb6 (diff) | |
| download | pkgsrc-f1b1c9b9e9511400ca15112aff5038bfb4e67577.tar.gz | |
Execute chmod(1) after chown(1)/chgrp(1) so NetBSD's chown(2) does
not reset any set-user-id or set-group-id bits we may want to set.
Approved by jlam@.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/files | 10 | ||||
| -rw-r--r-- | mk/install/perms | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mk/install/files b/mk/install/files index 2e67c2d6d8f..0e94bd9a56a 100644 --- a/mk/install/files +++ b/mk/install/files @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: files,v 1.4 2005/04/10 11:01:29 jmmv Exp $ +# $NetBSD: files,v 1.5 2005/04/20 17:13:28 seb Exp $ # # +FILES - reference-counted configuration file management script # @@ -118,10 +118,6 @@ ADD) ${ECHO} " $file" ${ECHO} " [$f_eg]" ${CP} $f_eg $file - case $f_mode in - "") ;; - *) ${CHMOD} $f_mode $file ;; - esac case $f_user in "") ;; *) ${CHOWN} $f_user $file ;; @@ -130,6 +126,10 @@ ADD) "") ;; *) ${CHGRP} $f_group $file ;; esac + case $f_mode in + "") ;; + *) ${CHMOD} $f_mode $file ;; + esac fi fi done diff --git a/mk/install/perms b/mk/install/perms index 9035709fdb2..3d8e6b5b484 100644 --- a/mk/install/perms +++ b/mk/install/perms @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: perms,v 1.1 2005/02/02 10:33:01 jlam Exp $ +# $NetBSD: perms,v 1.2 2005/04/20 17:13:28 seb Exp $ # # +PERMS - special file and directory permissions management script # @@ -58,10 +58,6 @@ ${SED} -n "/^\# PERMS: /{s/^\# PERMS: //;p;}" ${SELF} | ${SORT} -u | ${ECHO} " $file (o=$f_user, g=$f_group, m=$f_mode)" ;; esac - case $f_mode in - "") ;; - *) ${CHMOD} $f_mode $file ;; - esac case $f_user in "") ;; *) ${CHOWN} $f_user $file ;; @@ -70,6 +66,10 @@ ${SED} -n "/^\# PERMS: /{s/^\# PERMS: //;p;}" ${SELF} | ${SORT} -u | "") ;; *) ${CHGRP} $f_group $file ;; esac + case $f_mode in + "") ;; + *) ${CHMOD} $f_mode $file ;; + esac done case "$printed_header" in yes) ${ECHO} "" |