mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
package/libselinux: bump version to 3.0
Other changes: - Remove upstream patches. - Modify existing patches to work with 3.0. - Remove Python2 check, as 3.0 has removed Python2 support. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett
Thomas Petazzoni
parent
a7db921da5
commit
889157e1e8
@ -1,4 +1,7 @@
|
|||||||
fix undefined macros in musl
|
From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
Date: Sat, 7 Dec 2019 17:24:50 -0800
|
||||||
|
Subject: [PATCH] fix undefined macros in musl
|
||||||
|
|
||||||
musl does not define glibc-specific macros, so use a simple version of
|
musl does not define glibc-specific macros, so use a simple version of
|
||||||
the macro when it is not defined.
|
the macro when it is not defined.
|
||||||
@ -9,11 +12,13 @@ Domain, and we want to avoid license propagation, so this macro is
|
|||||||
completely written from scratch, and non-optimal.
|
completely written from scratch, and non-optimal.
|
||||||
|
|
||||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
[Updated for 3.0]
|
||||||
diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.c
|
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
||||||
--- libselinux-2.1.13.orig/src/booleans.c 2013-02-06 02:43:22.000000000 +0100
|
diff --git a/src/booleans.c b/src/booleans.c
|
||||||
+++ libselinux-2.1.13/src/booleans.c 2015-07-26 20:40:41.311801914 +0200
|
index ffa8d26..8569002 100644
|
||||||
@@ -62,6 +62,14 @@
|
--- a/src/booleans.c
|
||||||
|
+++ b/src/booleans.c
|
||||||
|
@@ -65,6 +65,14 @@ int security_get_boolean_names(char ***names, int *len)
|
||||||
goto bad;
|
goto bad;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,5 +31,8 @@ diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
for (i = 0; i < *len; i++) {
|
for (i = 0; i < *len; i++) {
|
||||||
n[i] = (char *)malloc(_D_ALLOC_NAMLEN(namelist[i]));
|
n[i] = strdup(namelist[i]->d_name);
|
||||||
if (!n[i]) {
|
if (!n[i]) {
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
|
|||||||
@ -17,12 +17,14 @@ was installed.
|
|||||||
|
|
||||||
[Upstream: https://github.com/SELinuxProject/selinux/pull/184]
|
[Upstream: https://github.com/SELinuxProject/selinux/pull/184]
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||||
|
[Refreshed for 3.0]
|
||||||
|
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
||||||
---
|
---
|
||||||
src/Makefile | 3 +--
|
libselinux/src/Makefile | 3 +--
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/Makefile b/src/Makefile
|
diff --git a/src/Makefile b/src/Makefile
|
||||||
index 799df2b0..95684ed7 100644
|
index 4b6a4d4..7b14ef1 100644
|
||||||
--- a/src/Makefile
|
--- a/src/Makefile
|
||||||
+++ b/src/Makefile
|
+++ b/src/Makefile
|
||||||
@@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include
|
@@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include
|
||||||
@ -43,5 +45,5 @@ index 799df2b0..95684ed7 100644
|
|||||||
install-rubywrap: rubywrap
|
install-rubywrap: rubywrap
|
||||||
test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL)
|
test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL)
|
||||||
--
|
--
|
||||||
2.21.0
|
2.23.0
|
||||||
|
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
From 0f6cd4ef20639ac3b3e26af8f743ee03b5d6f8a4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Duskett <Aduskett@gmail.com>
|
||||||
|
Date: Wed, 11 Dec 2019 14:00:16 -0800
|
||||||
|
Subject: [PATCH] Fix building against musl and uClibc libc libraries.
|
||||||
|
|
||||||
|
Currently, the src/Makefile provides the FTS_LDLIBS when building against musl
|
||||||
|
or uClibc. However, this is missing from utils/Makefile, which causes linking
|
||||||
|
to fail.
|
||||||
|
|
||||||
|
Add the FTS_LDLIBS variable to the LDLIBS variable in utils/Makefile to fix
|
||||||
|
compiling against uClibc and musl.
|
||||||
|
|
||||||
|
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
libselinux/utils/Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/utils/Makefile b/utils/Makefile
|
||||||
|
index 36150638..a5632b7c 100644
|
||||||
|
--- a/utils/Makefile
|
||||||
|
+++ b/utils/Makefile
|
||||||
|
@@ -45,7 +45,7 @@ endif
|
||||||
|
|
||||||
|
override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS)
|
||||||
|
override LDFLAGS += -L../src
|
||||||
|
-override LDLIBS += -lselinux
|
||||||
|
+override LDLIBS += -lselinux $(FTS_LDLIBS)
|
||||||
|
PCRE_LDLIBS ?= -lpcre
|
||||||
|
|
||||||
|
ifeq ($(ANDROID_HOST),y)
|
||||||
|
|
||||||
@ -1,207 +0,0 @@
|
|||||||
From 89c296e7e9219f54c74f8c3f42940100cbcac962 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Lautrbach <plautrba@redhat.com>
|
|
||||||
Date: Fri, 7 Jun 2019 17:35:44 +0200
|
|
||||||
Subject: [PATCH] libselinux: Use Python distutils to install SELinux python
|
|
||||||
bindings
|
|
||||||
|
|
||||||
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 "<stdin>", line 1, in <module>
|
|
||||||
File "/usr/lib64/python3.7/site-packages/selinux/__init__.py", line 13, in <module>
|
|
||||||
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 <plautrba@redhat.com>
|
|
||||||
[Upstream: commit 2efa06857575e4118e91ca250b6b92da68b130d5]
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
---
|
|
||||||
src/.gitignore | 2 +-
|
|
||||||
src/Makefile | 36 ++++++++----------------------------
|
|
||||||
src/setup.py | 24 ++++++++++++++++++++++++
|
|
||||||
3 files changed, 33 insertions(+), 29 deletions(-)
|
|
||||||
create mode 100644 libselinux/src/setup.py
|
|
||||||
|
|
||||||
diff --git a/src/.gitignore b/src/.gitignore
|
|
||||||
index 4dcc3b3b..428afe5a 100644
|
|
||||||
--- a/src/.gitignore
|
|
||||||
+++ b/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/src/Makefile b/src/Makefile
|
|
||||||
index e9ed0383..2b1696a0 100644
|
|
||||||
--- a/src/Makefile
|
|
||||||
+++ b/src/Makefile
|
|
||||||
@@ -36,7 +36,7 @@ TARGET=libselinux.so
|
|
||||||
LIBPC=libselinux.pc
|
|
||||||
SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i
|
|
||||||
SWIGRUBYIF= selinuxswig_ruby.i
|
|
||||||
-SWIGCOUT= selinuxswig_wrap.c
|
|
||||||
+SWIGCOUT= selinuxswig_python_wrap.c
|
|
||||||
SWIGPYOUT= selinux.py
|
|
||||||
SWIGRUBYCOUT= selinuxswig_ruby_wrap.c
|
|
||||||
SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT))
|
|
||||||
@@ -55,7 +55,7 @@ ifeq ($(LIBSEPOLA),)
|
|
||||||
LDLIBS_LIBSEPOLA := -l:libsepol.a
|
|
||||||
endif
|
|
||||||
|
|
||||||
-GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i
|
|
||||||
+GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) $(SWIGCOUT) selinuxswig_python_exception.i
|
|
||||||
SRCS= $(filter-out $(GENERATED) audit2why.c, $(sort $(wildcard *.c)))
|
|
||||||
|
|
||||||
MAX_STACK_SIZE=32768
|
|
||||||
@@ -125,25 +125,18 @@ DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
|
|
||||||
SRCS:= $(filter-out label_backends_android.c, $(SRCS))
|
|
||||||
endif
|
|
||||||
|
|
||||||
-SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS)
|
|
||||||
-
|
|
||||||
SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)
|
|
||||||
|
|
||||||
all: $(LIBA) $(LIBSO) $(LIBPC)
|
|
||||||
|
|
||||||
-pywrap: all $(SWIGFILES) $(AUDIT2WHYSO)
|
|
||||||
+pywrap: all selinuxswig_python_exception.i
|
|
||||||
+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR)
|
|
||||||
|
|
||||||
rubywrap: all $(SWIGRUBYSO)
|
|
||||||
|
|
||||||
-$(SWIGLOBJ): $(SWIGCOUT)
|
|
||||||
- $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<
|
|
||||||
-
|
|
||||||
$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
|
|
||||||
$(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
|
|
||||||
|
|
||||||
-$(SWIGSO): $(SWIGLOBJ)
|
|
||||||
- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $< -lselinux $(PYLIBS)
|
|
||||||
-
|
|
||||||
$(SWIGRUBYSO): $(SWIGRUBYLOBJ)
|
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(RUBYLIBS)
|
|
||||||
|
|
||||||
@@ -161,29 +154,15 @@ $(LIBPC): $(LIBPC).in ../VERSION
|
|
||||||
selinuxswig_python_exception.i: ../include/selinux/selinux.h
|
|
||||||
bash -e exception.sh > $@ || (rm -f $@ ; false)
|
|
||||||
|
|
||||||
-$(AUDIT2WHYLOBJ): audit2why.c
|
|
||||||
- $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
|
|
||||||
-
|
|
||||||
-$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA)
|
|
||||||
- $(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(LDLIBS_LIBSEPOLA) $(PYLIBS) -Wl,-soname,audit2why.so,--version-script=audit2why.map,-z,defs
|
|
||||||
-
|
|
||||||
%.o: %.c policy.h
|
|
||||||
$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
|
|
||||||
|
|
||||||
%.lo: %.c policy.h
|
|
||||||
$(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $<
|
|
||||||
|
|
||||||
-$(SWIGCOUT): $(SWIGIF)
|
|
||||||
- $(SWIG) $<
|
|
||||||
-
|
|
||||||
-$(SWIGPYOUT): $(SWIGCOUT)
|
|
||||||
-
|
|
||||||
$(SWIGRUBYCOUT): $(SWIGRUBYIF)
|
|
||||||
$(SWIGRUBY) $<
|
|
||||||
|
|
||||||
-swigify: $(SWIGIF)
|
|
||||||
- $(SWIG) $<
|
|
||||||
-
|
|
||||||
install: all
|
|
||||||
test -d $(DESTDIR)$(LIBDIR) || install -m 755 -d $(DESTDIR)$(LIBDIR)
|
|
||||||
install -m 644 $(LIBA) $(DESTDIR)$(LIBDIR)
|
|
||||||
@@ -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)
|
|
||||||
+ $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
|
|
||||||
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 +186,8 @@ relabel:
|
|
||||||
|
|
||||||
clean-pywrap:
|
|
||||||
-rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO)
|
|
||||||
+ $(PYTHON) setup.py clean
|
|
||||||
+ -rm -rf build *~ \#* *pyc .#*
|
|
||||||
|
|
||||||
clean-rubywrap:
|
|
||||||
-rm -f $(SWIGRUBYLOBJ) $(SWIGRUBYSO)
|
|
||||||
diff --git a/src/setup.py b/src/setup.py
|
|
||||||
new file mode 100644
|
|
||||||
index 00000000..4dc03f55
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/setup.py
|
|
||||||
@@ -0,0 +1,24 @@
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
+
|
|
||||||
+from distutils.core import Extension, setup
|
|
||||||
+
|
|
||||||
+setup(
|
|
||||||
+ name="selinux",
|
|
||||||
+ version="2.9",
|
|
||||||
+ description="SELinux python 3 bindings",
|
|
||||||
+ author="SELinux Project",
|
|
||||||
+ author_email="selinux@vger.kernel.org",
|
|
||||||
+ ext_modules=[
|
|
||||||
+ Extension('selinux._selinux',
|
|
||||||
+ sources=['selinuxswig_python.i'],
|
|
||||||
+ include_dirs=['../include'],
|
|
||||||
+ library_dirs=['.'],
|
|
||||||
+ libraries=['selinux']),
|
|
||||||
+ Extension('selinux.audit2why',
|
|
||||||
+ sources=['audit2why.c'],
|
|
||||||
+ include_dirs=['../include'],
|
|
||||||
+ library_dirs=['.'],
|
|
||||||
+ libraries=['selinux'],
|
|
||||||
+ extra_link_args=['-l:libsepol.a', '-Wl,--version-script=audit2why.map'])
|
|
||||||
+ ],
|
|
||||||
+)
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 4b1568bce5bbdc7bf76a4bbf1066ba7e7b84649f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
Date: Fri, 25 Oct 2019 11:45:04 +0200
|
|
||||||
Subject: [PATCH] src/Makefile: don't pass bogus -I and -L to python setup.py
|
|
||||||
build_ext
|
|
||||||
|
|
||||||
Using $(DESTDIR) during the build does not follow the normal/standard
|
|
||||||
semantic of DESTDIR: it is normally only needed during the
|
|
||||||
installation. Therefore, a lot of build systems/environments don't
|
|
||||||
pass any DESTDIR at build time, which causes setup.py to be called
|
|
||||||
with -I /usr/include -L /usr/lib, which breaks cross-compilation.
|
|
||||||
|
|
||||||
[Upstream: https://github.com/SELinuxProject/selinux/pull/183]
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
---
|
|
||||||
src/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/Makefile b/src/Makefile
|
|
||||||
index 2b1696a0..3b8bad81 100644
|
|
||||||
--- a/src/Makefile
|
|
||||||
+++ b/src/Makefile
|
|
||||||
@@ -130,7 +130,7 @@ SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)
|
|
||||||
all: $(LIBA) $(LIBSO) $(LIBPC)
|
|
||||||
|
|
||||||
pywrap: all selinuxswig_python_exception.i
|
|
||||||
- CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext -I $(DESTDIR)$(INCLUDEDIR) -L $(DESTDIR)$(LIBDIR)
|
|
||||||
+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) setup.py build_ext
|
|
||||||
|
|
||||||
rubywrap: all $(SWIGRUBYSO)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
|
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
|
||||||
sha256 1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693 libselinux-2.9.tar.gz
|
sha256 2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 libselinux-3.0.tar.gz
|
||||||
|
|
||||||
# Hash for license file
|
# Hash for license file
|
||||||
sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
|
sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBSELINUX_VERSION = 2.9
|
LIBSELINUX_VERSION = 3.0
|
||||||
LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20190315
|
LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20191204
|
||||||
LIBSELINUX_LICENSE = Public Domain
|
LIBSELINUX_LICENSE = Public Domain
|
||||||
LIBSELINUX_LICENSE_FILES = LICENSE
|
LIBSELINUX_LICENSE_FILES = LICENSE
|
||||||
|
|
||||||
@ -27,18 +27,12 @@ LIBSELINUX_DEPENDENCIES += musl-fts
|
|||||||
LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts
|
LIBSELINUX_MAKE_OPTS += FTS_LDLIBS=-lfts
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
|
|
||||||
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||||
LIBSELINUX_DEPENDENCIES += python3 host-swig
|
LIBSELINUX_DEPENDENCIES += python3 host-swig
|
||||||
LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
|
|
||||||
else ifeq ($(BR2_PACKAGE_PYTHON),y)
|
|
||||||
LIBSELINUX_DEPENDENCIES += python host-swig
|
|
||||||
LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBSELINUX_MAKE_OPTS += \
|
LIBSELINUX_MAKE_OPTS += \
|
||||||
$(PKG_PYTHON_DISTUTILS_ENV) \
|
$(PKG_PYTHON_DISTUTILS_ENV) \
|
||||||
PYTHON=$(LIBSELINUX_PYLIBVER)
|
PYTHON=python$(PYTHON3_VERSION_MAJOR)
|
||||||
|
|
||||||
LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap
|
LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap
|
||||||
|
|
||||||
@ -49,7 +43,7 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS
|
|||||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||||
$(LIBSELINUX_MAKE_OPTS) swigify pywrap
|
$(LIBSELINUX_MAKE_OPTS) swigify pywrap
|
||||||
endef
|
endef
|
||||||
endif # python || python3
|
endif # python3
|
||||||
|
|
||||||
# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc
|
# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc
|
||||||
# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the
|
# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the
|
||||||
@ -82,15 +76,7 @@ define LIBSELINUX_INSTALL_TARGET_CMDS
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
HOST_LIBSELINUX_DEPENDENCIES = \
|
HOST_LIBSELINUX_DEPENDENCIES = \
|
||||||
host-libsepol host-pcre host-swig
|
host-libsepol host-pcre host-swig host-python3
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
|
||||||
HOST_LIBSELINUX_DEPENDENCIES += host-python3
|
|
||||||
HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
|
|
||||||
else
|
|
||||||
HOST_LIBSELINUX_DEPENDENCIES += host-python
|
|
||||||
HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
HOST_LIBSELINUX_MAKE_OPTS = \
|
HOST_LIBSELINUX_MAKE_OPTS = \
|
||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
@ -98,7 +84,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \
|
|||||||
SHLIBDIR=$(HOST_DIR)/lib \
|
SHLIBDIR=$(HOST_DIR)/lib \
|
||||||
LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \
|
LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \
|
||||||
$(HOST_PKG_PYTHON_DISTUTILS_ENV) \
|
$(HOST_PKG_PYTHON_DISTUTILS_ENV) \
|
||||||
PYTHON=$(HOST_LIBSELINUX_PYLIBVER)
|
PYTHON=python$(PYTHON3_VERSION_MAJOR)
|
||||||
|
|
||||||
define HOST_LIBSELINUX_BUILD_CMDS
|
define HOST_LIBSELINUX_BUILD_CMDS
|
||||||
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
|
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user