diff --git a/backport-libselinux-fix-swig-bindings-for-4.3.0.patch b/backport-libselinux-fix-swig-bindings-for-4.3.0.patch new file mode 100644 index 0000000000000000000000000000000000000000..27f39e60544c0b29a16f59143826173edfb25409 --- /dev/null +++ b/backport-libselinux-fix-swig-bindings-for-4.3.0.patch @@ -0,0 +1,83 @@ +From 8e0e718bae53fff30831b92cd784151d475a20da Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Wed, 16 Oct 2024 20:48:11 +0200 +Subject: [PATCH] libselinux: fix swig bindings for 4.3.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://github.com/swig/swig/blob/master/CHANGES.current + +"[Python] #2907 Fix returning null from functions with output +parameters. Ensures OUTPUT and INOUT typemaps are handled +consistently wrt return type. + +New declaration of SWIG_Python_AppendOutput is now: + + SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void); + +The 3rd parameter is new and the new $isvoid special variable +should be passed to it, indicating whether or not the wrapped +function returns void. + +Also consider replacing with: + + SWIG_AppendOutput(PyObject* result, PyObject* obj); + +which calls SWIG_Python_AppendOutput with same parameters but adding $isvoid +for final parameter." + +Fixes: https://github.com/SELinuxProject/selinux/issues/447 + + selinuxswig_python_wrap.c: In function ‘_wrap_security_compute_user’: + selinuxswig_python_wrap.c:11499:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ + 11499 | resultobj = SWIG_Python_AppendOutput(resultobj, plist); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + selinuxswig_python_wrap.c:1248:1: note: declared here + 1248 | SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void) { + | ^~~~~~~~~~~~~~~~~~~~~~~~ + selinuxswig_python_wrap.c: In function ‘_wrap_security_compute_user_raw’: + selinuxswig_python_wrap.c:11570:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ + 11570 | resultobj = SWIG_Python_AppendOutput(resultobj, plist); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + selinuxswig_python_wrap.c:1248:1: note: declared here + 1248 | SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void) { + | ^~~~~~~~~~~~~~~~~~~~~~~~ + selinuxswig_python_wrap.c: In function ‘_wrap_security_get_boolean_names’: + selinuxswig_python_wrap.c:12470:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’ + 12470 | resultobj = SWIG_Python_AppendOutput(resultobj, list); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + selinuxswig_python_wrap.c:1248:1: note: declared here + 1248 | SWIG_Python_AppendOutput(PyObject* result, PyObject* obj, int is_void) { + | ^~~~~~~~~~~~~~~~~~~~~~~~ + error: command '/usr/bin/gcc' failed with exit code 1 + +Suggested-by: Jitka Plesnikova +Signed-off-by: Petr Lautrbach +Acked-by: James Carter +--- + src/selinuxswig_python.i | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/selinuxswig_python.i b/src/selinuxswig_python.i +index 17e03b9e36..03ed296d5b 100644 +--- a/src/selinuxswig_python.i ++++ b/src/selinuxswig_python.i +@@ -71,7 +71,7 @@ + for (i = 0; i < *$2; i++) { + PyList_SetItem(list, i, PyString_FromString((*$1)[i])); + } +- $result = SWIG_Python_AppendOutput($result, list); ++ $result = SWIG_AppendOutput($result, list); + } + + /* return a sid along with the result */ +@@ -108,7 +108,7 @@ + plist = PyList_New(0); + } + +- $result = SWIG_Python_AppendOutput($result, plist); ++ $result = SWIG_AppendOutput($result, plist); + } + + /* Makes functions in get_context_list.h return a Python list of contexts */ diff --git a/libselinux.spec b/libselinux.spec index e5a9272d0958b1952f38a3c9a441aa2796a313d3..191eb992ab8ba537c6dd67963222f5fb13583f9c 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -3,7 +3,7 @@ Name: libselinux Version: 3.5 -Release: 3 +Release: 4 License: Public Domain Summary: SELinux library and simple utilities Url: https://github.com/SELinuxProject/selinux/wiki @@ -15,6 +15,7 @@ Patch0003: backport-libselinux-enable-usage-with-pedantic-UB-sanitizers.patch Patch0004: backport-libselinux-reorder-calloc-3-arguments.patch Patch0005: backport-libselinux-Fix-ordering-of-arguments-to-calloc.patch Patch0006: backport-libselinux-use-reentrant-strtok_r-3.patch +Patch0007: backport-libselinux-fix-swig-bindings-for-4.3.0.patch Patch9000: do-malloc-trim-after-load-policy.patch @@ -79,7 +80,6 @@ make clean %make_build RUBYINC="%{ruby_inc}" SHLIBDIR="%{_libdir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" CFLAGS="-g %{optflags}" rubywrap %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir} @@ -101,8 +101,6 @@ rm -f %{buildroot}%{_sbindir}/{compute_*,selinuxdisable,togglesebool,selinux_che mv %{buildroot}%{_sbindir}/getdefaultcon %{buildroot}%{_sbindir}/selinuxdefcon mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist -%ldconfig_scriptlets - %files %license LICENSE %{_libdir}/libselinux.so.* @@ -131,10 +129,14 @@ mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist %{_mandir}/man3/* %{_mandir}/man5/* %{_mandir}/man8/* -%{_mandir}/ru/man5/* -%{_mandir}/ru/man8/* +%lang(ru) %{_mandir}/ru/man5/* +%lang(ru) %{_mandir}/ru/man8/* %changelog +* Wed Jan 22 2025 Funda Wang - 3.5-4 +- add upstream patch fixing build with swig 4.3.0 +- drop useless buildroot cleanup and ldconfig scriptlets + * Mon Mar 25 2024 fuanan - 3.5-3 - backport upstream patches