Control: tags 1074224 + pending Dear maintainer,
I've prepared an NMU for crossfire (versioned as 1.75.0-6.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -Nru crossfire-1.75.0/debian/changelog crossfire-1.75.0/debian/changelog --- crossfire-1.75.0/debian/changelog 2023-08-05 08:01:09.000000000 -0400 +++ crossfire-1.75.0/debian/changelog 2024-07-02 15:39:27.000000000 -0400 @@ -1,3 +1,12 @@ +crossfire (1.75.0-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/0005-Fix-build-with-Python-3.12.patch: + Cherry-pick upstream fix on Python 3.12 compatibility. + (Closes: #1074224) + + -- Boyuan Yang <by...@debian.org> Tue, 02 Jul 2024 15:39:27 -0400 + crossfire (1.75.0-6) unstable; urgency=medium * Patch plugins/cfpython/cjson.c to use diff -Nru crossfire-1.75.0/debian/patches/0005-Fix-build-with-Python-3.12.patch crossfire-1.75.0/debian/patches/0005-Fix-build-with-Python-3.12.patch --- crossfire-1.75.0/debian/patches/0005-Fix-build-with-Python-3.12.patch 1969-12-31 19:00:00.000000000 -0500 +++ crossfire-1.75.0/debian/patches/0005-Fix-build-with-Python-3.12.patch 2024-07-02 15:39:01.000000000 -0400 @@ -0,0 +1,96 @@ +From: Boyuan Yang <by...@debian.org> +Date: Tue, 2 Jul 2024 15:38:46 -0400 +Subject: Fix build with Python 3.12 + +Applied-Upstream: https://sourceforge.net/p/crossfire/crossfire-server/ci/472dd26ac74419baa0e6373cb04e095437e994c6/ +--- + plugins/cfpython/cjson.c | 51 ++++++++++++------------------------------------ + 1 file changed, 12 insertions(+), 39 deletions(-) + +diff --git a/plugins/cfpython/cjson.c b/plugins/cfpython/cjson.c +index 1483d8f..da1547d 100644 +--- a/plugins/cfpython/cjson.c ++++ b/plugins/cfpython/cjson.c +@@ -687,18 +687,14 @@ static PyObject *encode_string(PyObject *string) { + #if defined(IS_PY26) || defined(IS_PY3K) + static PyObject *encode_unicode(PyObject *unicode) { + PyObject *repr; +- Py_UNICODE *s; +- Py_ssize_t size; ++ Py_ssize_t size, pos; + char *p; + static const char *hexdigit = "0123456789abcdef"; +-#ifdef Py_UNICODE_WIDE + static const Py_ssize_t expandsize = 10; +-#else +- static const Py_ssize_t expandsize = 6; +-#endif + +- s = PyUnicode_AS_UNICODE(unicode); +- size = PyUnicode_GET_SIZE(unicode); ++ int kind = PyUnicode_KIND(unicode); ++ void *data = PyUnicode_DATA(unicode); ++ size = PyUnicode_GET_LENGTH(unicode); + + if (size > (PY_SSIZE_T_MAX-2-1)/expandsize) { + PyErr_SetString(PyExc_OverflowError, "unicode object is too large to make repr"); +@@ -715,17 +711,21 @@ static PyObject *encode_unicode(PyObject *unicode) { + p = PyByteArray_AS_STRING(repr); + + *p++ = '"'; ++ pos = 0; + +- while (size-- > 0) { +- Py_UNICODE ch = *s++; ++ const Py_UCS4 quote = PyByteArray_AS_STRING(repr)[0]; ++ ++ while (pos < size) { ++ Py_UCS4 ch = PyUnicode_READ(kind, data, pos); ++ pos++; + + /* Escape quotes */ +- if ((ch == (Py_UNICODE)PyByteArray_AS_STRING(repr)[0] || ch == '\\')) { ++ if ((ch == quote || ch == '\\')) { + *p++ = '\\'; + *p++ = (char)ch; + continue; + } +-#ifdef Py_UNICODE_WIDE ++ + /* Map 21-bit characters to '\U00xxxxxx' */ + else if (ch >= 0x10000) { + *p++ = '\\'; +@@ -740,33 +740,6 @@ static PyObject *encode_unicode(PyObject *unicode) { + *p++ = hexdigit[ch&0x0000000F]; + continue; + } +-#else +- /* Map UTF-16 surrogate pairs to Unicode \UXXXXXXXX escapes */ +- else if (ch >= 0xD800 && ch < 0xDC00) { +- Py_UNICODE ch2; +- Py_UCS4 ucs; +- +- ch2 = *s++; +- size--; +- if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) { +- ucs = (((ch&0x03FF)<<10)|(ch2&0x03FF))+0x00010000; +- *p++ = '\\'; +- *p++ = 'U'; +- *p++ = hexdigit[(ucs>>28)&0x0000000F]; +- *p++ = hexdigit[(ucs>>24)&0x0000000F]; +- *p++ = hexdigit[(ucs>>20)&0x0000000F]; +- *p++ = hexdigit[(ucs>>16)&0x0000000F]; +- *p++ = hexdigit[(ucs>>12)&0x0000000F]; +- *p++ = hexdigit[(ucs>>8)&0x0000000F]; +- *p++ = hexdigit[(ucs>>4)&0x0000000F]; +- *p++ = hexdigit[ucs&0x0000000F]; +- continue; +- } +- /* Fall through: isolated surrogates are copied as-is */ +- s--; +- size++; +- } +-#endif + /* Map 16-bit characters to '\uxxxx' */ + if (ch >= 256) { + *p++ = '\\'; diff -Nru crossfire-1.75.0/debian/patches/series crossfire-1.75.0/debian/patches/series --- crossfire-1.75.0/debian/patches/series 2023-08-04 14:48:39.000000000 -0400 +++ crossfire-1.75.0/debian/patches/series 2024-07-02 15:39:01.000000000 -0400 @@ -2,3 +2,4 @@ python3-embed python3-ftbfs-1008637 python3-PyUnicode_EncodeRawUnicodeEscape-fix-1042977 +0005-Fix-build-with-Python-3.12.patch
signature.asc
Description: This is a digitally signed message part
