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

libselinux: migrate SRC_URI and patches to 2.2

Browse Source 
These two patches are removed since they are merged by new version:
 - libselinux-fix-init-load-policy.patch
 - libselinux-pcre-link-order.patch

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
This commit is contained in:
Wenzong Fan 2013-12-31 03:33:57 -05:00 committed by Mark Hatle
parent a4b25c05a1
commit f04f030a1d
4 changed files with 10 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
recipes-security/selinux/libselinux/libselinux-fix-init-load-policy.patch
View File

@ -1,27 +0,0 @@
From ac70ca3b336b52b01cdc38157d25bf7e85098ee1 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@windriver.com>
Date: Thu, 12 Apr 2012 16:10:10 +0800
Subject: [PATCH] libselinux: fix init load policy
selinux_init_load_policy() would fail if we use the new mount point
for selinuxfs(/sys/fs/selinux) while sysfs(/sys) is still not
mounted.
---
src/load_policy.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/load_policy.c b/src/load_policy.c
index f569664..60e7efd 100644
--- a/src/load_policy.c
+++ b/src/load_policy.c
@@ -370,6 +370,7 @@ int selinux_init_load_policy(int *enforce)
* mount it if present for use in the calls below.
*/
const char *mntpoint = NULL;
+ rc = mount("sysfs", "/sys", "sysfs", 0, 0);
if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
mntpoint = SELINUXMNT;
} else {
--
1.7.5.4

31
recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch
View File

@ -1,31 +0,0 @@
Subject: [PATCH] libselinux: Put -lpcre in LDADD for correct linking order
Upstream-Status: pending
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
---
src/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index c4f5d4c..8f5aec5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ RUBYINC ?= $(shell pkg-config --cflags ruby)
RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
LIBBASE=$(shell basename $(LIBDIR))
-LDFLAGS ?= -lpcre -lpthread
+LDADD ?= -lpcre -lpthread
VERSION = $(shell cat ../VERSION)
LIBVERSION = 1
@@ -116,7 +116,7 @@ $(LIBA): $(OBJS)
$(RANLIB) $@
$(LIBSO): $(LOBJS)
- $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+ $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro $(LDADD)
ln -sf $@ $(TARGET)
$(LIBPC): $(LIBPC).in ../VERSION

8
recipes-security/selinux/libselinux_2.2.bb
View File

@ -1,16 +1,14 @@
PR = "r0"
include selinux_20130423.inc
include selinux_20131030.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
SRC_URI[md5sum] = "32bf7b5182977a8a9248a1eeefe49a22"
SRC_URI[sha256sum] = "57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a"
SRC_URI[md5sum] = "d82beab880749a017f2737e6687fec30"
SRC_URI[sha256sum] = "e9dc64216543a7283d786f623ac28e8867f8794138e7deba474a3aa8d02dce33"
SRC_URI += "\
file://libselinux-fix-init-load-policy.patch \
file://libselinux-pcre-link-order.patch \
file://libselinux-drop-Wno-unused-but-set-variable.patch \
file://libselinux-make-O_CLOEXEC-optional.patch \
file://libselinux-make-SOCK_CLOEXEC-optional.patch \

10
recipes-security/selinux/libselinux_git.bb
View File

@ -1,10 +1,14 @@
PR = "r0"
PV = "2.1.13+git${SRCPV}"
PV = "2.2+git${SRCPV}"
include selinux_git.inc
include ${BPN}.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
SRC_URI += "file://libselinux-fix-init-load-policy.patch \
file://libselinux-pcre-link-order.patch"
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 \
"