Control: tags 1091131 + pending
Dear maintainer, I've prepared an NMU for libselinux (versioned as 3.7-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru libselinux-3.7/debian/changelog libselinux-3.7/debian/changelog --- libselinux-3.7/debian/changelog 2024-08-30 04:55:29.000000000 +0200 +++ libselinux-3.7/debian/changelog 2025-01-25 09:51:31.000000000 +0100 @@ -1,3 +1,12 @@ +libselinux (3.7-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Apply upstream patch to fix build with swig 4.3.0 (Closes: + #1091131). + Thanks to Alex Murray + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 25 Jan 2025 09:51:31 +0100 + libselinux (3.7-3) unstable; urgency=medium * Reverted the rename of libselinux1-dev to libselinux-dev. diff -Nru libselinux-3.7/debian/patches/fix-swig-bindings-for-4.3.0.patch libselinux-3.7/debian/patches/fix-swig-bindings-for-4.3.0.patch --- libselinux-3.7/debian/patches/fix-swig-bindings-for-4.3.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ libselinux-3.7/debian/patches/fix-swig-bindings-for-4.3.0.patch 2025-01-25 09:49:21.000000000 +0100 @@ -0,0 +1,83 @@ +From 8e0e718bae53fff30831b92cd784151d475a20da Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach <lautrb...@redhat.com> +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 <jples...@redhat.com> +Signed-off-by: Petr Lautrbach <lautrb...@redhat.com> +Acked-by: James Carter <jwca...@gmail.com> +--- + libselinux/src/selinuxswig_python.i | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i +index 17e03b9e36..03ed296d5b 100644 +--- a/src/selinuxswig_python.i ++++ b/src/selinuxswig_python.i +@@ -71,7 +71,7 @@ def install(src, dest): + 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 @@ def install(src, dest): + 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 -Nru libselinux-3.7/debian/patches/series libselinux-3.7/debian/patches/series --- libselinux-3.7/debian/patches/series 2024-08-23 09:48:44.000000000 +0200 +++ libselinux-3.7/debian/patches/series 2025-01-25 09:49:45.000000000 +0100 @@ -1 +1,2 @@ default +fix-swig-bindings-for-4.3.0.patch diff -Nru libselinux-3.7/debian/patches/series.orig libselinux-3.7/debian/patches/series.orig --- libselinux-3.7/debian/patches/series.orig 1970-01-01 01:00:00.000000000 +0100 +++ libselinux-3.7/debian/patches/series.orig 2025-01-25 09:49:21.000000000 +0100 @@ -0,0 +1 @@ +default diff -Nru libselinux-3.7/debian/patches/series.rej libselinux-3.7/debian/patches/series.rej --- libselinux-3.7/debian/patches/series.rej 1970-01-01 01:00:00.000000000 +0100 +++ libselinux-3.7/debian/patches/series.rej 2025-01-25 09:49:21.000000000 +0100 @@ -0,0 +1,6 @@ +--- debian/patches/series 2024-11-14 17:29:12.000000000 +1030 ++++ debian/patches/series 2025-01-06 11:41:50.000000000 +1030 +@@ -1,2 +1,3 @@ + default + lfs-compat.patch ++fix-swig-bingings-for-4.3.0.patch
