From 368701afb1e28b989583a8489639c3a93b519259 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 15:33:58 -0400
Subject: [PATCH 01/17] Update build.yml

---
 .github/workflows/build.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7c6c226..3c18d86f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,8 +12,8 @@ defaults:
     working-directory: src
 
 env:
-  BUILD_PYTHON_VERSION: "3.9.5"
-  MIN_PYTHON_VERSION: "3.9.5"
+  BUILD_PYTHON_VERSION: "3.9.6"
+  MIN_PYTHON_VERSION: "3.9.6"
   BUILD_OPENSSL_VERSION: "1.1.1k"
   MIN_OPENSSL_VERSION: "1.1.1k"
   PATCHELF_VERSION: "0.12"
@@ -41,11 +41,6 @@ jobs:
             goal: "build"
             gamos: "linux"
             platform: "x86_64"
-          - os: macos-10.15
-            jid: 4
-            goal: "build"
-            gamos: "macos"
-            platform: "x86_64"
           - os: macos-11.0
             jid: 12
             goal: "build"

From 400b4af769512e8c124b180d5d8fd4414256e4ca Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 15:35:40 -0400
Subject: [PATCH 02/17] Update macos-before-install.sh

---
 .github/actions/macos-before-install.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/actions/macos-before-install.sh b/.github/actions/macos-before-install.sh
index b1529b28..32b57658 100755
--- a/.github/actions/macos-before-install.sh
+++ b/.github/actions/macos-before-install.sh
@@ -22,11 +22,7 @@ cd ~
 
 # Use official Python.org version of Python which is backwards compatible
 # with older MacOS versions
-if [ "$PLATFORM" == "x86_64" ]; then
-  export pyfile=python-$BUILD_PYTHON_VERSION-macosx10.9.pkg
-else
-  export pyfile=python-$BUILD_PYTHON_VERSION-macos11.pkg
-fi
+export pyfile=python-$BUILD_PYTHON_VERSION-macos11.pkg
 
 wget https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$pyfile
 echo "installing Python $BUILD_PYTHON_VERSION..."

From 98e87d0297d59ac20b8e8d7dfffaacba5c8aa94c Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 15:38:04 -0400
Subject: [PATCH 03/17] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c18d86f..0b7b7447 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ env:
   MIN_OPENSSL_VERSION: "1.1.1k"
   PATCHELF_VERSION: "0.12"
   # PYINSTALLER_VERSION can be full commit hash or version like v4.20
-  PYINSTALLER_VERSION: "000275e409640320cdd995a7f077abfdece86749"
+  PYINSTALLER_VERSION: "0f2b2e921433ab5a510c7efdb21d9c1d7cfbc645"
 
 jobs:
   build:

From 53d8ecb6bc47cd98ba9d9f63f8435a608997043a Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 15:39:47 -0400
Subject: [PATCH 04/17] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0b7b7447..fab0e63e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
           path: |
             ~/python
             ~/ssl
-          key: ${{ matrix.os }}-${{ matrix.jid }}-20210611
+          key: ${{ matrix.os }}-${{ matrix.jid }}-20210628
 
       - name: Set env variables
         env:

From cd42d54b4335c83db4787e67350101039e159990 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 28 Jun 2021 12:40:22 -0700
Subject: [PATCH 05/17] Fix typo, document new drive fields (#1389)

* Fix typo, document new drive fields

* Document new drive attribute
---
 src/GamCommands.txt | 4 ++++
 src/gam/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 79671371..ba23b885 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -333,6 +333,7 @@ If an item contains spaces, it should be surrounded by ".
 	lastmodifyinguser|
 	lastmodifyingusername|
 	lastviewedbyme|lastviewedbymedate|lastviewedbymetime|lastviewedbyuser|
+	linksharemetadata|
 	md5|md5checksum|md5sum|
 	mime|mimetype|
 	modifiedbyme|modifiedbymedate|modifiedbymetime|modifiedbyuser|
@@ -345,6 +346,7 @@ If an item contains spaces, it should be surrounded by ".
 	parents|
 	permissions|
 	quotabytesused|quotaused|
+	resourcekey|
 	restricted|
 	shareable|
 	shared|
@@ -695,6 +697,7 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	copyrequireswriterpermission|
 	(lastviewedbyme <Time>)|(modifieddate|modifiedtime <Time>)|(description <String>)|(mimetype <MimeType>)|
 	(parentid <DriveFolderID>)|(parentname <DriveFolderName>)|(anyownerparentname <DriveFolderName>)|writerscantshare|writerscanshare
+	(securityupdate <Boolean>)|
 	(shortcut <DriveFileID>)
 <DriveFileUpdateAttribute> ::=
 	(localfile <FileName>|-)|
@@ -705,6 +708,7 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	(copyrequireswriterpermission <Boolean>)|
 	(lastviewedbyme <Time>)|(modifieddate <Time>)|(description <String>)|(mimetype <MimeType>)|
 	(parentid <DriveFolderID>)|(parentname <DriveFolderName>)|(anyownerparentname <DriveFolderName>)|writerscantshare|writerscanshare
+	(securityupdate <Boolean>)|
 	(shortcut <DriveFileID>)
 <GroupSettingsAttribute> ::=
 	(allowexternalmembers <Boolean>)|
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index a590b2f3..559c05b8 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -3721,7 +3721,7 @@ def getDriveFileAttribute(i, body, parameters, myarg, update=False):
         i += 2
     elif myarg == 'securityupdate':
         body['linkShareMetadata'] = {'securityUpdateEnabled': getBoolean(
-            sys.argv[i+1], f'gam <users> {operation} drivefile'), 'securityUpdateElibible': True}
+            sys.argv[i+1], f'gam <users> {operation} drivefile'), 'securityUpdateEligible': True}
         i += 2
     else:
         controlflow.invalid_argument_exit(

From d24925cd5fe3f0d76875804df3560615c3b297af Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:30:55 -0400
Subject: [PATCH 06/17] Update build.yml

---
 .github/workflows/build.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fab0e63e..13b7c279 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,6 @@ jobs:
             jid: 5
             goal: "build"
             gamos: "windows"
-            python: 3.9.5 
             pyarch: "x64" 
             platform: "x86_64"
           - os: windows-2019
@@ -58,7 +57,6 @@ jobs:
             goal: "build"
             gamos: "windows"
             platform: "x86"
-            python: 3.9.5
             pyarch: "x86"
           - os: ubuntu-20.04
             goal: "test"
@@ -114,13 +112,28 @@ jobs:
           echo "PLATFORM=${PLATFORM}" >> $GITHUB_ENV
           uname -a
 
-      - name: Use pre-compiled Python for testing and Windows
+      - name: Use pre-compiled Python for testing
         if: matrix.python != ''
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.pyarch }}
 
+      - name: Install Python on Windows
+        if: matrix.os == 'windows-2019'
+        run: |
+          if ( $PLATFORM -eq "x86_64" )
+            Set-Variable -name py_arch -value "-amd64"
+          }
+          else
+          {
+            Set-Variable -name py_arch -value ""
+          }
+          Set-Variable -name python_file -value "python-${BUILD_PYTHON_VERSION}${py_arch}.exe"
+          Set-Variable -name python_url -value "https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file"
+          Invoke-WebRequest -Uri $python_url -OutFile $python_file
+          Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python"
+  
       - name: Set env variables for pre-compiled Python
         if: matrix.goal == 'test'
         run: |

From 40daf38f8018f21779540fe7578d0fdbc5843be2 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:32:41 -0400
Subject: [PATCH 07/17] Update build.yml

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 13b7c279..96b7d2c4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -123,6 +123,7 @@ jobs:
         if: matrix.os == 'windows-2019'
         run: |
           if ( $PLATFORM -eq "x86_64" )
+          {
             Set-Variable -name py_arch -value "-amd64"
           }
           else

From 280301f25808ca008d121bb92f274e3894efa8a5 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:36:04 -0400
Subject: [PATCH 08/17] Update build.yml

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96b7d2c4..d7928b2d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -134,6 +134,7 @@ jobs:
           Set-Variable -name python_url -value "https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file"
           Invoke-WebRequest -Uri $python_url -OutFile $python_file
           Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python"
+        shell: pwsh
   
       - name: Set env variables for pre-compiled Python
         if: matrix.goal == 'test'

From 7ffc97d301281631fdbf3a4a3020d7d899e9caf2 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:40:43 -0400
Subject: [PATCH 09/17] Update build.yml

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7928b2d..ca3ba94d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -130,8 +130,11 @@ jobs:
           {
             Set-Variable -name py_arch -value ""
           }
+          Write-Output "py_arch: $py_arch"
           Set-Variable -name python_file -value "python-${BUILD_PYTHON_VERSION}${py_arch}.exe"
+          Write-Output "python_file: $python_file"
           Set-Variable -name python_url -value "https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file"
+          Write-Output "python_url: $python_url"
           Invoke-WebRequest -Uri $python_url -OutFile $python_file
           Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python"
         shell: pwsh

From 93b38b9f95e3a8c40e96891326a3929c66284075 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:44:40 -0400
Subject: [PATCH 10/17] Update build.yml

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca3ba94d..934c5059 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Install Python on Windows
         if: matrix.os == 'windows-2019'
         run: |
-          if ( $PLATFORM -eq "x86_64" )
+          if ( ${Env:PLATFORM} -eq "x86_64" )
           {
             Set-Variable -name py_arch -value "-amd64"
           }
@@ -131,9 +131,9 @@ jobs:
             Set-Variable -name py_arch -value ""
           }
           Write-Output "py_arch: $py_arch"
-          Set-Variable -name python_file -value "python-${BUILD_PYTHON_VERSION}${py_arch}.exe"
+          Set-Variable -name python_file -value "python-${Env:BUILD_PYTHON_VERSION}${py_arch}.exe"
           Write-Output "python_file: $python_file"
-          Set-Variable -name python_url -value "https://www.python.org/ftp/python/$BUILD_PYTHON_VERSION/$python_file"
+          Set-Variable -name python_url -value "https://www.python.org/ftp/python/${Env:BUILD_PYTHON_VERSION}/${python_file}"
           Write-Output "python_url: $python_url"
           Invoke-WebRequest -Uri $python_url -OutFile $python_file
           Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python"

From 7c1f06fdf7861fd547a03c06aa1cd0e8aa6ad90e Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 16:57:11 -0400
Subject: [PATCH 11/17] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 934c5059..70597ca6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
           Set-Variable -name python_url -value "https://www.python.org/ftp/python/${Env:BUILD_PYTHON_VERSION}/${python_file}"
           Write-Output "python_url: $python_url"
           Invoke-WebRequest -Uri $python_url -OutFile $python_file
-          Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python"
+          Start-Process -wait -FilePath $python_file -ArgumentList "/quiet","InstallAllUsers=1","TargetDir=c:\\python","AssociateFiles=1","PrependPath=1"
         shell: pwsh
   
       - name: Set env variables for pre-compiled Python

From fb08991c05ddc3c96792d160dd08834e1318bd09 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 17:06:47 -0400
Subject: [PATCH 12/17] Update windows-before-install.sh

---
 .github/actions/windows-before-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/windows-before-install.sh b/.github/actions/windows-before-install.sh
index 21ade2f1..5e48824c 100755
--- a/.github/actions/windows-before-install.sh
+++ b/.github/actions/windows-before-install.sh
@@ -13,8 +13,8 @@ echo "This is a ${BITS}-bit build for ${PLATFORM}"
 export mypath=$(pwd)
 cd ~
 
-export python="python"
-export pip="pip"
+export python="c:\python\python.exe"
+export pip="c:\python\scripts\pip.exe"
 
 # pyscard needs swig, keep these two together
 choco install $CHOCOPTIONS swig

From bd8274cc27d038cff5f0598def932fba5d6f9feb Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 17:13:42 -0400
Subject: [PATCH 13/17] Update windows-install.sh

---
 .github/actions/windows-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/windows-install.sh b/.github/actions/windows-install.sh
index 2af2ab8d..e34f2834 100755
--- a/.github/actions/windows-install.sh
+++ b/.github/actions/windows-install.sh
@@ -9,7 +9,7 @@ export gampath="${distpath}gam"
 rm -rf $gampath
 #mkdir -p $gampath
 #export gampath=$(readlink -e $gampath)
-pyinstaller --clean --noupx --distpath $gampath gam.spec
+$python -m pyinstaller --clean --noupx --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version

From a1540079276e495046db77b36f24df28e7c9c972 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 17:22:57 -0400
Subject: [PATCH 14/17] Update windows-install.sh

---
 .github/actions/windows-install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/actions/windows-install.sh b/.github/actions/windows-install.sh
index e34f2834..f6921ab6 100755
--- a/.github/actions/windows-install.sh
+++ b/.github/actions/windows-install.sh
@@ -7,9 +7,7 @@ echo "compiling GAM with pyinstaller..."
 export distpath="dist/"
 export gampath="${distpath}gam"
 rm -rf $gampath
-#mkdir -p $gampath
-#export gampath=$(readlink -e $gampath)
-$python -m pyinstaller --clean --noupx --distpath $gampath gam.spec
+c:\python\scripts\pyinstaller --clean --noupx --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version

From 80d17cfda381dfb78ba20b42e1098b653a4b043e Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 28 Jun 2021 17:28:10 -0400
Subject: [PATCH 15/17] Update windows-install.sh

---
 .github/actions/windows-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/windows-install.sh b/.github/actions/windows-install.sh
index f6921ab6..4620bcd1 100755
--- a/.github/actions/windows-install.sh
+++ b/.github/actions/windows-install.sh
@@ -7,7 +7,7 @@ echo "compiling GAM with pyinstaller..."
 export distpath="dist/"
 export gampath="${distpath}gam"
 rm -rf $gampath
-c:\python\scripts\pyinstaller --clean --noupx --distpath $gampath gam.spec
+/c/python/scripts/pyinstaller --clean --noupx --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version

From 1c78ebd20e06918ce1614b39a1351d853067c6c6 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 28 Jun 2021 18:34:50 -0700
Subject: [PATCH 16/17] Add groupidfllert <String> to gam report
 <ActivityApplicationName> (#1390)

---
 src/GamCommands.txt     | 1 +
 src/gam/gapi/reports.py | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index ba23b885..572ae18e 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -959,6 +959,7 @@ gam report <ActivityApplicationName> [todrive]
 	[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)]
 	[start <Time>] [end <Time>]
 	[filter|filters <String>] [event <String>] [ip <String>]
+	[groupidfilter <String>]
 
 gam create admin <UserItem> <RoleItem> customer|(org_unit <OrgUnitItem>)
 gam delete admin <RoleAssignmentId>
diff --git a/src/gam/gapi/reports.py b/src/gam/gapi/reports.py
index febd319a..bc0c3051 100644
--- a/src/gam/gapi/reports.py
+++ b/src/gam/gapi/reports.py
@@ -285,7 +285,7 @@ def showReport():
     customerId = GC_Values[GC_CUSTOMER_ID]
     if customerId == MY_CUSTOMER:
         customerId = None
-    filters = parameters = actorIpAddress = startTime = endTime = eventName = orgUnitId = None
+    filters = parameters = actorIpAddress = groupIdFilter = startTime = endTime = eventName = orgUnitId = None
     tryDate = datetime.date.today().strftime(YYYYMMDD_FORMAT)
     to_drive = False
     userKey = 'all'
@@ -330,6 +330,9 @@ def showReport():
         elif myarg == 'ip':
             actorIpAddress = sys.argv[i + 1]
             i += 2
+        elif myarg == 'groupidfilter':
+            groupIdFilter = sys.argv[i + 1]
+            i += 2
         elif myarg == 'todrive':
             to_drive = True
             i += 1
@@ -489,7 +492,8 @@ def showReport():
                                         endTime=endTime,
                                         eventName=eventName,
                                         filters=filters,
-                                        orgUnitID=orgUnitId)
+                                        orgUnitID=orgUnitId,
+                                        groupIdFilter=groupIdFilter)
         if activities:
             titles = ['name']
             csvRows = []

From 4630bf5681c283d3857eda4fb4716150ea880b44 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 29 Jun 2021 08:13:59 -0400
Subject: [PATCH 17/17] Update var.py

---
 src/gam/var.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gam/var.py b/src/gam/var.py
index df45cdd7..ff792b96 100644
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -8,7 +8,7 @@ import platform
 import re
 
 GAM_AUTHOR = 'Jay Lee <jay0lee@gmail.com>'
-GAM_VERSION = '6.06'
+GAM_VERSION = '6.07'
 GAM_LICENSE = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'