Update py-gsutil to 4.68. Now Python 3 only.

Release 4.68 (release date: 2021-09-14)
=======================================
Bug Fixes
------------------
- Improve content type inference for some common extensions.
- Copy Content-Encoding from first object in compose command.
- Support generation querying for ls command.

Other Changes
------------------
- Add a message encouraging py3 upgrade.
- Update mock library version.
- Several documentation updates and clarifications.

Release 4.67 (release date: 2021-08-16)
=======================================
Bug Fixes
------------------
- Update pyu2f to latest version to fix a security key reauth bug

Other Changes
------------------
 - Several documentation updates and clarifications.

Release 4.66 (release date: 2021-07-29)
=======================================
New Features
------------------
 - Onboard mTLS support with AIP-4114 for gsutil

Other Changes
------------------
 - Several documentation updates and clarifications.

Release 4.65 (release date: 2021-07-02)
=======================================
New Features
------------------
 - Add gsutil support for Public Access Prevention

Bug Fixes
------------------
 - Fix raising-bad-type yapf errors.

Other Changes
------------------
 - Link fix pointing to CGC docs again .
 - Backfill some small doc changes
 - Small text tweak
 - Update CHECKSUM and VERSION for 4.64 release.
 - Update CHANGES.md for 4.64 release.
 - Delete encryption addhelp page
 - Putting cl/381035251 into github
 - Backfill cl/381932961

Release 4.64 (release date: 2021-06-18)
=======================================
Bug Fixes
------------------
 - None

Other Changes
------------------
 - Link fix pointing to CGC docs.

Release 4.63 (release date: 2021-06-09)
=======================================
Bug Fixes
------------------
 - Update warning text on KMS access denied
 - Make ** to represent zero or more folders for cloud urls
 - Raise error if final destination path ends with a delimiter.

Other Changes
------------------
 - Fix flaky test for rm using preconditions
 - Fix pyenv issue for macOS
 - Fix rewrite tests
 - Remove unused progress callback.
 - Several documentation updates and clarifications.

Release 4.62 (release date: 2021-05-13)
=======================================
New Features
------------------
 - Add ignore-existing option for rsync .
 - Show satisifiesPZS info in bucket info listing (ls -Lb).
 - Support composite uploads with KMS.
 - Enforce custom endpoints through multipart copies and complex downloads.

Bug Fixes
------------------
 - rm will continue on object 404s.
 - Update boto submodule to include a fix for integrity checks with KMS.
 - iam ch is now case-insensitive for public members and member types.
 - Support skipping integrity checks in daisy chain transfers.
 - Ensure the correct content-length is provided for incomplete downloads.
 - Fix daisy chain for windows.
 - Fix stats crashing because of nanosecs in custom-time.
 - Delete connections after fork.
 - Patch md5 import for compliance on Red Hat FIPS mode distributions.
 - Handle case where there are too many slashes after CloudUrl scheme.
 - Allow specifying object generations in compose.
 - Raise error in setmeta if no headers are provided.
 - Fix encoding issue for rfc822 messages.
 - Fix StreamExhausted Error handling for Resumable uploads.
 - Fix wildcard ** bug.
 - Fix alignment of ls -l output.
 - Fix newlines around lists.

Other Changes
------------------
 - Fix sonatype errors.
 - gslib: boto\_util: implement a HasUserSpecifiedGsHost() helper.
 - Adding warning to rsync if streams or named paths are included in a folder.
 - Improve parallelism warnings.
 - Several documentation updates and clarifications.

Release 4.61 (release date: 2021-04-06)
=======================================
Bug Fixes
------------------
 - Update to RSA v4.5.
 - CopyHelper accepts kms check bypass.

Other Changes
------------------
 - Doc updates.

Release 4.60 (release date: 2021-03-11)
=======================================
Bug Fixes
------------------
 - Fixed proxy connections when using the GCS XML API.
 - Improve reliability when multiple instances of gsutil transfer to the same destination.

Other Changes
------------------
 - Remove TravisCI and update "check for CI" references to use GitHub CI.
 - Several documentation updates and clarifications.

Release 4.59 (release date: 2021-02-10)
======================================
New Features
------------------
 - Add ignore-existing option for rsync .
 - Show satisifiesPZS info in bucket info listing (ls -Lb) .

Bug Fixes
------------------
 - Register integration test failures in kokoro script .

Other Changes
------------------
 - Use respectful code .
 - Several documentation updates and clarifications.

Release 4.58 (release date: 2021-01-21)
======================================
Bug Fixes
------------------
 - Fix more occurrences of encodestring/decodestring
 - Ignore the .github directory for updates
 - Make signurl use generation information.
 - Fix UnicodeEncodeError in Python2 for help metadata command
 - Open files in non-append mode to make stripe functionality work in Lustre file systems
 - Persist request reason header for resumable uploads and downloads.
 - improve upload speed significantly when it runs on Windows
 - Add perf-trace-token support for resumable uploads.
 - Improve error message when a bucket's name collides with another.
 - Fix formatting for empty CORS JSON document

Other Changes
------------------
 - Several documentation updates and clarifications.
 - Add CI checks for Python 3.8

 Release 4.57 (release date: 2020-12-08)
======================================
Bug Fixes
------------------
 - Remove Unicode character from config command that was causing Python 2 issues.
 - Sync docs with web.

Release 4.56 (release date: 2020-12-03)
======================================
New Features
------------------
 - mTLS/DCA Authentication
 - Add GitHub Actions CI

Bug Fixes
------------------
 - Delete the projects.py help topic
 - Format fix for cp.py

Release 4.55 (release date: 2020-11-12)
======================================
Bug Fixes
------------------
 - Prevent trailing spaces in json output of iam get
 - Fix deprecation warnings due to invalid escape sequences.
 - Use is_alive in favour of isAlive for Python 3.9 compatibility.
 - Fix for base64.{encode/decode}string in python 3.9

Other Changes
------------------
 - Several documentation updates and clarifications.

Release 4.54 (release date: 2020-10-22)
======================================
New Features
------------------
 - Add userProject support to signurl

Bug Fixes
------------------
 - Explicitly set multiprocessing start method to 'fork'
 - Headers can now be removed
 - Fix CommandException.informational attribute error
 - Fix broken signurl error message.

Other Changes
------------------
 - Warn when disabling parallel composite uploads for KMS encryption.
 - Handle SAML reauth challenge.
 - Several documentation updates and clarifications.

4 files changed, 70 insertions, 115 deletions

diff --git a/net/py-gsutil/Makefile b/net/py-gsutil/Makefile
index c499c39567d..6ee5f86ada2 100644
--- a/net/py-gsutil/Makefile
+++ b/net/py-gsutil/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2020/10/16 07:41:10 bsiegert Exp $
+# $NetBSD: Makefile,v 1.14 2021/09/19 12:49:42 bsiegert Exp $
 
-DISTNAME=	gsutil-4.53
+DISTNAME=	gsutil-4.68
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/gsutil/}
@@ -22,15 +22,15 @@ DEPENDS+=	${PYPKGPREFIX}-argcomplete>=1.9.4:../../devel/py-argcomplete
 DEPENDS+=	${PYPKGPREFIX}-crcmod>=1.7:../../security/py-crcmod
 DEPENDS+=	${PYPKGPREFIX}-fasteners>=0.14.1:../../devel/py-fasteners
 DEPENDS+=	${PYPKGPREFIX}-gcs-oauth2-boto-plugin>=2.7:../../net/py-gcs-oauth2-boto-plugin
-DEPENDS+=	${PYPKGPREFIX}-google-apitools>=0.5.30:../../www/py-google-apitools
+DEPENDS+=	${PYPKGPREFIX}-google-apitools>=0.5.32:../../www/py-google-apitools
 DEPENDS+=	${PYPKGPREFIX}-google-reauth>=0.1.0:../../security/py-google-reauth
 DEPENDS+=	${PYPKGPREFIX}-httplib2>=0.18:../../www/py-httplib2
-DEPENDS+=	${PYPKGPREFIX}-mock>=2.0.0:../../devel/py-mock
 DEPENDS+=	${PYPKGPREFIX}-monotonic>=1.4:../../time/py-monotonic
 DEPENDS+=	${PYPKGPREFIX}-retry_decorator>=1.0.0:../../devel/py-retry_decorator
 DEPENDS+=	${PYPKGPREFIX}-six>=1.12.0:../../lang/py-six
 
 USE_LANGUAGES=	# none
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 CHECK_INTERPRETER_SKIP+=	${PYSITELIB}/gslib/vendored/oauth2client/scripts/build_docs.sh
 CHECK_INTERPRETER_SKIP+=	${PYSITELIB}/gslib/vendored/oauth2client/scripts/install.sh
diff --git a/net/py-gsutil/PLIST b/net/py-gsutil/PLIST
index 70658522204..7e06816f2a5 100644
--- a/net/py-gsutil/PLIST
+++ b/net/py-gsutil/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/07/14 17:52:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/09/19 12:49:42 bsiegert Exp $
 bin/gsutil-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -22,12 +22,6 @@ ${PYSITELIB}/gslib/addlhelp/__init__.pyo
 ${PYSITELIB}/gslib/addlhelp/acls.py
 ${PYSITELIB}/gslib/addlhelp/acls.pyc
 ${PYSITELIB}/gslib/addlhelp/acls.pyo
-${PYSITELIB}/gslib/addlhelp/anon.py
-${PYSITELIB}/gslib/addlhelp/anon.pyc
-${PYSITELIB}/gslib/addlhelp/anon.pyo
-${PYSITELIB}/gslib/addlhelp/apis.py
-${PYSITELIB}/gslib/addlhelp/apis.pyc
-${PYSITELIB}/gslib/addlhelp/apis.pyo
 ${PYSITELIB}/gslib/addlhelp/command_opts.py
 ${PYSITELIB}/gslib/addlhelp/command_opts.pyc
 ${PYSITELIB}/gslib/addlhelp/command_opts.pyo
@@ -43,9 +37,6 @@ ${PYSITELIB}/gslib/addlhelp/dev.pyo
 ${PYSITELIB}/gslib/addlhelp/encoding.py
 ${PYSITELIB}/gslib/addlhelp/encoding.pyc
 ${PYSITELIB}/gslib/addlhelp/encoding.pyo
-${PYSITELIB}/gslib/addlhelp/encryption.py
-${PYSITELIB}/gslib/addlhelp/encryption.pyc
-${PYSITELIB}/gslib/addlhelp/encryption.pyo
 ${PYSITELIB}/gslib/addlhelp/metadata.py
 ${PYSITELIB}/gslib/addlhelp/metadata.pyc
 ${PYSITELIB}/gslib/addlhelp/metadata.pyo
@@ -55,24 +46,12 @@ ${PYSITELIB}/gslib/addlhelp/naming.pyo
 ${PYSITELIB}/gslib/addlhelp/prod.py
 ${PYSITELIB}/gslib/addlhelp/prod.pyc
 ${PYSITELIB}/gslib/addlhelp/prod.pyo
-${PYSITELIB}/gslib/addlhelp/projects.py
-${PYSITELIB}/gslib/addlhelp/projects.pyc
-${PYSITELIB}/gslib/addlhelp/projects.pyo
-${PYSITELIB}/gslib/addlhelp/retries.py
-${PYSITELIB}/gslib/addlhelp/retries.pyc
-${PYSITELIB}/gslib/addlhelp/retries.pyo
 ${PYSITELIB}/gslib/addlhelp/security.py
 ${PYSITELIB}/gslib/addlhelp/security.pyc
 ${PYSITELIB}/gslib/addlhelp/security.pyo
-${PYSITELIB}/gslib/addlhelp/subdirs.py
-${PYSITELIB}/gslib/addlhelp/subdirs.pyc
-${PYSITELIB}/gslib/addlhelp/subdirs.pyo
 ${PYSITELIB}/gslib/addlhelp/support.py
 ${PYSITELIB}/gslib/addlhelp/support.pyc
 ${PYSITELIB}/gslib/addlhelp/support.pyo
-${PYSITELIB}/gslib/addlhelp/throttling.py
-${PYSITELIB}/gslib/addlhelp/throttling.pyc
-${PYSITELIB}/gslib/addlhelp/throttling.pyo
 ${PYSITELIB}/gslib/addlhelp/versions.py
 ${PYSITELIB}/gslib/addlhelp/versions.pyc
 ${PYSITELIB}/gslib/addlhelp/versions.pyo
@@ -172,6 +151,9 @@ ${PYSITELIB}/gslib/commands/mv.pyo
 ${PYSITELIB}/gslib/commands/notification.py
 ${PYSITELIB}/gslib/commands/notification.pyc
 ${PYSITELIB}/gslib/commands/notification.pyo
+${PYSITELIB}/gslib/commands/pap.py
+${PYSITELIB}/gslib/commands/pap.pyc
+${PYSITELIB}/gslib/commands/pap.pyo
 ${PYSITELIB}/gslib/commands/perfdiag.py
 ${PYSITELIB}/gslib/commands/perfdiag.pyc
 ${PYSITELIB}/gslib/commands/perfdiag.pyo
@@ -217,6 +199,9 @@ ${PYSITELIB}/gslib/commands/versioning.pyo
 ${PYSITELIB}/gslib/commands/web.py
 ${PYSITELIB}/gslib/commands/web.pyc
 ${PYSITELIB}/gslib/commands/web.pyo
+${PYSITELIB}/gslib/context_config.py
+${PYSITELIB}/gslib/context_config.pyc
+${PYSITELIB}/gslib/context_config.pyo
 ${PYSITELIB}/gslib/cred_types.py
 ${PYSITELIB}/gslib/cred_types.pyc
 ${PYSITELIB}/gslib/cred_types.pyo
@@ -335,6 +320,9 @@ ${PYSITELIB}/gslib/tests/test_Doption.pyo
 ${PYSITELIB}/gslib/tests/test_acl.py
 ${PYSITELIB}/gslib/tests/test_acl.pyc
 ${PYSITELIB}/gslib/tests/test_acl.pyo
+${PYSITELIB}/gslib/tests/test_boto_util.py
+${PYSITELIB}/gslib/tests/test_boto_util.pyc
+${PYSITELIB}/gslib/tests/test_boto_util.pyo
 ${PYSITELIB}/gslib/tests/test_bucketconfig.py
 ${PYSITELIB}/gslib/tests/test_bucketconfig.pyc
 ${PYSITELIB}/gslib/tests/test_bucketconfig.pyo
@@ -344,12 +332,18 @@ ${PYSITELIB}/gslib/tests/test_bucketpolicyonly.pyo
 ${PYSITELIB}/gslib/tests/test_cat.py
 ${PYSITELIB}/gslib/tests/test_cat.pyc
 ${PYSITELIB}/gslib/tests/test_cat.pyo
+${PYSITELIB}/gslib/tests/test_cloud_api_delegator.py
+${PYSITELIB}/gslib/tests/test_cloud_api_delegator.pyc
+${PYSITELIB}/gslib/tests/test_cloud_api_delegator.pyo
 ${PYSITELIB}/gslib/tests/test_command_runner.py
 ${PYSITELIB}/gslib/tests/test_command_runner.pyc
 ${PYSITELIB}/gslib/tests/test_command_runner.pyo
 ${PYSITELIB}/gslib/tests/test_compose.py
 ${PYSITELIB}/gslib/tests/test_compose.pyc
 ${PYSITELIB}/gslib/tests/test_compose.pyo
+${PYSITELIB}/gslib/tests/test_context_config.py
+${PYSITELIB}/gslib/tests/test_context_config.pyc
+${PYSITELIB}/gslib/tests/test_context_config.pyo
 ${PYSITELIB}/gslib/tests/test_copy_helper_funcs.py
 ${PYSITELIB}/gslib/tests/test_copy_helper_funcs.pyc
 ${PYSITELIB}/gslib/tests/test_copy_helper_funcs.pyo
@@ -386,9 +380,15 @@ ${PYSITELIB}/gslib/tests/test_du.pyo
 ${PYSITELIB}/gslib/tests/test_encryption_helper.py
 ${PYSITELIB}/gslib/tests/test_encryption_helper.pyc
 ${PYSITELIB}/gslib/tests/test_encryption_helper.pyo
+${PYSITELIB}/gslib/tests/test_execution_util.py
+${PYSITELIB}/gslib/tests/test_execution_util.pyc
+${PYSITELIB}/gslib/tests/test_execution_util.pyo
 ${PYSITELIB}/gslib/tests/test_file_part.py
 ${PYSITELIB}/gslib/tests/test_file_part.pyc
 ${PYSITELIB}/gslib/tests/test_file_part.pyo
+${PYSITELIB}/gslib/tests/test_gcs_json_api.py
+${PYSITELIB}/gslib/tests/test_gcs_json_api.pyc
+${PYSITELIB}/gslib/tests/test_gcs_json_api.pyo
 ${PYSITELIB}/gslib/tests/test_gcs_json_media.py
 ${PYSITELIB}/gslib/tests/test_gcs_json_media.pyc
 ${PYSITELIB}/gslib/tests/test_gcs_json_media.pyo
@@ -431,6 +431,9 @@ ${PYSITELIB}/gslib/tests/test_mb.pyo
 ${PYSITELIB}/gslib/tests/test_metrics.py
 ${PYSITELIB}/gslib/tests/test_metrics.pyc
 ${PYSITELIB}/gslib/tests/test_metrics.pyo
+${PYSITELIB}/gslib/tests/test_mtls.py
+${PYSITELIB}/gslib/tests/test_mtls.pyc
+${PYSITELIB}/gslib/tests/test_mtls.pyo
 ${PYSITELIB}/gslib/tests/test_mv.py
 ${PYSITELIB}/gslib/tests/test_mv.pyc
 ${PYSITELIB}/gslib/tests/test_mv.pyo
@@ -443,6 +446,9 @@ ${PYSITELIB}/gslib/tests/test_notification.pyo
 ${PYSITELIB}/gslib/tests/test_notification_pubsub.py
 ${PYSITELIB}/gslib/tests/test_notification_pubsub.pyc
 ${PYSITELIB}/gslib/tests/test_notification_pubsub.pyo
+${PYSITELIB}/gslib/tests/test_pap.py
+${PYSITELIB}/gslib/tests/test_pap.pyc
+${PYSITELIB}/gslib/tests/test_pap.pyo
 ${PYSITELIB}/gslib/tests/test_parallel_cp.py
 ${PYSITELIB}/gslib/tests/test_parallel_cp.pyc
 ${PYSITELIB}/gslib/tests/test_parallel_cp.pyo
@@ -455,6 +461,9 @@ ${PYSITELIB}/gslib/tests/test_perfdiag.pyo
 ${PYSITELIB}/gslib/tests/test_plurality_checkable_iterator.py
 ${PYSITELIB}/gslib/tests/test_plurality_checkable_iterator.pyc
 ${PYSITELIB}/gslib/tests/test_plurality_checkable_iterator.pyo
+${PYSITELIB}/gslib/tests/test_psc.py
+${PYSITELIB}/gslib/tests/test_psc.pyc
+${PYSITELIB}/gslib/tests/test_psc.pyo
 ${PYSITELIB}/gslib/tests/test_rb.py
 ${PYSITELIB}/gslib/tests/test_rb.pyc
 ${PYSITELIB}/gslib/tests/test_rb.pyo
@@ -494,12 +503,21 @@ ${PYSITELIB}/gslib/tests/test_signurl.pyo
 ${PYSITELIB}/gslib/tests/test_stat.py
 ${PYSITELIB}/gslib/tests/test_stat.pyc
 ${PYSITELIB}/gslib/tests/test_stat.pyo
+${PYSITELIB}/gslib/tests/test_stet_cp.py
+${PYSITELIB}/gslib/tests/test_stet_cp.pyc
+${PYSITELIB}/gslib/tests/test_stet_cp.pyo
+${PYSITELIB}/gslib/tests/test_stet_util.py
+${PYSITELIB}/gslib/tests/test_stet_util.pyc
+${PYSITELIB}/gslib/tests/test_stet_util.pyo
 ${PYSITELIB}/gslib/tests/test_storage_url.py
 ${PYSITELIB}/gslib/tests/test_storage_url.pyc
 ${PYSITELIB}/gslib/tests/test_storage_url.pyo
 ${PYSITELIB}/gslib/tests/test_tabcomplete.py
 ${PYSITELIB}/gslib/tests/test_tabcomplete.pyc
 ${PYSITELIB}/gslib/tests/test_tabcomplete.pyo
+${PYSITELIB}/gslib/tests/test_temporary_file_util.py
+${PYSITELIB}/gslib/tests/test_temporary_file_util.pyc
+${PYSITELIB}/gslib/tests/test_temporary_file_util.pyo
 ${PYSITELIB}/gslib/tests/test_trace.py
 ${PYSITELIB}/gslib/tests/test_trace.pyc
 ${PYSITELIB}/gslib/tests/test_trace.pyo
@@ -629,6 +647,9 @@ ${PYSITELIB}/gslib/utils/copy_helper.pyo
 ${PYSITELIB}/gslib/utils/encryption_helper.py
 ${PYSITELIB}/gslib/utils/encryption_helper.pyc
 ${PYSITELIB}/gslib/utils/encryption_helper.pyo
+${PYSITELIB}/gslib/utils/execution_util.py
+${PYSITELIB}/gslib/utils/execution_util.pyc
+${PYSITELIB}/gslib/utils/execution_util.pyo
 ${PYSITELIB}/gslib/utils/hashing_helper.py
 ${PYSITELIB}/gslib/utils/hashing_helper.pyc
 ${PYSITELIB}/gslib/utils/hashing_helper.pyo
@@ -659,9 +680,15 @@ ${PYSITELIB}/gslib/utils/rsync_util.pyo
 ${PYSITELIB}/gslib/utils/signurl_helper.py
 ${PYSITELIB}/gslib/utils/signurl_helper.pyc
 ${PYSITELIB}/gslib/utils/signurl_helper.pyo
+${PYSITELIB}/gslib/utils/stet_util.py
+${PYSITELIB}/gslib/utils/stet_util.pyc
+${PYSITELIB}/gslib/utils/stet_util.pyo
 ${PYSITELIB}/gslib/utils/system_util.py
 ${PYSITELIB}/gslib/utils/system_util.pyc
 ${PYSITELIB}/gslib/utils/system_util.pyo
+${PYSITELIB}/gslib/utils/temporary_file_util.py
+${PYSITELIB}/gslib/utils/temporary_file_util.pyc
+${PYSITELIB}/gslib/utils/temporary_file_util.pyo
 ${PYSITELIB}/gslib/utils/text_util.py
 ${PYSITELIB}/gslib/utils/text_util.pyc
 ${PYSITELIB}/gslib/utils/text_util.pyo
@@ -1826,7 +1853,6 @@ ${PYSITELIB}/gslib/vendored/boto/boto/vpc/vpngateway.pyc
 ${PYSITELIB}/gslib/vendored/boto/boto/vpc/vpngateway.pyo
 ${PYSITELIB}/gslib/vendored/boto/pylintrc
 ${PYSITELIB}/gslib/vendored/boto/requirements-docs.txt
-${PYSITELIB}/gslib/vendored/boto/requirements-py26.txt
 ${PYSITELIB}/gslib/vendored/boto/requirements-py33.txt
 ${PYSITELIB}/gslib/vendored/boto/requirements.txt
 ${PYSITELIB}/gslib/vendored/boto/setup.cfg
@@ -1840,14 +1866,10 @@ ${PYSITELIB}/gslib/vendored/boto/tests/compat.py
 ${PYSITELIB}/gslib/vendored/boto/tests/compat.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/compat.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_lists.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/db/test_lists.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/db/test_lists.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_password.py
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_password.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_password.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_query.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/db/test_query.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/db/test_query.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_sequence.py
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_sequence.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/db/test_sequence.pyo
@@ -1855,14 +1877,12 @@ ${PYSITELIB}/gslib/vendored/boto/tests/devpay/__init__.py
 ${PYSITELIB}/gslib/vendored/boto/tests/devpay/__init__.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/devpay/__init__.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/devpay/test_s3.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/devpay/test_s3.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/devpay/test_s3.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/devpay/test_s3.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/devpay/test_s3.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/__init__.py
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/__init__.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/__init__.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/test.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/fps/test.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/fps/test.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/test_verify_signature.py
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/test_verify_signature.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/fps/test_verify_signature.pyo
@@ -2099,8 +2119,8 @@ ${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/testcase.py
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/testcase.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/testcase.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/util.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/util.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/util.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/util.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/integration/gs/util.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/iam/__init__.py
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/iam/__init__.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/iam/__init__.pyo
@@ -2156,11 +2176,11 @@ ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_cert_verification.py
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_cert_verification.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_cert_verification.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_db_subnet_group.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_promote_modify.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_promote_modify.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_promote_modify.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_promote_modify.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/integration/rds/test_promote_modify.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds2/__init__.py
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds2/__init__.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/integration/rds2/__init__.pyo
@@ -2337,8 +2357,8 @@ ${PYSITELIB}/gslib/vendored/boto/tests/mturk/all_tests.py
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/all_tests.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/all_tests.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/cleanup_tests.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/mturk/cleanup_tests.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/mturk/cleanup_tests.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/mturk/cleanup_tests.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/mturk/cleanup_tests.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/common.py
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/common.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/common.pyo
@@ -2353,8 +2373,8 @@ ${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_test.py
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_test.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_test.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_with_qualifications.py
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_with_qualifications.pyc
-${PLIST.py2x}${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_with_qualifications.pyo
+${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_with_qualifications.pyc
+${PYSITELIB}/gslib/vendored/boto/tests/mturk/create_hit_with_qualifications.pyo
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/hit_persistence.py
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/hit_persistence.pyc
 ${PYSITELIB}/gslib/vendored/boto/tests/mturk/hit_persistence.pyo
@@ -3016,55 +3036,6 @@ ${PYSITELIB}/gslib/vendored/oauth2client/oauth2client/transport.pyo
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/call_compute_service.py
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/call_compute_service.pyc
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/call_compute_service.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/README.md
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/manage.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/manage.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/manage.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/__init__.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/__init__.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/__init__.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/settings.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/settings.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/settings.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/urls.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/urls.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/urls.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/wsgi.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/wsgi.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/myoauth/wsgi.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/__init__.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/__init__.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/__init__.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/models.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/models.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/models.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/templates/registration/login.html
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/views.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/views.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/polls/views.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/django_user/requirements.txt
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/manage.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/manage.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/manage.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/__init__.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/__init__.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/__init__.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/settings.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/settings.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/settings.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/urls.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/urls.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/urls.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/wsgi.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/wsgi.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/myoauth/wsgi.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/__init__.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/__init__.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/__init__.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/views.py
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/views.pyc
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/polls/views.pyo
-${PYSITELIB}/gslib/vendored/oauth2client/samples/django/google_user/requirements.txt
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/googleappengine/app.yaml
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/googleappengine/call_compute_service_from_gae.py
 ${PYSITELIB}/gslib/vendored/oauth2client/samples/googleappengine/call_compute_service_from_gae.pyc
diff --git a/net/py-gsutil/distinfo b/net/py-gsutil/distinfo
index d8bccd1e0fe..f65d7f7f65c 100644
--- a/net/py-gsutil/distinfo
+++ b/net/py-gsutil/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2020/10/16 07:41:10 bsiegert Exp $
+$NetBSD: distinfo,v 1.11 2021/09/19 12:49:42 bsiegert Exp $
 
-SHA1 (gsutil-4.53.tar.gz) = d2cba354892fe912eedd33acfd515ad2b52fc5d0
-RMD160 (gsutil-4.53.tar.gz) = ae413b5fd323d280e1f3724bc181a597e7cf42aa
-SHA512 (gsutil-4.53.tar.gz) = a91edbe27593ae8ba14fe8c8d04f12dc5aac94ab970925940725220680052390039e3f5c6614f20720306541c418911a0986f73887dc00188c792d8e4684cdd4
-Size (gsutil-4.53.tar.gz) = 2487916 bytes
-SHA1 (patch-setup.py) = 1e5b185a5c0efeb7ab05597d0cec1cb354cde558
+SHA1 (gsutil-4.68.tar.gz) = d0ff2116eca2a9fb24a1b094ffd5bb94f90fcbc7
+RMD160 (gsutil-4.68.tar.gz) = ae4df0ac57f0c56d996158155414c7b324012b89
+SHA512 (gsutil-4.68.tar.gz) = c2eb0a541cbf3b34c4ee8b679bfa01b25741f3a5e4cb7b1a362e5b9434dd7ed965eb6afd283ab7495f04b27ebde84b957ff99a74eec0f7c98555ef860ff786f5
+Size (gsutil-4.68.tar.gz) = 2905181 bytes
diff --git a/net/py-gsutil/patches/patch-setup.py b/net/py-gsutil/patches/patch-setup.py
deleted file mode 100644
index 87ede5c2234..00000000000
--- a/net/py-gsutil/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.5 2020/10/16 07:41:10 bsiegert Exp $
-
-Relax requirements.
-
---- setup.py.orig	2020-08-19 21:17:24.000000000 +0000
-+++ setup.py
-@@ -44,7 +44,7 @@ requires = [
-     'httplib2>=0.18',
-     'google-reauth>=0.1.0',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
-+    'mock>=2.0.0',
-     'monotonic>=1.4',
-     'pyOpenSSL>=0.13',
-     'retry_decorator>=1.0.0',