[pkgsrc/pkgsrc-2005Q1]: pkgsrc/mk/install Pullup ticket 470 - requested by St...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/413075a56778
branches:  pkgsrc-2005Q1
changeset: 490994:413075a56778
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Apr 30 04:45:47 2005 +0000

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

diffstat:

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

diffs (66 lines):

diff -r 4717a23a1cc7 -r 413075a56778 mk/install/files
--- a/mk/install/files  Wed Apr 27 02:54:09 2005 +0000
+++ b/mk/install/files  Sat Apr 30 04:45:47 2005 +0000
@@ -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 @@
                                ${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 4717a23a1cc7 -r 413075a56778 mk/install/perms
--- a/mk/install/perms  Wed Apr 27 02:54:09 2005 +0000
+++ b/mk/install/perms  Sat Apr 30 04:45:47 2005 +0000
@@ -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 @@
                ${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} ""