Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pile of dependency upgrades #280

Merged
merged 6 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions cpython-unix/build-libffi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,6 @@ tar -xf libffi-${LIBFFI_VERSION}.tar.gz

pushd libffi-${LIBFFI_VERSION}

# Upstream commit ce077e5565366171aa1b4438749b0922fce887a4 to resolve a missing declaration.
patch -p1 << 'EOF'
diff --git a/include/ffi_common.h b/include/ffi_common.h
index 2bd31b0..c53a794 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
static trampoline. */
int ffi_tramp_is_present (void *closure) FFI_HIDDEN;

+/* Return a file descriptor of a temporary zero-sized file in a
+ writable and executable filesystem. */
+int open_temp_exec_file(void) FFI_HIDDEN;
+
/* Extended cif, used in callback from assembly routine */
typedef struct
{
diff --git a/src/tramp.c b/src/tramp.c
index 7e005b0..5f19b55 100644
--- a/src/tramp.c
+++ b/src/tramp.c
@@ -39,6 +39,10 @@
#ifdef __linux__
#define _GNU_SOURCE 1
#endif
+
+#include <ffi.h>
+#include <ffi_common.h>
+
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
EOF

EXTRA_CONFIGURE=

# mkostemp() was introduced in macOS 10.10 and libffi doesn't have
Expand Down
50 changes: 25 additions & 25 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@
"license_file": "LICENSE.libffi.txt",
},
"libffi": {
"url": "https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz",
"size": 1362394,
"sha256": "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676",
"version": "3.4.4",
"url": "https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz",
"size": 1391684,
"sha256": "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e",
"version": "3.4.6",
"library_names": ["ffi"],
"licenses": ["MIT"],
"license_file": "LICENSE.libffi.txt",
Expand Down Expand Up @@ -215,10 +215,10 @@
"version": "1.2.5",
},
"ncurses": {
"url": "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.4.tar.gz",
"size": 3612591,
"sha256": "6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159",
"version": "6.4",
"url": "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.5.tar.gz",
"size": 3688489,
"sha256": "136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6",
"version": "6.5",
"library_names": ["ncurses", "ncursesw", "panel", "panelw"],
"licenses": ["X11"],
"license_file": "LICENSE.ncurses.txt",
Expand All @@ -238,10 +238,10 @@
# using the latest available.
# Remember to update OPENSSL_VERSION_INFO in verify_distribution.py whenever upgrading.
"openssl-3.0": {
"url": "https://www.openssl.org/source/openssl-3.0.13.tar.gz",
"size": 15294843,
"sha256": "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313",
"version": "3.0.13",
"url": "https://www.openssl.org/source/openssl-3.0.14.tar.gz",
"size": 15305497,
"sha256": "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca",
"version": "3.0.14",
"library_names": ["crypto", "ssl"],
"licenses": ["Apache-2.0"],
"license_file": "LICENSE.openssl-3.txt",
Expand All @@ -259,10 +259,10 @@
"version": "0.13.1",
},
"pip": {
"url": "https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl",
"size": 2110226,
"sha256": "ba0d021a166865d2265246961bec0152ff124de910c5cc39f1156ce3fa7c69dc",
"version": "24.0",
"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",
},
"readline": {
"url": "https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz",
Expand All @@ -274,18 +274,18 @@
"license_file": "LICENSE.readline.txt",
},
"setuptools": {
"url": "https://files.pythonhosted.org/packages/bb/0a/203797141ec9727344c7649f6d5f6cf71b89a6c28f8f55d4f18de7a1d352/setuptools-69.1.0-py3-none-any.whl",
"size": 819310,
"sha256": "c054629b81b946d63a9c6e732bc8b2513a7c3ea645f11d0139a2191d735c60c6",
"version": "69.1.0",
"url": "https://files.pythonhosted.org/packages/ef/15/88e46eb9387e905704b69849618e699dc2f54407d8953cc4ec4b8b46528d/setuptools-70.3.0-py3-none-any.whl",
"size": 931070,
"sha256": "fe384da74336c398e0d956d1cae0669bc02eed936cdb1d49b57de1990dc11ffc",
"version": "70.3.0",
},
# Remember to update verify_distribution.py when version changed.
"sqlite": {
"url": "https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz",
"size": 3232682,
"sha256": "cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a",
"version": "3450100",
"actual_version": "3.45.1.0",
"url": "https://www.sqlite.org/2024/sqlite-autoconf-3460000.tar.gz",
"size": 3265248,
"sha256": "6f8e6a7b335273748816f9b3b62bbdc372a889de8782d7f048c653a447417a7d",
"version": "3460000",
"actual_version": "3.46.0.0",
"library_names": ["sqlite3"],
"licenses": [],
"license_file": "LICENSE.sqlite.txt",
Expand Down
4 changes: 2 additions & 2 deletions src/verify_distribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def test_hashlib(self):
def test_sqlite(self):
import sqlite3

self.assertEqual(sqlite3.sqlite_version_info, (3, 45, 1))
self.assertEqual(sqlite3.sqlite_version_info, (3, 46, 0))

# Optional SQLite3 features are enabled.
conn = sqlite3.connect(":memory:")
Expand All @@ -135,7 +135,7 @@ def test_ssl(self):
if os.name == "nt" and sys.version_info[0:2] < (3, 11):
wanted_version = (1, 1, 1, 23, 15)
else:
wanted_version = (3, 0, 0, 13, 0)
wanted_version = (3, 0, 0, 14, 0)

self.assertEqual(ssl.OPENSSL_VERSION_INFO, wanted_version)

Expand Down