From 08f3aebc01aed6cea91a80c5e9c9f5e8588deebe Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 5 Sep 2018 08:18:13 +0800 Subject: libsepol: uprev to 2.8 (20180524) Rebase patch: 0001-src-Makefile-fix-includedir-in-libsepol.pc.patch Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- .../0001-src-Makefile-fix-includedir-in-libsepol.pc.patch | 13 +++++++------ recipes-security/selinux/libsepol_2.7.bb | 9 --------- recipes-security/selinux/libsepol_2.8.bb | 9 +++++++++ 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 recipes-security/selinux/libsepol_2.7.bb create mode 100644 recipes-security/selinux/libsepol_2.8.bb 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 index 8a6e047..987fdab 100644 --- 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 @@ -1,4 +1,4 @@ -From 05907644755048f9335e05dc540f810bb580477f Mon Sep 17 00:00:00 2001 +From 074dbf2f104d1a6ea1aa048600f44f9701c70a60 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 18 Feb 2016 02:04:59 +0000 Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc @@ -6,23 +6,24 @@ Subject: [PATCH] src/Makefile: fix includedir in libsepol.pc Upstream-Status: Pending Signed-off-by: Robert Yang +Signed-off-by: Yi Zhao --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index db6c2ba..c03ee92 100644 +index ccb7023..2bb6290 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -43,7 +43,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) +@@ -51,7 +51,7 @@ $(LIBSO): $(LOBJS) $(LIBMAP) ln -sf $@ $(TARGET) $(LIBPC): $(LIBPC).in ../VERSION -- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ -+ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:${prefix}/include:' < $< > $@ +- sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@ ++ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:' < $< > $@ $(LIBMAP): $(LIBMAP).in ifneq ($(DISABLE_CIL),y) -- -2.5.0 +2.7.4 diff --git a/recipes-security/selinux/libsepol_2.7.bb b/recipes-security/selinux/libsepol_2.7.bb deleted file mode 100644 index f38f7ba..0000000 --- a/recipes-security/selinux/libsepol_2.7.bb +++ /dev/null @@ -1,9 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "9424b93fd6efd853b9360f29265c5aa3" -SRC_URI[sha256sum] = "d69d3bd8ec901a3bd5adf2be2fb47fb1a685ed73066ab482e7e505371a48f9e7" - -SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch" diff --git a/recipes-security/selinux/libsepol_2.8.bb b/recipes-security/selinux/libsepol_2.8.bb new file mode 100644 index 0000000..d1f905b --- /dev/null +++ b/recipes-security/selinux/libsepol_2.8.bb @@ -0,0 +1,9 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "c19aa9dde1e78d1c2bd3109579e4d484" +SRC_URI[sha256sum] = "3ad6916a8352bef0bad49acc8037a5f5b48c56f94e4cb4e1959ca475fa9d24d6" + +SRC_URI += "file://0001-src-Makefile-fix-includedir-in-libsepol.pc.patch" -- cgit v1.2.3-54-g00ecf