Skip to contentSkip to conversation

libselinux: Change the location of _selinux.so

PATCH Applied Petr Lautrbach 2 participants 2 messages Jun 27, 2016 – Jul 1, 2016 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: Change the location of _selinux.so

There was a change in swig-3.10 to use importlib instead of imp. While the implementation with imp looked for _selinux.so also into the same directory as __init__.py is, a new module with importlib searchs only standard paths. It means that we need to move _selinux.so from $(PYLIBDIR)/site-packages/selinux/ to $(PYLIBDIR)/site-packages/.

Fixes:

Quoted 1 line
Quoted 1 line
Quoted 1 line

import selinux

Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python2.7/site-packages/selinux/__init__.py", line 21, in <module>
_selinux = swig_import_helper()
File "/usr/lib64/python2.7/site-packages/selinux/__init__.py", line 20, in swig_import_helper
return importlib.import_module('_selinux')
File "/usr/lib64/python2.7/importlib/__init__.py", line 37, in import_module

    __import__(name)

ImportError: No module named _selinux

---
 libselinux/src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/src/Makefile +1 -1
index d94163e..37d01af 100644
@@ -156,7 +156,7 @@ install: all
 
 install-pywrap: pywrap
 	test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux
-	install -m 755 $(SWIGSO) $(PYLIBDIR)/site-packages/selinux/_selinux.so
+	install -m 755 $(SWIGSO) $(PYLIBDIR)/site-packages/_selinux.so
 	install -m 755 $(AUDIT2WHYSO) $(PYLIBDIR)/site-packages/selinux/audit2why.so
 	install -m 644 $(SWIGPYOUT) $(PYLIBDIR)/site-packages/selinux/__init__.py
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 15 lines · Petr Lautrbach

There was a change in swig-3.10 to use importlib instead of imp. While the implementation with imp looked for _selinux.so also into the same directory as __init__.py is, a new module with importlib searchs only standard paths. It means that we need to move _selinux.so from $(PYLIBDIR)/site-packages/selinux/ to $(PYLIBDIR)/site-packages/.

Fixes:

Quoted 1 line
Quoted 1 line
Quoted 1 line

import selinux

Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib64/python2.7/site-packages/selinux/__init__.py", line 21, in <module>
_selinux = swig_import_helper()
File "/usr/lib64/python2.7/site-packages/selinux/__init__.py", line 20, in swig_import_helper
return importlib.import_module('_selinux')
File "/usr/lib64/python2.7/importlib/__init__.py", line 37, in import_module

Quoted 4 lines
    __import__(name)

ImportError: No module named _selinux

Thanks, applied.

Quoted 18 lines
---
 libselinux/src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
libselinux/src/Makefile +1 -1
index d94163e..37d01af 100644
@@ -156,7 +156,7 @@ install: all
 
 install-pywrap: pywrap
 	test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux
-	install -m 755 $(SWIGSO) $(PYLIBDIR)/site-packages/selinux/_selinux.so
+	install -m 755 $(SWIGSO) $(PYLIBDIR)/site-packages/_selinux.so
 	install -m 755 $(AUDIT2WHYSO) $(PYLIBDIR)/site-packages/selinux/audit2why.so
 	install -m 644 $(SWIGPYOUT) $(PYLIBDIR)/site-packages/selinux/__init__.py