[Cmake-commits] CMake branch, next, updated. v2.8.7-2386-ga6f603d

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a6f603dd9d3ea52c43605bd00fc586078c9d46b8 (commit)
       via  c4a0bcea775981dea86d527f66161c98f5e05e95 (commit)
      from  92727b505c2da8faa95fc869fb9d8b5700c88f5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6f603dd9d3ea52c43605bd00fc586078c9d46b8
commit a6f603dd9d3ea52c43605bd00fc586078c9d46b8
Merge: 92727b5 c4a0bce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 08:23:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 08:23:10 2012 -0500

    Merge topic 'nsis-user-perm-issue-12923' into next
    
    c4a0bce CPack: Fix NSIS handling of privileged users (#12923)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c4a0bcea775981dea86d527f66161c98f5e05e95
commit c4a0bcea775981dea86d527f66161c98f5e05e95
Author:     Mattias Helsing <helsing72 at gmail.com>
AuthorDate: Wed Feb 1 08:15:44 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 1 08:18:49 2012 -0500

    CPack: Fix NSIS handling of privileged users (#12923)
    
    When using the NSIS generator from CPack the file NSIS.template.in is
    used to generate a project.nsi file for NSIS to process.  The file
    consists code in the NSIS scripting language.  Among other functions
    there is an onInit function the initializes the installer.  The function
    (tries to) recognise admin and power users but fails since NSIS
    scripting language relative includes the jump from the current command
    so +3 means "run the third command after this one", so a failed check
    for admin completely skips the check for a power user and goes directly
    to "done:".
    
    User permission lookup was added in initial NSIS support by commit
    a11b9a4c (Merge from CPack branch, 2006-01-01).  Later commit b1b052fd
    (Several changes to for NSIS, 2006-03-01) added a line inside a block
    that should be skipped by a jump without updating the jump length.
    Update the jump length to correct the behavior.

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 6259a5b..819cc5c 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -922,12 +922,12 @@ Function .onInit
   Pop $0
   UserInfo::GetAccountType
   Pop $1
-  StrCmp $1 "Admin" 0 +3
+  StrCmp $1 "Admin" 0 +4
     SetShellVarContext all
     ;MessageBox MB_OK 'User "$0" is in the Admin group'
     StrCpy $SV_ALLUSERS "AllUsers"
     Goto done
-  StrCmp $1 "Power" 0 +3
+  StrCmp $1 "Power" 0 +4
     SetShellVarContext all
     ;MessageBox MB_OK 'User "$0" is in the Power Users group'
     StrCpy $SV_ALLUSERS "AllUsers"

-----------------------------------------------------------------------

Summary of changes:
 Modules/NSIS.template.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake