summarylogtreecommitdiffstats
path: root/0003-libselinux-Change-the-location-of-_selinux-so.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-libselinux-Change-the-location-of-_selinux-so.patch')
-rw-r--r--0003-libselinux-Change-the-location-of-_selinux-so.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/0003-libselinux-Change-the-location-of-_selinux-so.patch b/0003-libselinux-Change-the-location-of-_selinux-so.patch
deleted file mode 100644
index a77ec39b3989..000000000000
--- a/0003-libselinux-Change-the-location-of-_selinux-so.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 722afe4068bada52aae1af84d7a6ef823ea309b4 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Mon, 27 Jun 2016 10:46:13 +0200
-Subject: [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:
->>> 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
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
----
- libselinux/src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
-index d0021ae8d77d..48d65abb5e32 100644
---- a/libselinux/src/Makefile
-+++ b/libselinux/src/Makefile
-@@ -155,7 +155,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
-
---
-2.9.3
-