Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
Control: block 996878 with -1
Control: affects -1 + src:libprelude
Control: tag 996878 patch pending
[ Reason ]
'import prelude' fails in python3 due to some missing symbol, rendering
python3-prelude useless.
[ Impact ]
'import prelude' will not work, breaking some packages depending on that
[ Tests ]
manual 'import prelude' with the fixed package in bullseye worked
added superficial autopkgtest testing the import
[ Risks ]
Low. The patch cannot make the unusable pyton module worse.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
only backported python module fixes from sid
[ Other info ]
Andreas
diff -Nru libprelude-5.2.0/debian/changelog libprelude-5.2.0/debian/changelog
--- libprelude-5.2.0/debian/changelog 2020-11-26 19:53:39.000000000 +0100
+++ libprelude-5.2.0/debian/changelog 2023-06-07 12:52:40.000000000 +0200
@@ -1,3 +1,17 @@
+libprelude (5.2.0-3+deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport Python module fixes from 5.2.0-4/5.2.0-5.
+
+ [ Thomas Andrejak ]
+ * d.patches: Add new patch 025-Fix-PyIOBase_Type.patch
+ - Fix PyIOBase_Type for Python 3.10 compatibility
+ * d.patches: Update 025-Fix-PyIOBase_Type.patch because swig is not
+ executed (Closes: #996878)
+ * d.tests: Add test to valid that we can load prelude as a python module
+
+ -- Andreas Beckmann <a...@debian.org> Wed, 07 Jun 2023 12:52:40 +0200
+
libprelude (5.2.0-3) unstable; urgency=medium
* d.patches: Add new patch
diff -Nru libprelude-5.2.0/debian/patches/025-Fix-PyIOBase_Type.patch
libprelude-5.2.0/debian/patches/025-Fix-PyIOBase_Type.patch
--- libprelude-5.2.0/debian/patches/025-Fix-PyIOBase_Type.patch 1970-01-01
01:00:00.000000000 +0100
+++ libprelude-5.2.0/debian/patches/025-Fix-PyIOBase_Type.patch 2023-06-07
12:52:40.000000000 +0200
@@ -0,0 +1,170 @@
+Description: Fix PyIOBase_Type for Python 3.10 compatibility
+Author: Thomas Andrejak <thomas.andre...@gmail.com>
+Last-Update: 2021-08-13
+Forwarded: yes, privately
+
+--- libprelude-5.2.0/bindings/python/libpreludecpp-python.i 2020-09-09
16:30:32.510000000 +0200
++++ libprelude-5.2.0/bindings/python/libpreludecpp-python.i 2021-08-13
23:20:11.672221930 +0200
+@@ -163,6 +163,26 @@
+ $1 = _cb_python_log;
+ };
+
++%{
++static PyObject *PyIOBase_TypeObj;
++
++static int init_file_emulator(void)
++{
++ PyObject *io = PyImport_ImportModule("_io");
++ if (io == NULL)
++ return -1;
++ PyIOBase_TypeObj = PyObject_GetAttrString(io, "_IOBase");
++ if (PyIOBase_TypeObj == NULL)
++ return -1;
++ return 0;
++}
++%}
++
++%init %{
++if (init_file_emulator() < 0) {
++ return NULL;
++}
++%}
+
+ /* tell swig not to cast void * value */
+ %typemap(in) void *nocast_file_p %{
+@@ -172,8 +192,7 @@
+
+ }
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- if ( ! PyObject_IsInstance((PyObject *) $input, (PyObject *)
&PyIOBase_Type) ) {
++ if ( ! PyObject_IsInstance((PyObject *) $input, PyIOBase_TypeObj) ) {
+ SWIG_exception_fail(SWIG_RuntimeError, "Argument is not a
file object");
+ }
+ #endif
+@@ -186,8 +205,7 @@
+ #if PY_VERSION_HEX < 0x03000000
+ $1 = PyFile_Check((PyObject *) $input);
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- $1 = PyObject_IsInstance((PyObject *) $input, (PyObject *)
&PyIOBase_Type);
++ $1 = PyObject_IsInstance((PyObject *) $input, PyIOBase_TypeObj);
+ #endif
+ %}
+
+--- libprelude-5.2.0/bindings/python/_prelude.cxx
++++ libprelude-5.2.0/bindings/python/_prelude.cxx
+@@ -2761,7 +2761,7 @@ SwigPyBuiltin_FunpackSetterClosure (PyObject *obj,
PyObject *val, void *closure)
+
+ SWIGINTERN void
+ SwigPyStaticVar_dealloc(PyDescrObject *descr) {
+- PyObject_GC_UnTrack(descr);
++ PyObject_GC_UnTrack(descr);
+ Py_XDECREF(PyDescr_TYPE(descr));
+ Py_XDECREF(PyDescr_NAME(descr));
+ PyObject_GC_Del(descr);
+@@ -4176,6 +4176,20 @@ static ssize_t _cb_python_read(prelude_io_t *fd, void
*buf, size_t size)
+ }
+
+
++static PyObject *PyIOBase_TypeObj;
++
++static int init_file_emulator(void)
++{
++ PyObject *io = PyImport_ImportModule("_io");
++ if (io == NULL)
++ return -1;
++ PyIOBase_TypeObj = PyObject_GetAttrString(io, "_IOBase");
++ if (PyIOBase_TypeObj == NULL)
++ return -1;
++ return 0;
++}
++
++
+ void python2_return_unicode(int enabled)
+ {
+ _PYTHON2_RETURN_UNICODE = enabled;
+@@ -5291,13 +5305,19 @@ namespace swig
+ return const_reference(_seq, n);
+ }
+
+- bool check() const
++ bool check(bool set_err = true) const
+ {
+ Py_ssize_t s = size();
+ for (Py_ssize_t i = 0; i < s; ++i) {
+ swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i);
+- if (!swig::check<value_type>(item))
++ if (!swig::check<value_type>(item)) {
++ if (set_err) {
++ char msg[1024];
++ sprintf(msg, "in sequence element %d", (int)i);
++ SWIG_Error(SWIG_RuntimeError, msg);
++ }
+ return false;
++ }
+ }
+ return true;
+ }
+@@ -17755,8 +17775,7 @@ SWIGINTERN int _wrap_new_IDMEF__SWIG_4(PyObject *self,
Py_ssize_t nobjs, PyObjec
+
+ }
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], (PyObject *)
&PyIOBase_Type) ) {
++ if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], PyIOBase_TypeObj) ) {
+ SWIG_exception_fail(SWIG_RuntimeError, "Argument is not a file object");
+ }
+ #endif
+@@ -17822,8 +17841,7 @@ check_3:
+ #if PY_VERSION_HEX < 0x03000000
+ _v = PyFile_Check((PyObject *) argv[0]);
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- _v = PyObject_IsInstance((PyObject *) argv[0], (PyObject *)
&PyIOBase_Type);
++ _v = PyObject_IsInstance((PyObject *) argv[0], PyIOBase_TypeObj);
+ #endif
+ }
+ if (!_v) goto check_4;
+@@ -17871,8 +17889,7 @@ SWIGINTERN PyObject *_wrap_IDMEF_write(PyObject *self,
PyObject *args) {
+
+ }
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], (PyObject *)
&PyIOBase_Type) ) {
++ if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], PyIOBase_TypeObj) ) {
+ SWIG_exception_fail(SWIG_RuntimeError, "Argument is not a file object");
+ }
+ #endif
+@@ -17919,8 +17936,7 @@ SWIGINTERN PyObject *_wrap_IDMEF_read(PyObject *self,
PyObject *args) {
+
+ }
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], (PyObject *)
&PyIOBase_Type) ) {
++ if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], PyIOBase_TypeObj) ) {
+ SWIG_exception_fail(SWIG_RuntimeError, "Argument is not a file object");
+ }
+ #endif
+@@ -17971,8 +17987,7 @@ SWIGINTERN PyObject *_wrap_IDMEF_readExcept(PyObject
*self, PyObject *args) {
+
+ }
+ #else
+- extern PyTypeObject PyIOBase_Type;
+- if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], (PyObject *)
&PyIOBase_Type) ) {
++ if ( ! PyObject_IsInstance((PyObject *) swig_obj[0], PyIOBase_TypeObj) ) {
+ SWIG_exception_fail(SWIG_RuntimeError, "Argument is not a file object");
+ }
+ #endif
+@@ -22337,6 +22352,11 @@ SWIG_init(void) {
+ SwigPyBuiltin_AddPublicSymbol(public_interface, "SwigPyIterator");
+ d = md;
+
++ if (init_file_emulator() < 0) {
++ return NULL;
++ }
++
++
+ int argc, ret, idx;
+ char **argv = NULL;
+ PyObject *sys = PyImport_ImportModule("sys");
diff -Nru libprelude-5.2.0/debian/patches/series
libprelude-5.2.0/debian/patches/series
--- libprelude-5.2.0/debian/patches/series 2020-11-26 19:53:39.000000000
+0100
+++ libprelude-5.2.0/debian/patches/series 2023-06-07 12:52:40.000000000
+0200
@@ -10,3 +10,4 @@
021-Update_libprelude.m4.patch
022-Fix_libprelude_pkg-config-file.patch
023-Disable_GnuLib_Tests_perror2_strerror.patch
+025-Fix-PyIOBase_Type.patch
diff -Nru libprelude-5.2.0/debian/tests/control
libprelude-5.2.0/debian/tests/control
--- libprelude-5.2.0/debian/tests/control 1970-01-01 01:00:00.000000000
+0100
+++ libprelude-5.2.0/debian/tests/control 2023-06-07 12:52:40.000000000
+0200
@@ -0,0 +1,3 @@
+Test-Command: python3 -m prelude
+Depends: python3-prelude
+Restrictions: superficial
