mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/libselinux: bump version to 3.10
https://github.com/SELinuxProject/selinux/releases/tag/3.10 Rebased patch 0001 due to inclusion of patch 0003 in this release. Removed patch 0003 which is included in this release. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
11e5c1ffdf
commit
768f16502a
@@ -20,6 +20,8 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
|||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||||
[Refreshed for 3.5]
|
[Refreshed for 3.5]
|
||||||
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
||||||
|
[Refreshed for 3.10]
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||||
---
|
---
|
||||||
src/Makefile | 3 +--
|
src/Makefile | 3 +--
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
@@ -38,7 +40,7 @@ index 190016e2af34..7ee22fd35da3 100644
|
|||||||
RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]')
|
RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]')
|
||||||
@@ -195,7 +194,7 @@ install: all
|
@@ -195,7 +194,7 @@ install: all
|
||||||
install-pywrap: pywrap
|
install-pywrap: pywrap
|
||||||
CFLAGS="$(CPPFLAGS) $(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) .
|
CFLAGS="$(CPPFLAGS) $(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --no-build-isolation --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) .
|
||||||
install -m 644 $(SWIGPYOUT) $(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)
|
- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
|
||||||
+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/
|
+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
From 8cfe4535f23a7768ee5efa615d11563a8404777c Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
||||||
Date: Mon, 27 Oct 2025 22:40:59 +0100
|
|
||||||
Subject: [PATCH] libselinux/src/Makefile: build python module without
|
|
||||||
isolation
|
|
||||||
|
|
||||||
The "pip install" logic in libselinux/src/Makefile tries to get
|
|
||||||
setuptools from the network, which is not correct as during the
|
|
||||||
build/installation, there shouldn't be any network access, or
|
|
||||||
downloading of arbitrary resources from the network.
|
|
||||||
|
|
||||||
This causes build issues in Debian:
|
|
||||||
|
|
||||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121121
|
|
||||||
|
|
||||||
And in Buildroot:
|
|
||||||
|
|
||||||
https://autobuild.buildroot.net/results/0e9/0e9de0c0d8b6ec57eea9f8834f02076b296ba4f1/build-end.log
|
|
||||||
|
|
||||||
To fix this, we use the --no-build-isolation pip install argument so
|
|
||||||
that pip install is allowed to use the system-provided setuptools,
|
|
||||||
instead of wanting to download this one.
|
|
||||||
|
|
||||||
This patch is derived from
|
|
||||||
https://sources.debian.org/src/libselinux/3.9-4/debian/patches/Build-python-module-without-isolation-Closes-1119155.patch,
|
|
||||||
with the change that --no-build-isolation is passed unconditionally,
|
|
||||||
regardless of whether $(DESTDIR) is empty or not.
|
|
||||||
|
|
||||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
||||||
Upstream: https://lore.kernel.org/selinux/20251227143911.1630813-1-thomas.petazzoni@bootlin.com/
|
|
||||||
---
|
|
||||||
libselinux/src/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
|
|
||||||
index e9141bb9..9bc10606 100644
|
|
||||||
--- a/src/Makefile
|
|
||||||
+++ b/src/Makefile
|
|
||||||
@@ -197,7 +197,7 @@ ifneq ($(DISABLE_SHARED),y)
|
|
||||||
endif
|
|
||||||
|
|
||||||
install-pywrap: pywrap
|
|
||||||
- CFLAGS="$(CPPFLAGS) $(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) .
|
|
||||||
+ CFLAGS="$(CPPFLAGS) $(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --no-build-isolation --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) .
|
|
||||||
install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py
|
|
||||||
ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/
|
|
||||||
|
|
||||||
--
|
|
||||||
2.52.0
|
|
||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
|
# From: https://github.com/SELinuxProject/selinux/wiki/Releases
|
||||||
sha256 e7ee2c01dba64a0c35c9d7c9c0e06209d8186b325b0638a0d83f915cc3c101e8 libselinux-3.9.tar.gz
|
sha256 1ef216c5b56fb7e0a51cd2909787a175a17ee391e0467894807873539ebe766b libselinux-3.10.tar.gz
|
||||||
|
|
||||||
# Hash for license file
|
# Hash for license file
|
||||||
sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
|
sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBSELINUX_VERSION = 3.9
|
LIBSELINUX_VERSION = 3.10
|
||||||
LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION)
|
LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION)
|
||||||
LIBSELINUX_LICENSE = Public Domain
|
LIBSELINUX_LICENSE = Public Domain
|
||||||
LIBSELINUX_LICENSE_FILES = LICENSE
|
LIBSELINUX_LICENSE_FILES = LICENSE
|
||||||
|
|||||||
Reference in New Issue
Block a user