From d0ed5a47443b954213b2b57e78bb11aff6cd2488 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Wed, 4 Dec 2024 11:23:13 -0600
Subject: [PATCH 1/4] Upgrade setuptools from 75.1.0 -> 75.6.0

---
 pythonbuild/downloads.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index 9195fb69..f4bdcca7 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -277,10 +277,10 @@
         "license_file": "LICENSE.readline.txt",
     },
     "setuptools": {
-        "url": "https://files.pythonhosted.org/packages/ff/ae/f19306b5a221f6a436d8f2238d5b80925004093fa3edea59835b514d9057/setuptools-75.1.0-py3-none-any.whl",
-        "size": 1248506,
-        "sha256": "35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
-        "version": "75.1.0",
+        "url": "https://files.pythonhosted.org/packages/55/21/47d163f615df1d30c094f6c8bbb353619274edccf0327b185cc2493c2c33/setuptools-75.6.0-py3-none-any.whl",
+        "size": 1224032,
+        "sha256": "setuptools-75.6.0-py3-none-any.whl",
+        "version": "75.6.0",
     },
     # Remember to update verify_distribution.py when version changed.
     "sqlite": {

From e7debce7d81885b03f73327c140c29df49b72266 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Wed, 4 Dec 2024 11:21:41 -0600
Subject: [PATCH 2/4] Upgrade pip from 24.1.2 -> 24.3.1

---
 pythonbuild/downloads.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index f4bdcca7..aef745a5 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -262,10 +262,10 @@
         "version": "0.13.1",
     },
     "pip": {
-        "url": "https://files.pythonhosted.org/packages/e7/54/0c1c068542cee73d8863336e974fc881e608d0170f3af15d0c0f28644531/pip-24.1.2-py3-none-any.whl",
-        "size": 1824406,
-        "sha256": "7cd207eed4c60b0f411b444cd1464198fe186671c323b6cd6d433ed80fc9d247",
-        "version": "24.1.2",
+        "url": "https://files.pythonhosted.org/packages/ef/7d/500c9ad20238fcfcb4cb9243eede163594d7020ce87bd9610c9e02771876/pip-24.3.1-py3-none-any.whl",
+        "size": 1822182,
+        "sha256": "3790624780082365f47549d032f3770eeb2b1e8bd1f7b2e02dace1afa361b4ed",
+        "version": "24.3.1",
     },
     "readline": {
         "url": "https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz",

From d3bac4edef190eb761f85933691f301f06989b4d Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Wed, 4 Dec 2024 13:14:21 -0600
Subject: [PATCH 3/4] Fix sha for setuptools

---
 pythonbuild/downloads.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonbuild/downloads.py b/pythonbuild/downloads.py
index aef745a5..c2ed7061 100644
--- a/pythonbuild/downloads.py
+++ b/pythonbuild/downloads.py
@@ -279,7 +279,7 @@
     "setuptools": {
         "url": "https://files.pythonhosted.org/packages/55/21/47d163f615df1d30c094f6c8bbb353619274edccf0327b185cc2493c2c33/setuptools-75.6.0-py3-none-any.whl",
         "size": 1224032,
-        "sha256": "setuptools-75.6.0-py3-none-any.whl",
+        "sha256": "ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d",
         "version": "75.6.0",
     },
     # Remember to update verify_distribution.py when version changed.

From 3c000e9cb99bc036d88df6529e86c37aa20f04d0 Mon Sep 17 00:00:00 2001
From: Zanie Blue <contact@zanie.dev>
Date: Wed, 4 Dec 2024 13:47:52 -0600
Subject: [PATCH 4/4] Remove outdated `pip` patch

Upstreamed in https://github.com/pypa/pip/pull/12716
---
 cpython-unix/build-cpython.sh              |  2 --
 cpython-unix/patch-pip-static-binary.patch | 16 ----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 cpython-unix/patch-pip-static-binary.patch

diff --git a/cpython-unix/build-cpython.sh b/cpython-unix/build-cpython.sh
index 4016aaf6..7c969d30 100755
--- a/cpython-unix/build-cpython.sh
+++ b/cpython-unix/build-cpython.sh
@@ -58,8 +58,6 @@ pushd pip-tmp
 unzip "${PIP_WHEEL}"
 rm -f "${PIP_WHEEL}"
 
-patch -p1 -i ${ROOT}/patch-pip-static-binary.patch
-
 zip -r "${PIP_WHEEL}" *
 popd
 rm -rf pip-tmp
diff --git a/cpython-unix/patch-pip-static-binary.patch b/cpython-unix/patch-pip-static-binary.patch
deleted file mode 100644
index 4ac80a0f..00000000
--- a/cpython-unix/patch-pip-static-binary.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pip/_internal/utils/glibc.py b/pip/_internal/utils/glibc.py
-index 819979d80..4ae91e364 100644
---- a/pip/_internal/utils/glibc.py
-+++ b/pip/_internal/utils/glibc.py
-@@ -47,7 +47,10 @@ def glibc_version_string_ctypes():
-     # manpage says, "If filename is NULL, then the returned handle is for the
-     # main program". This way we can let the linker do the work to figure out
-     # which libc our process is actually using.
--    process_namespace = ctypes.CDLL(None)
-+    try:
-+        process_namespace = ctypes.CDLL(None)
-+    except OSError:
-+        return None
-     try:
-         gnu_get_libc_version = process_namespace.gnu_get_libc_version
-     except AttributeError: