Date: Monday, April 10, 2023 @ 20:27:56 Author: eworm Revision: 1444583
upgpkg: freeradius 3.2.2-2: python 3.11 rebuild Added: freeradius/trunk/0002-Use-accessor-function-for-PyFrameObject-members.patch Deleted: freeradius/trunk/0002-Use-accessor-function-for-PyFrameObject-members.patch ------------------------------------------------------------+ 0002-Use-accessor-function-for-PyFrameObject-members.patch | 82 +++++------ 1 file changed, 41 insertions(+), 41 deletions(-) Deleted: 0002-Use-accessor-function-for-PyFrameObject-members.patch =================================================================== --- 0002-Use-accessor-function-for-PyFrameObject-members.patch 2023-04-10 20:26:07 UTC (rev 1444582) +++ 0002-Use-accessor-function-for-PyFrameObject-members.patch 2023-04-10 20:27:56 UTC (rev 1444583) @@ -1,41 +0,0 @@ -From fac2aff7b099af6e678290e0ddd186c747bbd3d9 Mon Sep 17 00:00:00 2001 -From: Nick Porter <[email protected]> -Date: Fri, 13 Jan 2023 18:05:38 +0000 -Subject: Use accessor function for PyFrameObject members on python >= 3.10 - ---- - src/modules/rlm_python/rlm_python.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c -index 2adba0e..96992cb 100644 ---- a/src/modules/rlm_python/rlm_python.c -+++ b/src/modules/rlm_python/rlm_python.c -@@ -234,13 +234,27 @@ static void python_error_log(void) - - for (; ptb != NULL; ptb = ptb->tb_next, fnum++) { - PyFrameObject *cur_frame = ptb->tb_frame; -+#if PY_VERSION_HEX >= 0x030A0000 -+ PyCodeObject *code = PyFrame_GetCode(cur_frame); -+#endif - - ERROR("[%ld] %s:%d at %s()", - fnum, -+#if PY_VERSION_HEX >= 0x030A0000 -+ PyUnicode_AsUTF8(code->co_filename), -+#else - PyString_AsString(cur_frame->f_code->co_filename), -+#endif - PyFrame_GetLineNumber(cur_frame), -+#if PY_VERSION_HEX >= 0x30A0000 -+ PyUnicode_AsUTF8(code->co_name) -+#else - PyString_AsString(cur_frame->f_code->co_name) -+#endif - ); -+#if PY_VERSION_HEX >= 0x030A0000 -+ Py_XDECREF(code); -+#endif - } - } - Added: 0002-Use-accessor-function-for-PyFrameObject-members.patch =================================================================== --- 0002-Use-accessor-function-for-PyFrameObject-members.patch (rev 0) +++ 0002-Use-accessor-function-for-PyFrameObject-members.patch 2023-04-10 20:27:56 UTC (rev 1444583) @@ -0,0 +1,41 @@ +From fac2aff7b099af6e678290e0ddd186c747bbd3d9 Mon Sep 17 00:00:00 2001 +From: Nick Porter <[email protected]> +Date: Fri, 13 Jan 2023 18:05:38 +0000 +Subject: Use accessor function for PyFrameObject members on python >= 3.10 + +--- + src/modules/rlm_python/rlm_python.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c +index 2adba0e..96992cb 100644 +--- a/src/modules/rlm_python/rlm_python.c ++++ b/src/modules/rlm_python/rlm_python.c +@@ -234,13 +234,27 @@ static void python_error_log(void) + + for (; ptb != NULL; ptb = ptb->tb_next, fnum++) { + PyFrameObject *cur_frame = ptb->tb_frame; ++#if PY_VERSION_HEX >= 0x030A0000 ++ PyCodeObject *code = PyFrame_GetCode(cur_frame); ++#endif + + ERROR("[%ld] %s:%d at %s()", + fnum, ++#if PY_VERSION_HEX >= 0x030A0000 ++ PyUnicode_AsUTF8(code->co_filename), ++#else + PyString_AsString(cur_frame->f_code->co_filename), ++#endif + PyFrame_GetLineNumber(cur_frame), ++#if PY_VERSION_HEX >= 0x30A0000 ++ PyUnicode_AsUTF8(code->co_name) ++#else + PyString_AsString(cur_frame->f_code->co_name) ++#endif + ); ++#if PY_VERSION_HEX >= 0x030A0000 ++ Py_XDECREF(code); ++#endif + } + } +
