Attachment 235772 Details for Bug 265537 – patch

[patch] patch

0001-databases-py-sqlite3-Fails-to-load-with-lang-python3.patch (text/plain), 2.01 KB, created by Fukang Chen on 2022-08-08 11:55:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fukang Chen

Created: 2022-08-08 11:55:50 UTC

Size: 2.01 KB

patch

obsolete

>From 8e5ae11baf8ed20a5f57d6de736fcb7bbcce55e0 Mon Sep 17 00:00:00 2001
>From: Fukang Chen <loader@FreeBSD.org>
>Date: Sun, 31 Jul 2022 16:06:38 +0000
>Subject: [PATCH] databases/py-sqlite3: Fails to load with lang/python311:
> _sqlite3.cpython-311.so: Undefined symbol "pysqlite_close_all_blobs"
>
>% python3.11 -c 'import sqlite3'
>Traceback (most recent call last):
>  File "<string>", line 1, in <module>
>  File "/usr/local/lib/python3.11/sqlite3/__init__.py", line 57, in <module>
>    from sqlite3.dbapi2 import *
>  File "/usr/local/lib/python3.11/sqlite3/dbapi2.py", line 27, in <module>
>    from _sqlite3 import *
>ImportError: /usr/local/lib/python3.11/lib-dynload/_sqlite3.cpython-311.so: Undefined symbol "pysqlite_close_all_blobs"
>
>_sqlite/blob.c was introduced by this commit and only affects lang/python311
>https://github.com/python/cpython/commit/ee475430d431814cbb6eb5e8a6c0ae51943349d4
>
>PR:		265537
>Approved by:	python (koobs)
>MFH:		2022Q3 (runtime fix)
>---
> databases/py-sqlite3/Makefile        | 2 +-
> databases/py-sqlite3/files/setup3.py | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
>index 168a5f8cbb0d..b51ef8d99075 100644
>--- a/databases/py-sqlite3/Makefile
>+++ b/databases/py-sqlite3/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	sqlite3
> DISTVERSION=	${PYTHON_DISTVERSION}
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	databases python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py
>index 7407503ceb54..944c89920852 100644
>--- a/databases/py-sqlite3/files/setup3.py
>+++ b/databases/py-sqlite3/files/setup3.py
>@@ -35,6 +35,9 @@ major, minor = map(int, platform.python_version_tuple()[:2])
> if (major, minor) <= (3, 10):
>     sqlite_srcs.append('_sqlite/cache.c',)
> 
>+if (major, minor) >= (3, 11):
>+    sqlite_srcs.append('_sqlite/blob.c',)
>+
> try:
>     import ctypes
>     ctypes.CDLL('libsqlite3.so').sqlite3_load_extension
>-- 
>2.36.1
>

Flags:

loader: maintainer-approval?

Actions: View | Diff

Attachments on bug 265537: 235584 | 235772