diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2013-12-31 03:33:57 -0500 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2014-01-10 14:53:50 -0600 |
commit | 5f8eb4f68e5725297b3b789686e8709c95293152 (patch) | |
tree | 6a1869febabfecd8df36932c6df677eb40a8f0ca | |
parent | 7281cd0befb0993168336fd91ff38581976fd37a (diff) | |
download | meta-selinux-5f8eb4f68e5725297b3b789686e8709c95293152.tar.gz |
libselinux: migrate SRC_URI and patches to 2.2
These two patches are removed since they are merged by new version:
- libselinux-fix-init-load-policy.patch
- libselinux-pcre-link-order.patch
(From meta-selinux master rev: f04f030a1d19089580deb9905b0b24aaf53be750)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 files changed, 10 insertions, 66 deletions
diff --git a/recipes-security/selinux/libselinux/libselinux-fix-init-load-policy.patch b/recipes-security/selinux/libselinux/libselinux-fix-init-load-policy.patch deleted file mode 100644 index 67e32d6..0000000 --- a/recipes-security/selinux/libselinux/libselinux-fix-init-load-policy.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From ac70ca3b336b52b01cdc38157d25bf7e85098ee1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
3 | Date: Thu, 12 Apr 2012 16:10:10 +0800 | ||
4 | Subject: [PATCH] libselinux: fix init load policy | ||
5 | |||
6 | selinux_init_load_policy() would fail if we use the new mount point | ||
7 | for selinuxfs(/sys/fs/selinux) while sysfs(/sys) is still not | ||
8 | mounted. | ||
9 | --- | ||
10 | src/load_policy.c | 1 + | ||
11 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
12 | |||
13 | diff --git a/src/load_policy.c b/src/load_policy.c | ||
14 | index f569664..60e7efd 100644 | ||
15 | --- a/src/load_policy.c | ||
16 | +++ b/src/load_policy.c | ||
17 | @@ -370,6 +370,7 @@ int selinux_init_load_policy(int *enforce) | ||
18 | * mount it if present for use in the calls below. | ||
19 | */ | ||
20 | const char *mntpoint = NULL; | ||
21 | + rc = mount("sysfs", "/sys", "sysfs", 0, 0); | ||
22 | if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) { | ||
23 | mntpoint = SELINUXMNT; | ||
24 | } else { | ||
25 | -- | ||
26 | 1.7.5.4 | ||
27 | |||
diff --git a/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch b/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch deleted file mode 100644 index f011f1a..0000000 --- a/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Subject: [PATCH] libselinux: Put -lpcre in LDADD for correct linking order | ||
2 | |||
3 | Upstream-Status: pending | ||
4 | |||
5 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
6 | --- | ||
7 | src/Makefile | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/src/Makefile b/src/Makefile | ||
11 | index c4f5d4c..8f5aec5 100644 | ||
12 | --- a/src/Makefile | ||
13 | +++ b/src/Makefile | ||
14 | @@ -20,7 +20,7 @@ RUBYINC ?= $(shell pkg-config --cflags ruby) | ||
15 | RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) | ||
16 | LIBBASE=$(shell basename $(LIBDIR)) | ||
17 | |||
18 | -LDFLAGS ?= -lpcre -lpthread | ||
19 | +LDADD ?= -lpcre -lpthread | ||
20 | |||
21 | VERSION = $(shell cat ../VERSION) | ||
22 | LIBVERSION = 1 | ||
23 | @@ -116,7 +116,7 @@ $(LIBA): $(OBJS) | ||
24 | $(RANLIB) $@ | ||
25 | |||
26 | $(LIBSO): $(LOBJS) | ||
27 | - $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro | ||
28 | + $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro $(LDADD) | ||
29 | ln -sf $@ $(TARGET) | ||
30 | |||
31 | $(LIBPC): $(LIBPC).in ../VERSION | ||
diff --git a/recipes-security/selinux/libselinux_2.2.bb b/recipes-security/selinux/libselinux_2.2.bb index caed650..23bb9cb 100644 --- a/recipes-security/selinux/libselinux_2.2.bb +++ b/recipes-security/selinux/libselinux_2.2.bb | |||
@@ -1,16 +1,14 @@ | |||
1 | PR = "r0" | 1 | PR = "r0" |
2 | 2 | ||
3 | include selinux_20130423.inc | 3 | include selinux_20131030.inc |
4 | include ${BPN}.inc | 4 | include ${BPN}.inc |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "32bf7b5182977a8a9248a1eeefe49a22" | 8 | SRC_URI[md5sum] = "d82beab880749a017f2737e6687fec30" |
9 | SRC_URI[sha256sum] = "57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a" | 9 | SRC_URI[sha256sum] = "e9dc64216543a7283d786f623ac28e8867f8794138e7deba474a3aa8d02dce33" |
10 | 10 | ||
11 | SRC_URI += "\ | 11 | SRC_URI += "\ |
12 | file://libselinux-fix-init-load-policy.patch \ | ||
13 | file://libselinux-pcre-link-order.patch \ | ||
14 | file://libselinux-drop-Wno-unused-but-set-variable.patch \ | 12 | file://libselinux-drop-Wno-unused-but-set-variable.patch \ |
15 | file://libselinux-make-O_CLOEXEC-optional.patch \ | 13 | file://libselinux-make-O_CLOEXEC-optional.patch \ |
16 | file://libselinux-make-SOCK_CLOEXEC-optional.patch \ | 14 | file://libselinux-make-SOCK_CLOEXEC-optional.patch \ |
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb index 6f93fd4..fb4fef2 100644 --- a/recipes-security/selinux/libselinux_git.bb +++ b/recipes-security/selinux/libselinux_git.bb | |||
@@ -1,10 +1,14 @@ | |||
1 | PR = "r0" | 1 | PR = "r0" |
2 | PV = "2.1.13+git${SRCPV}" | 2 | PV = "2.2+git${SRCPV}" |
3 | 3 | ||
4 | include selinux_git.inc | 4 | include selinux_git.inc |
5 | include ${BPN}.inc | 5 | include ${BPN}.inc |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" |
8 | 8 | ||
9 | SRC_URI += "file://libselinux-fix-init-load-policy.patch \ | 9 | SRC_URI += "\ |
10 | file://libselinux-pcre-link-order.patch" | 10 | file://libselinux-drop-Wno-unused-but-set-variable.patch \ |
11 | file://libselinux-make-O_CLOEXEC-optional.patch \ | ||
12 | file://libselinux-make-SOCK_CLOEXEC-optional.patch \ | ||
13 | file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ | ||
14 | " | ||