diff --git a/0001-libselinux-Change-the-location-of-_selinux.so.patch b/0001-libselinux-Change-the-location-of-_selinux.so.patch deleted file mode 100644 index d700870..0000000 --- a/0001-libselinux-Change-the-location-of-_selinux.so.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d04204820e04f19c6603ad2b0a45a382bc4546c7 Mon Sep 17 00:00:00 2001 -From: Petr Lautrbach -Date: Fri, 24 Jun 2016 14:29:08 +0200 -Subject: [PATCH] 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 in the directory -where is __init__.py, importlib search standard paths. It means that we -need to move _selinux.so from $(PYLIBDIR)/site-packages/selinux/ to -$(PYLIBDIR)/site-packages/. ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index d94163e..37d01af 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -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 - --- -2.7.4 - diff --git a/libselinux-fedora.patch b/libselinux-fedora.patch index 291c094..6f38f15 100644 --- a/libselinux-fedora.patch +++ b/libselinux-fedora.patch @@ -1,8 +1,9 @@ diff --git libselinux-2.5/ChangeLog libselinux-2.5/ChangeLog -index 24673dd..2b81053 100644 +index 24673dd..6588189 100644 --- libselinux-2.5/ChangeLog +++ libselinux-2.5/ChangeLog -@@ -1,3 +1,18 @@ +@@ -1,3 +1,19 @@ ++ * Change the location of _selinux.so, from Petr Lautrbach. + * Clarify is_selinux_mls_enabled() description, from David King. + * Explain how to free policy type from selinux_getpolicytype(), from David King. + * Compare absolute pathname in matchpathcon -V, from Petr Lautrbach. @@ -669,7 +670,7 @@ index 6f1034b..c9f188c 100644 Every confined service on the system has a man page in the following format: .br diff --git libselinux-2.5/src/Makefile libselinux-2.5/src/Makefile -index d0021ae..d94163e 100644 +index d0021ae..37d01af 100644 --- libselinux-2.5/src/Makefile +++ libselinux-2.5/src/Makefile @@ -5,6 +5,7 @@ PYTHON ?= python @@ -703,6 +704,15 @@ index d0021ae..d94163e 100644 MAX_STACK_SIZE=32768 +@@ -155,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 + diff --git libselinux-2.5/src/audit2why.c libselinux-2.5/src/audit2why.c index 12745b3..abe1701 100644 --- libselinux-2.5/src/audit2why.c diff --git a/libselinux.spec b/libselinux.spec index c1ef29e..e74823c 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -20,9 +20,8 @@ Url: https://github.com/SELinuxProject/selinux/wiki # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: # $ VERSION=2.5 ./make-fedora-selinux-patch.sh libselinux -# HEAD https://github.com/fedora-selinux/selinux/commit/bd50d00badba7a148d12879b6c736ea9f2d7ee2d +# HEAD https://github.com/fedora-selinux/selinux/commit/9eb71873eb6e6073228257abbeb42f61b2719336 Patch1: libselinux-fedora.patch -Patch2: 0001-libselinux-Change-the-location-of-_selinux.so.patch BuildRequires: pkgconfig python python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel %if 0%{?with_python3} BuildRequires: python3 python3-devel