Date: Monday, April 10, 2023 @ 20:26:07
Author: eworm
Revision: 1444582
upgpkg: freeradius 3.2.2-2: python 3.11 rebuild
Added:
freeradius/trunk/0002-Use-accessor-function-for-PyFrameObject-members.patch
Modified:
freeradius/trunk/PKGBUILD
------------------------------------------------------------+
0002-Use-accessor-function-for-PyFrameObject-members.patch | 41 +++++++++++
PKGBUILD | 5 +
2 files changed, 45 insertions(+), 1 deletion(-)
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:26:07 UTC (rev 1444582)
@@ -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
+ }
+ }
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-10 18:48:39 UTC (rev 1444581)
+++ PKGBUILD 2023-04-10 20:26:07 UTC (rev 1444582)
@@ -4,7 +4,7 @@
pkgname=freeradius
pkgver=3.2.2
-pkgrel=1
+pkgrel=2
pkgdesc='The premier open source RADIUS server'
arch=('x86_64')
url='https://freeradius.org/'
@@ -27,6 +27,7 @@
validpgpkeys=('BF2384EC6938B9744B03E2A620E37C25995B4F85') # FreeRADIUS -
Package Signing [...] <[email protected]>
source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
'0001-python-3-10.patch'
+ '0002-Use-accessor-function-for-PyFrameObject-members.patch'
'freeradius-sysusers.conf'
'freeradius-tmpfiles.conf'
'freeradius.service')
@@ -33,6 +34,7 @@
sha256sums=('8b31cb10b7b5ecfb03e22a9756e49484f98410e697798f3fd0ce1b3a135ba1fe'
'SKIP'
'a84b6489f58083639d9b1854b1bd8610a0f672bcf2a6d902a78da0868fca1317'
+ '5ae5a2860969b8f4973a873d9adde2ad3a8a2af2cf6f669627c619745d549382'
'8ecaca94c7d0f4806b326685312dd4e543ce9c6c183d3d7ad01c1a0197bdfb94'
'f536a9aa972e3e42a6b1a6d8ee17166eb721c7cba2e80f60473811497c7bd8bc'
'c469e1a3f9edad769da01c324779babe783ee85a9b53ce4638d3d2d09c7c8d4b')
@@ -41,6 +43,7 @@
cd "$srcdir"/freeradius-server-$pkgver
patch -Np1 < ../0001-python-3-10.patch
+ patch -Np1 < ../0002-Use-accessor-function-for-PyFrameObject-members.patch
}
build() {
