diff options
| author | salo <salo@pkgsrc.org> | 2005-04-30 04:45:47 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-04-30 04:45:47 +0000 |
| commit | a81942293eb78b0746890d1ed945f0df428410ac (patch) | |
| tree | f90ebd692405d6777f053f1cbe739719e848f990 | |
| parent | 982cdc6c2cb6151da6cf84fedb0135febc44b259 (diff) | |
| download | pkgsrc-a81942293eb78b0746890d1ed945f0df428410ac.tar.gz | |
Pullup ticket 470 - requested by Stoned Elipot
permissions fix for install framework
Revisions pulled up:
- pkgsrc/mk/install/files 1.5
- pkgsrc/mk/install/perms 1.2
Module Name: pkgsrc
Committed By: seb
Date: Wed Apr 20 17:13:28 UTC 2005
Modified Files:
pkgsrc/mk/install: files perms
Log Message:
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@.
| -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 f9cd46b404a..5bbb89b1bf0 100644 --- a/mk/install/files +++ b/mk/install/files @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: files,v 1.3 2005/02/14 16:31:41 tv Exp $ +# $NetBSD: files,v 1.3.2.1 2005/04/30 04:45:47 salo 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..969b1131952 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.1.4.1 2005/04/30 04:45:47 salo 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} "" |