CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libselinux: upgrade to 3.0 (20191204)

Browse Source 
* Backport a patch to fix build failure with musl.
* Fix typos in patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Yi Zhao 2020-04-14 15:41:46 +08:00 committed by Joe MacDonald
parent 1735987a64
commit a1db7a9925
6 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
recipes-security/selinux/libselinux/0001-Fix-building-against-musl-and-uClibc-libc-libraries.patch Normal file
View File

@ -0,0 +1,38 @@
From 61bfcbffce32be51d712040c3f84293b78428184 Mon Sep 17 00:00:00 2001
From: Adam Duskett <Aduskett@gmail.com>
Date: Tue, 7 Apr 2020 13:53:05 -0700
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>
Upstream-Status: Backport
[https://github.com/SELinuxProject/selinux/commit/aa40067b7b86d5e4c951fccae1aa98baff148613]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
utils/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/Makefile b/utils/Makefile
index 3615063..a5632b7 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)
--
2.7.4

2
recipes-security/selinux/libselinux/libselinux-define-FD_CLOEXEC-as-necessary.patch
View File

@ -7,7 +7,7 @@ In truly old systems, even FD_CLOEXEC may not be defined. Produce a
warning and duplicate the #define for FD_CLOEXEC found in
asm-generic/fcntl.h on more modern platforms.
Uptream-Status: Inappropriate
Upstream-Status: Inappropriate
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>

2
recipes-security/selinux/libselinux/libselinux-drop-Wno-unused-but-set-variable.patch
View File

@ -3,7 +3,7 @@ From: Randy MacLeod <Randy.MacLeod@windriver.com>
Date: Tue, 30 Apr 2013 17:28:34 -0400
Subject: [PATCH] libselinux: drop flag: -Wno-unused-but-set-variable
Upstream status: inappropriate (older compilers only).
Upstream status: Inappropriate [older compilers only]
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>

2
recipes-security/selinux/libselinux/libselinux-make-O_CLOEXEC-optional.patch
View File

@ -14,7 +14,7 @@ compile-time option and generate a warning when it is not available. The
actual impact of leaking these file descriptors is minimal, though it does
produce curious AVC Denied messages.
Uptream-Status: Inappropriate [O_CLOEXEC has been in Linux since 2007 and POSIX since 2008]
Upstream-Status: Inappropriate [O_CLOEXEC has been in Linux since 2007 and POSIX since 2008]
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>

2
recipes-security/selinux/libselinux/libselinux-make-SOCK_CLOEXEC-optional.patch
View File

@ -9,7 +9,7 @@ SOCK_CLOEXEC suffers the same problem as O_CLOEXEC on some older
platforms, we need to ensure we protect the references it it in the same
way.
Uptream-Status: Inappropriate
Upstream-Status: Inappropriate
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>

7
recipes-security/selinux/libselinux_2.9.bb → recipes-security/selinux/libselinux_3.0.bb
View File

@ -1,14 +1,15 @@
require selinux_20190315.inc
require selinux_20191204.inc
require ${BPN}.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
SRC_URI[md5sum] = "bb449431b6ed55a0a0496dbc366d6e31"
SRC_URI[sha256sum] = "1bccc8873e449587d9a2b2cf253de9b89a8291b9fbc7c59393ca9e5f5f4d2693"
SRC_URI[md5sum] = "b387a66f087b6d97713570e85ec89d89"
SRC_URI[sha256sum] = "2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433"
SRC_URI += "\
file://libselinux-drop-Wno-unused-but-set-variable.patch \
file://libselinux-make-O_CLOEXEC-optional.patch \
file://libselinux-make-SOCK_CLOEXEC-optional.patch \
file://libselinux-define-FD_CLOEXEC-as-necessary.patch \
file://0001-Fix-building-against-musl-and-uClibc-libc-libraries.patch \
"