From f87ed54613f08a20b3301c3aa256e120c0174756 Mon Sep 17 00:00:00 2001 From: guoxiaoqi Date: Tue, 23 Jun 2020 14:39:48 +0800 Subject: [PATCH] add missing _selniux.so --- ...ython-distutils-to-install-SELinux-p.patch | 85 ++++++++++++++----- libselinux.spec | 7 +- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/libselinux-Use-Python-distutils-to-install-SELinux-p.patch b/libselinux-Use-Python-distutils-to-install-SELinux-p.patch index c54cd12..d520ba2 100644 --- a/libselinux-Use-Python-distutils-to-install-SELinux-p.patch +++ b/libselinux-Use-Python-distutils-to-install-SELinux-p.patch @@ -1,36 +1,75 @@ -From bb5a63a3e6e19556419a486a00e008ae6af62fc3 Mon Sep 17 00:00:00 2001 +From 2efa06857575e4118e91ca250b6b92da68b130d5 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach -Date: Thu, 16 May 2019 15:01:59 +0200 +Date: Fri, 7 Jun 2019 17:35:44 +0200 Subject: [PATCH] libselinux: Use Python distutils to install SELinux python bindings -SWIG-4.0 changed its behavior so that it uses: from . import _selinux which -looks for _selinux module in the same directory as where __init__.py is - -$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into -$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location -of _selinux.so"). - -In order to prevent such breakage in future use Python's distutils instead of -building and installing python bindings manually in Makefile. +Follow officially documented way how to build C extension modules using +distutils - https://docs.python.org/3.8/extending/building.html#building Fixes: + +- selinux python module fails to load when it's built using SWIG-4.0: + >>> import selinux Traceback (most recent call last): File "", line 1, in File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in from . import _selinux ImportError: cannot import name '_selinux' from 'selinux' (/usr/lib64/python3.7/site-packages/selinux/__init__.py) ->>> + +SWIG-4.0 changed (again?) its behavior so that it uses: from . import _selinux +which looks for _selinux module in the same directory as where __init__.py is - +$(PYLIBDIR)/site-packages/selinux. But _selinux module is installed into +$(PYLIBDIR)/site-packages/ since a9604c30a5e2f ("libselinux: Change the location +of _selinux.so"). + +- audit2why python module fails to build with Python 3.8 + +cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -DOVERRIDE_GETTID=0 -I../include -D_GNU_SOURCE -DDISABLE_RPM -DNO_ANDROID_BACKEND -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8 -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L. -shared -o python-3.8audit2why.so python-3.8audit2why.lo -lselinux -l:libsepol.a -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs +/usr/bin/ld: python-3.8audit2why.lo: in function `finish': +/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:166: undefined reference to `PyArg_ParseTuple' +/usr/bin/ld: python-3.8audit2why.lo: in function `_Py_INCREF': +/usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' +/usr/bin/ld: /usr/include/python3.8/object.h:449: undefined reference to `_Py_NoneStruct' +/usr/bin/ld: python-3.8audit2why.lo: in function `check_booleans': +/builddir/build/BUILD/libselinux-2.9/src/audit2why.c:84: undefined reference to `PyExc_RuntimeError' +... + +It's related to the following Python change +https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + +Python distutils adds correct link options automatically. + +- selinux python module doesn't provide any Python metadata + +When selinux python module was built manually, it didn't provide any metadata. +distutils takes care about that so that selinux Python module is visible for +pip: + +$ pip3 list | grep selinux +selinux 2.9 Signed-off-by: Petr Lautrbach --- - libselinux/src/Makefile | 37 ++++++++----------------------------- - libselinux/src/setup.py | 24 ++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 29 deletions(-) + libselinux/src/.gitignore | 2 +- + libselinux/src/Makefile | 36 ++++++++---------------------------- + libselinux/src/setup.py | 24 ++++++++++++++++++++++++ + 3 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 libselinux/src/setup.py +diff --git a/libselinux/src/.gitignore b/libselinux/src/.gitignore +index 4dcc3b3..428afe5 100644 +--- a/libselinux/src/.gitignore ++++ b/libselinux/src/.gitignore +@@ -1,4 +1,4 @@ + selinux.py +-selinuxswig_wrap.c ++selinuxswig_python_wrap.c + selinuxswig_python_exception.i + selinuxswig_ruby_wrap.c diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile -index e9ed0383..826c830c 100644 +index e9ed038..2b1696a 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -36,7 +36,7 @@ TARGET=libselinux.so @@ -63,7 +102,7 @@ index e9ed0383..826c830c 100644 -pywrap: all $(SWIGFILES) $(AUDIT2WHYSO) +pywrap: all selinuxswig_python_exception.i -+ CFLAGS="$(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) ++ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR) rubywrap: all $(SWIGRUBYSO) @@ -109,20 +148,20 @@ index e9ed0383..826c830c 100644 install: all test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR) install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR) -@@ -194,10 +173,8 @@ install: all +@@ -194,10 +173,9 @@ install: all ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) install-pywrap: pywrap - test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux - install -m 755 $(SWIGSO) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) - install -m 755 $(AUDIT2WHYSO) $(DESTDIR)$(PYTHONLIBDIR)/selinux/audit2why$(PYCEXT) -- install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py + $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ install -m 644 selinux.py $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py + install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py ++ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) install-rubywrap: rubywrap test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) -@@ -208,6 +185,8 @@ relabel: +@@ -208,6 +186,8 @@ relabel: clean-pywrap: -rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO) @@ -133,7 +172,7 @@ index e9ed0383..826c830c 100644 -rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO) diff --git a/libselinux/src/setup.py b/libselinux/src/setup.py new file mode 100644 -index 00000000..b12e7869 +index 0000000..4dc03f5 --- /dev/null +++ b/libselinux/src/setup.py @@ -0,0 +1,24 @@ @@ -158,9 +197,9 @@ index 00000000..b12e7869 + include_dirs=['../include'], + library_dirs=['.'], + libraries=['selinux'], -+ extra_link_args=['-l:libsepol.a']) ++ extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map']) + ], +) -- -2.21.0 +1.8.3.1 diff --git a/libselinux.spec b/libselinux.spec index b74022f..15fa571 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -3,7 +3,7 @@ Name: libselinux Version: 2.9 -Release: 2 +Release: 3 License: Public Domain Summary: SELinux library and simple utilities Url: https://github.com/SELinuxProject/selinux/wiki @@ -128,10 +128,12 @@ mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist %files -n python2-libselinux %{python2_sitearch}/selinux/ %{python2_sitearch}/selinux-%{version}-* +%{python2_sitearch}/_selinux.so %files -n python3-libselinux %{python3_sitearch}/selinux/ %{python3_sitearch}/selinux-%{version}-* +%{python3_sitearch}/_selinux.*.so %files ruby %{ruby_vendorarchdir}/selinux.so @@ -144,6 +146,9 @@ mv %{buildroot}%{_sbindir}/getconlist %{buildroot}%{_sbindir}/selinuxconlist %{_mandir}/ru/man8/* %changelog +* Tue Jun 23 2020 openEuler Buildteam - 2.9-3 +- add missing _selniux.so + * Mon Jun 22 2020 openEuler Buildteam - 2.9-2 - use python distutils to install selinux python bindings -- Gitee