From 615e48fffc99801ea28c87e72fc628f91f506f17 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Tue, 5 Oct 2021 20:18:07 -0400
Subject: [PATCH 1/5] Update gam-install.sh

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

diff --git a/src/gam-install.sh b/src/gam-install.sh
index d9dff00f..e5039d13 100755
--- a/src/gam-install.sh
+++ b/src/gam-install.sh
@@ -28,7 +28,7 @@ upgrade_only=false
 gamversion="latest"
 adminuser=""
 regularuser=""
-gam_glibc_vers="2.31 2.27 2.23"
+gam_glibc_vers="2.31 2.27"
 #gam_macos_vers="10.15.6 10.14.6 10.13.6"
 
 while getopts "hd:a:o:b:lp:u:r:v:" OPTION

From 32ccf414ea31668f4f009d5e00555fa476ddadf3 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 6 Oct 2021 08:01:29 -0400
Subject: [PATCH 2/5] Update gam-install.sh

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

diff --git a/src/gam-install.sh b/src/gam-install.sh
index e5039d13..4ffeeec3 100755
--- a/src/gam-install.sh
+++ b/src/gam-install.sh
@@ -128,7 +128,7 @@ case $gamos in
       this_macos_ver=$osversion
     fi
     echo "You are running MacOS $this_macos_ver"
-    gamfile="macos-x86_64.tar.xz"
+    gamfile="macos-universal2.tar.xz"
     ;;
   MINGW64_NT*)
     gamos="windows"

From 4db3bc409b98830e33d7311523d82de949d889ba Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Wed, 6 Oct 2021 11:22:27 -0700
Subject: [PATCH 3/5] Document member restrictions; fix print users (#1430)

* Document member restrictions

* Fix gam print users allfields custom all to include primaryEmail

If you really want everything say: gam print users full
---
 src/GamCommands.txt | 9 +++++++--
 src/gam/__init__.py | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index e8b7197c..ad8fbd1e 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -222,8 +222,10 @@ If an item contains spaces, it should be surrounded by ".
 <QueryContact> ::= <String> See: https://developers.google.com/google-apps/contacts/v3/reference#contacts-query-parameters-reference
 <QueryCrOS> ::= <String> See: https://support.google.com/chrome/a/answer/1698333?hl=en
 <QueryDriveFile> ::= <String> See: https://developers.google.com/drive/v2/web/search-parameters
+<QueryDynamicGroup> ::= <String> See: https://cloud.google.com/identity/docs/reference/rest/v1beta1/groups#dynamicgroupquery
 <QueryGmail> ::= <String> See: https://support.google.com/mail/answer/7190
 <QueryGroup> ::= <String> See: https://developers.google.com/admin-sdk/directory/v1/guides/search-groups
+<QueryMemberRestrictions> ::= <String> See: https://cloud.google.com/identity/docs/reference/rest/v1beta1/SecuritySettings#MemberRestriction
 <QueryMobile> ::= <String> See: https://support.google.com/a/answer/7549103
 <QueryTeamDrive> ::= <String> See: https://developers.google.com/drive/api/v3/search-shareddrives
 <QueryUser> ::= <String> See: https://developers.google.com/admin-sdk/directory/v1/guides/search-users
@@ -1384,18 +1386,21 @@ gam print printermodels [todrive] [filter <String>]
 
 gam create cigroup <EmailAddress> <CIGroupAttribute>*
 	[makeowner] [alias|aliases <AliasList>] [dynamic <QueryDynamicGroup>]
-gam update cigroup <GroupItem> [email <EmailAddress>] <CIGroupAttribute>* [security]
+gam update cigroup <GroupItem> [email <EmailAddress>] <CIGroupAttribute>*
+	[security] [dynamic <QueryDynamicGroup>]
+	[memberrestrictions <QueryMemberRestrictions>]
 gam update cigroup <GroupItem> add [owner|manager|member] [notsuspended|suspended] [expires never|<Time>] <UserTypeEntity>
 gam update cigroup <GroupItem> delete|remove [owner|manager|member] [notsuspended|suspended] <UserTypeEntity>
 gam update cigroup <GroupItem> sync [owner|manager|member] [notsuspended|suspended] [expires never|<Time>] <UserTypeEntity>
 gam update cigroup <GroupItem> update [owner|manager|member] [notsuspended|suspended] [expires never|<Time>] <UserTypeEntity>
 gam update cigroup <GroupItem> clear [member] [manager] [owner] [notsuspended|suspended]
 gam delete cigroup <GroupItem>
-gam info cigroup <GroupItem> [nousers] [nojoindate] [showupdatedate] [membertree]
+gam info cigroup <GroupItem> [nousers] [nojoindate] [showupdatedate] [membertree] [nosecurity|nosecuritysettings]
 
 gam print cigroups [todrive]
 	[enterprisemember <UserItem>]
 	[members|memberscount] [managers|managerscount] [owners|ownerscount]
+	[memberrestrictions]
 	[delimiter <Character>] [sortheaders]
 
 gam info cimember <UserItem> <GroupItem>
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 41c7476a..99a601d9 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -9680,6 +9680,8 @@ def doPrintUsers():
             sortHeaders = True
             i += 1
         elif myarg in ['custom', 'schemas']:
+            if not fieldsList:
+                fieldsList = ['primaryEmail']
             fieldsList.append('customSchemas')
             if sys.argv[i + 1].lower() == 'all':
                 projection = 'full'

From 75e2bf5a9aa5558fb294a30a9f7f97326184c67e Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Thu, 14 Oct 2021 19:22:57 -0400
Subject: [PATCH 4/5] Update build.yml

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 353b3334..9262f101 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,13 +12,13 @@ defaults:
     working-directory: src
 
 env:
-  BUILD_PYTHON_VERSION: "3.9.7"
-  MIN_PYTHON_VERSION: "3.9.7"
+  BUILD_PYTHON_VERSION: "3.10.0"
+  MIN_PYTHON_VERSION: "3.10.0"
   BUILD_OPENSSL_VERSION: "1.1.1l"
   MIN_OPENSSL_VERSION: "1.1.1l"
   PATCHELF_VERSION: "0.13"
   # PYINSTALLER_VERSION can be full commit hash or version like v4.20
-  PYINSTALLER_VERSION: "ae7ed8ed044f210288b27f0c84ad670ff573822b"
+  PYINSTALLER_VERSION: "1e6a8d53f150cf24b574c32085f3745cbd2afaa6"
 
 jobs:
   build:
@@ -92,7 +92,7 @@ jobs:
           path: |
             ~/python
             ~/ssl
-          key: ${{ matrix.os }}-${{ matrix.jid }}-20211004
+          key: ${{ matrix.os }}-${{ matrix.jid }}-20211014
 
       - name: Set env variables
         env:

From af169672579a5083d2f33af50936b0f053ce2c52 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Thu, 14 Oct 2021 17:12:51 -0700
Subject: [PATCH 5/5] Fix Row Filtering (#1433)

When multiple filter expressions are defined:
GAM_CSV_ROW_FILTER - should match only if all expressions match
GAM_CSV_ROW_DROP_FILTER - should match if any expression matches

Currently, the opposite is true
---
 src/gam/display.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gam/display.py b/src/gam/display.py
index 055ffac2..b5026f12 100644
--- a/src/gam/display.py
+++ b/src/gam/display.py
@@ -158,25 +158,25 @@ def write_csv_file(csvRows, titles, list_type, todrive):
         for c, filterVal in iter(filters.items()):
             for column in columns[c]:
                 if filterVal[1] == 'regex':
-                    if filterVal[2].search(str(row.get(column, ''))):
-                        return True
-                elif filterVal[1] == 'notregex':
                     if not filterVal[2].search(str(row.get(column, ''))):
-                        return True
+                        return False
+                elif filterVal[1] == 'notregex':
+                    if filterVal[2].search(str(row.get(column, ''))):
+                        return False
                 elif filterVal[1] in ['date', 'time']:
-                    if rowDateTimeFilterMatch(
+                    if not rowDateTimeFilterMatch(
                         filterVal[1] == 'date', row.get(column, ''),
                         filterVal[2], filterVal[3]):
-                        return True
+                        return False
                 elif filterVal[1] == 'count':
-                    if rowCountFilterMatch(
+                    if not rowCountFilterMatch(
                         row.get(column, 0), filterVal[2], filterVal[3]):
-                        return True
+                        return False
                 else:  #boolean
-                    if rowBooleanFilterMatch(
+                    if not rowBooleanFilterMatch(
                         row.get(column, False), filterVal[2]):
-                        return True
-        return False
+                        return False
+        return True
 
     if GC_Values[GC_CSV_ROW_FILTER] or GC_Values[GC_CSV_ROW_DROP_FILTER]:
         if GC_Values[GC_CSV_ROW_FILTER]: