From d81173e21cc24147e4df35cfe6b09a5b6d50d78f Mon Sep 17 00:00:00 2001 From: zhengxiaoxiao Date: Wed, 14 Aug 2024 15:27:42 +0800 Subject: [PATCH] Fix compilation failure (cherry picked from commit 901db1af4418c7e95cbabe5ebd55add46cf3d388) --- PyPAM.spec | 6 +++++- fix-compilcation-failed.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 fix-compilcation-failed.patch diff --git a/PyPAM.spec b/PyPAM.spec index 9e36795..84c0342 100644 --- a/PyPAM.spec +++ b/PyPAM.spec @@ -1,6 +1,6 @@ Name: PyPAM Version: 0.5.0 -Release: 4 +Release: 5 Summary: PAM bindings for Python License: LGPLv2.1 Url: http://www.pangalactic.org/PyPAM @@ -12,6 +12,7 @@ Patch0003: PyPAM-0.5.0-nofree.patch Patch0004: PyPAM-0.5.0-memory-errors.patch Patch0005: PyPAM-0.5.0-return-value.patch Patch0006: PyPAM-python3-support.patch +Patch0007: fix-compilcation-failed.patch BuildRequires: python3-devel pam-devel gcc %filter_provides_in %{python3_sitearch}/PAM*.so$ @@ -58,6 +59,9 @@ PYTHONPATH=build/lib.linux-`uname -m`-cpython-%{python3_version_nodots}/ %{__pyt %doc NEWS README ChangeLog INSTALL examples %changelog +* Wed Aug 14 2024 zhengxiaoxiao - 0.5.0-5 +- Fix compilation failure + * Wed Jul 5 2023 liyanan - 0.5.0-4 - Fix compilation failure caused by setuptool upgrade diff --git a/fix-compilcation-failed.patch b/fix-compilcation-failed.patch new file mode 100644 index 0000000..ec8e00d --- /dev/null +++ b/fix-compilcation-failed.patch @@ -0,0 +1,29 @@ +From 766dd31a539ef8df187864c95999a4435f326c33 Mon Sep 17 00:00:00 2001 +From: qsw333 +Date: Fri, 26 Jul 2024 15:57:17 +0800 +Subject: [PATCH] fix compilcation failed + +--- + PAMmodule.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/PAMmodule.c b/PAMmodule.c +index a41d97b..7ca8fe0 100644 +--- a/PAMmodule.c ++++ b/PAMmodule.c +@@ -674,8 +674,11 @@ void initPAM(void) + if (PyPAM_Error == NULL) + INITERROR; + PyDict_SetItemString(d, "error", PyPAM_Error); +- ++#if PY_VERSION_HEX >= 0x030a00f0 ++ Py_SET_TYPE(&PyPAMObject_Type, &PyType_Type); ++#else + Py_TYPE(&PyPAMObject_Type) = &PyType_Type; ++#endif + PyPAMObject_Type.tp_doc = PyPAMObject_doc; + Py_INCREF(&PyPAMObject_Type); + +-- +2.33.0 + -- Gitee