[pkgsrc/trunk]: pkgsrc/mk/install Execute chmod(1) after chown(1)/chgrp(1) so...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dc783f7836c
branches:  trunk
changeset: 492868:4dc783f7836c
user:      seb <seb%pkgsrc.org@localhost>
date:      Wed Apr 20 17:13:28 2005 +0000

description:
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:

 mk/install/files |  10 +++++-----
 mk/install/perms |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r 9d2c51f68896 -r 4dc783f7836c mk/install/files
--- a/mk/install/files  Wed Apr 20 16:36:46 2005 +0000
+++ b/mk/install/files  Wed Apr 20 17:13:28 2005 +0000
@@ -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 @@
                                ${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 @@
                                "")     ;;
                                *)      ${CHGRP} $f_group $file ;;
                                esac
+                               case $f_mode in
+                               "")     ;;
+                               *)      ${CHMOD} $f_mode $file ;;
+                               esac
                        fi
                fi
        done
diff -r 9d2c51f68896 -r 4dc783f7836c mk/install/perms
--- a/mk/install/perms  Wed Apr 20 16:36:46 2005 +0000
+++ b/mk/install/perms  Wed Apr 20 17:13:28 2005 +0000
@@ -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 @@
                ${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 @@
        "")     ;;
        *)      ${CHGRP} $f_group $file ;;
        esac
+       case $f_mode in
+       "")     ;;
+       *)      ${CHMOD} $f_mode $file ;;
+       esac
 done
 case "$printed_header" in
 yes)   ${ECHO} ""