summaryrefslogtreecommitdiffstats
path: root/recipes-security
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-11-14 09:48:45 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2019-12-19 11:09:21 -0500
commit5fbf7227c937324776586c27a99def853aae3a7a (patch)
tree9e3d57690c4cd2c4f1d82c198f6f5fad242336c6 /recipes-security
parenta4196eb8629072f292b7227b28084ce4df9680f8 (diff)
downloadmeta-selinux-5fbf7227c937324776586c27a99def853aae3a7a.tar.gz
libsepol: uprev to 2.9 (20190315)
* Drop patch 0001-src-Makefile-fix-includedir-in-libsepol.pc.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'recipes-security')
-rw-r--r--recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch29
-rw-r--r--recipes-security/selinux/libsepol_2.8.bb9
-rw-r--r--recipes-security/selinux/libsepol_2.9.bb7
3 files changed, 7 insertions, 38 deletions
diff --git a/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch b/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch
deleted file mode 100644
index 987fdab..0000000
--- a/recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 074dbf2f104d1a6ea1aa048600f44f9701c70a60 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 18 Feb 2016 02:04:59 +0000
4Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc
5
6Upstream-Status: Pending
7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
10---
11 src/Makefile | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/Makefile b/src/Makefile
15index ccb7023..2bb6290 100644
16--- a/src/Makefile
17+++ b/src/Makefile
18@@ -51,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP)
19 ln -sf $@ $(TARGET)
20
21 $(LIBPC): $(LIBPC).in ../VERSION
22- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
23+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:' < $< > $@
24
25 $(LIBMAP): $(LIBMAP).in
26 ifneq ($(DISABLE_CIL),y)
27--
282.7.4
29
diff --git a/recipes-security/selinux/libsepol_2.8.bb b/recipes-security/selinux/libsepol_2.8.bb
deleted file mode 100644
index d1f905b..0000000
--- a/recipes-security/selinux/libsepol_2.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1include selinux_20180524.inc
2include ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
5
6SRC_URI[md5sum] = "c19aa9dde1e78d1c2bd3109579e4d484"
7SRC_URI[sha256sum] = "3ad6916a8352bef0bad49acc8037a5f5b48c56f94e4cb4e1959ca475fa9d24d6"
8
9SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch"
diff --git a/recipes-security/selinux/libsepol_2.9.bb b/recipes-security/selinux/libsepol_2.9.bb
new file mode 100644
index 0000000..cd55be6
--- /dev/null
+++ b/recipes-security/selinux/libsepol_2.9.bb
@@ -0,0 +1,7 @@
1require selinux_20190315.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
5
6SRC_URI[md5sum] = "2fdefe870a61424d8f2d5d37551c6259"
7SRC_URI[sha256sum] = "a34b12b038d121e3e459b1cbaca3c9202e983137819c16baf63658390e3f1d5d"