[Rt-commit] rt branch, 4.2/migrator-fixes, created. rt-4.2.12-113-g40b9adb

[Shawn Moore]

The branch, 4.2/migrator-fixes has been created
        at  40b9adb822c00a7997e278e4ec4eb2157b66c2d9 (commit)

- Log -----------------------------------------------------------------
commit 38c07946928f04a7b5056a3fb64ecaabba5165ee
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Wed Feb 17 20:16:50 2016 +0000

    add AddRight calls to 4.0.1 upgrade step to prevent error message due to failure to canonicalize rights
    
    Fixes: I#31721

diff --git a/etc/upgrade/4.0.1/content b/etc/upgrade/4.0.1/content
index cc3b5f1..851c502 100644
--- a/etc/upgrade/4.0.1/content
+++ b/etc/upgrade/4.0.1/content
@@ -50,6 +50,11 @@ our @Initial = (
     sub {
         RT->Logger->debug('Removing all Delegate and PersonalGroup rights');
 
+        # this temporarily tells the system that the rights exist so it can properly canonicalize them
+        RT::System->AddRight(Admin => AdminOwnPersonalGroups  => 'Add right for 4.0.1 upgrade steps');
+        RT::System->AddRight(Admin => AdminAllPersonalGroups  => 'Add right for 4.0.1 upgrade steps');
+        RT::System->AddRight(Admin => DelegateRights          => 'Add right for 4.0.1 upgrade steps');
+
         my $acl = RT::ACL->new(RT->SystemUser);
         for my $right (qw/AdminOwnPersonalGroups AdminAllPersonalGroups DelegateRights/) {
             $acl->Limit( FIELD => 'RightName', VALUE => $right );

commit 956fa9cf097579575fbefb3f25a3c8f7e9e62144
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Feb 17 23:19:49 2016 +0000

    Update detection of find version in configure
    
    Commit 4028723 added code to detect the version of find
    because Debian is changing to a newer version of GNU
    find with different syntax than the traditional find.
    However, the change in that commit no longer worked on
    Mac OS X, a BSD-type system.
    
    Modify the find check to use the --version option supported
    on GNU and use GNU syntax if found. Otherwise default to the
    previous BSD syntax which was the previous setting for all
    systems.

diff --git a/configure.ac b/configure.ac
index 44f5384..c671138 100755
--- a/configure.ac
+++ b/configure.ac
@@ -36,21 +36,13 @@ fi
 
 dnl BSD find uses -perm +xxxx, GNU find has deprecated this syntax in favour of
 dnl -perm /xxx.
-AC_MSG_CHECKING([whether find supports -perm /x or find -perm +x])
-if find -perm /0100 -not -perm /0100
-then
-	FINDPERM="/"
-elif
-	find -perm +0100 -not -perm +0100
-then
-	FINDPERM="+"
-else
-	FINDPERM="na"
-fi
-AC_MSG_RESULT([${FINDPERM}])
-if test "x$FINDPERM" = "xna" ; then
-	AC_MSG_WARN([local find program supports neither -perm /0111 nor -perm +0111, make fixperms will not work])
-fi
+AC_MSG_CHECKING([checking version of find])
+AS_IF([find --version 2>&1 | grep 'GNU'],
+      [   FINDPERM="/"
+          AC_MSG_RESULT([configuring for GNU find]) ],
+      [   FINDPERM="+"
+          AC_MSG_RESULT([configuring for BSD find]) ])
+
 AC_SUBST([FINDPERM])
 
 dnl WEB_HANDLER

commit 864797ca30b042955cfbc1775710dcc0044c37ab
Merge: 8e5a04b 38c0794
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Mar 8 22:54:53 2016 +0000

    Merge branch '4.2/fix-upgrade-step-4.0.1' into 4.2-trunk


commit 40b9adb822c00a7997e278e4ec4eb2157b66c2d9
Merge: 864797c 956fa9c
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Mar 8 22:57:14 2016 +0000

    Merge branch '4.2/detect-find-version' into 4.2-trunk


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