From 105da32ae8c349ace1e18ddba9a7477e3423a413 Mon Sep 17 00:00:00 2001
From: Gregory Szorc <gregory.szorc@gmail.com>
Date: Tue, 16 Nov 2021 17:52:29 -0800
Subject: [PATCH] downloads: upgrade setuptools from 58.1.0 to 59.1.1

setuptools finally upgraded the vendored packaging package, so we
can remove the patch we contributed upstream in
https://github.com/pypa/packaging/pull/294.

A similar patch for pip still lingers (perhaps we haven't tried to
contribute that upstream yet).
---
 cpython-unix/build-cpython.sh | 28 ----------------------------
 pythonbuild/downloads.py      |  8 ++++----
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh
index 3a75d234..eb9196ee 100755
--- a/cpython-unix/build-cpython.sh
+++ b/cpython-unix/build-cpython.sh
@@ -60,34 +60,6 @@ zip -r "${PIP_WHEEL}" *
 popd
 rm -rf pip-tmp
 
-mkdir setuptools-tmp
-pushd setuptools-tmp
-unzip "${SETUPTOOLS_WHEEL}"
-rm -f "${SETUPTOOLS_WHEEL}"
-
-patch -p1 <<EOF
-diff --git a/setuptools/_vendor/packaging/tags.py b/setuptools/_vendor/packaging/tags.py
-index 9064910b..c541e648 100644
---- a/setuptools/_vendor/packaging/tags.py
-+++ b/setuptools/_vendor/packaging/tags.py
-@@ -475,7 +475,10 @@ def _glibc_version_string_ctypes():
-     # which libc our process is actually using.
-     #
-     # Note: typeshed is wrong here so we are ignoring this line.
--    process_namespace = ctypes.CDLL(None)  # type: ignore
-+    try:
-+        process_namespace = ctypes.CDLL(None)  # type: ignore
-+    except OSError:
-+        return None
-     try:
-         gnu_get_libc_version = process_namespace.gnu_get_libc_version
-     except AttributeError:
-EOF
-
-zip -r "${SETUPTOOLS_WHEEL}" *
-popd
-rm -rf setuptools-tmp
-
 # If we are cross-compiling, we need to build a host Python to use during
 # the build.
 if [ "${BUILD_TRIPLE}" != "${TARGET_TRIPLE}" ]; then
diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index fe6226ed..9d0fb5e7 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -284,10 +284,10 @@
         "license_file": "LICENSE.readline.txt",
     },
     "setuptools": {
-        "url": "https://files.pythonhosted.org/packages/4e/2e/f8e006dbaaa46ed1e762c287585b92476deb8d3ccb79b720ed3b86bc6113/setuptools-58.1.0-py3-none-any.whl",
-        "size": 816725,
-        "sha256": "7324fd4b66efa05cdfc9c89174573a4410acc7848f318cc0565c7fb659dfdc81",
-        "version": "58.1.0",
+        "url": "https://files.pythonhosted.org/packages/ed/60/15ee37d6d3385e6a432d39b5ac51f8467178ad989ba50f2b55681c1a038e/setuptools-59.1.1-py3-none-any.whl",
+        "size": 951244,
+        "sha256": "fb537610c2dfe77b5896e3ee53dd53fbdd9adc48076c8f28cee3a30fb59a5038",
+        "version": "59.1.1",
     },
     "sqlite": {
         "url": "https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz",