From 883a6d9c6569b27482aee6cf4a3788b0625a811c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 5 Sep 2018 08:18:15 +0800 Subject: libsemanage: uprev to 2.8 (20180524) Rebase patch: 0001-src-Makefile-fix-includedir-in-libselinux.pc.patch Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- recipes-security/selinux/libsemanage.inc | 12 ++---------- ...rc-Makefile-fix-includedir-in-libselinux.pc.patch | 20 +++++++++++--------- recipes-security/selinux/libsemanage_2.7.bb | 18 ------------------ recipes-security/selinux/libsemanage_2.8.bb | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 37 deletions(-) delete mode 100644 recipes-security/selinux/libsemanage_2.7.bb create mode 100644 recipes-security/selinux/libsemanage_2.8.bb (limited to 'recipes-security/selinux') diff --git a/recipes-security/selinux/libsemanage.inc b/recipes-security/selinux/libsemanage.inc index d957d89..be0a5f1 100644 --- a/recipes-security/selinux/libsemanage.inc +++ b/recipes-security/selinux/libsemanage.inc @@ -32,18 +32,10 @@ do_compile_append() { PYTHONLIBDIR='${PYLIB}' } -do_install() { - oe_runmake install \ - DESTDIR="${D}" \ - PREFIX="${D}/${prefix}" \ - INCLUDEDIR="${D}/${includedir}" \ - LIBDIR="${D}/${libdir}" \ - SHLIBDIR="${D}/${libdir}" - +do_install_append() { oe_runmake install-pywrap swigify \ - DESTDIR=${D} \ PYCEXT='.so' \ - PYSITEDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ + PYTHONLIBDIR='${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ PYLIBVER='python${PYTHON_BASEVERSION}' \ PYLIBDIR='${D}/${libdir}/$(PYLIBVER)' diff --git a/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch b/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch index 3d1e110..73613d3 100644 --- a/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +++ b/recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch @@ -1,4 +1,4 @@ -From 992d02fe0d08361529a5d158119c02521786798f Mon Sep 17 00:00:00 2001 +From e773c0952b06370d81e9b113f9b0b3388e323e52 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 18 Feb 2016 02:39:16 +0000 Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc @@ -6,21 +6,23 @@ Subject: [PATCH] src/Makefile: fix includedir in libselinux.pc Upstream-Status: Pending Signed-off-by: Robert Yang - +Signed-off-by: Yi Zhao --- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/Makefile | 1 + + 1 file changed, 1 insertion(+) diff --git a/src/Makefile b/src/Makefile -index e8831ab..d3d4644 100644 +index dea751e..4af4568 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -103,7 +103,7 @@ $(LIBSO): $(LOBJS) - ln -sf $@ $(TARGET) +@@ -93,6 +93,7 @@ $(LIBSO): $(LOBJS) $(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:' < $< > $@ semanageswig_python_exception.i: ../include/semanage/semanage.h bash -e exception.sh > $@ || (rm -f $@ ; false) +-- +2.7.4 + diff --git a/recipes-security/selinux/libsemanage_2.7.bb b/recipes-security/selinux/libsemanage_2.7.bb deleted file mode 100644 index d7b5312..0000000 --- a/recipes-security/selinux/libsemanage_2.7.bb +++ /dev/null @@ -1,18 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "a6b5c451fbe45ff9e3e0e65f2db0ae1d" -SRC_URI[sha256sum] = "07e9477714ce6a4557a1fe924ea4cb06501b62d0fa0e3c0dc32a2cf47cb8d476" - -SRC_URI += "\ - file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ - file://libsemanage-fix-path-nologin.patch \ - file://libsemanage-drop-Wno-unused-but-set-variable.patch \ - file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ - file://libsemanage-allow-to-disable-audit-support.patch \ - file://libsemanage-disable-expand-check-on-policy-load.patch \ - file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \ - " -FILES_${PN} += "/usr/libexec" diff --git a/recipes-security/selinux/libsemanage_2.8.bb b/recipes-security/selinux/libsemanage_2.8.bb new file mode 100644 index 0000000..38942e3 --- /dev/null +++ b/recipes-security/selinux/libsemanage_2.8.bb @@ -0,0 +1,18 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "62ed7bb2ede677a735f2750751677a4f" +SRC_URI[sha256sum] = "1c0de8d2c51e5460926c21e371105c84a39087dfd8f8e9f0cc1d017e4cbea8e2" + +SRC_URI += "\ + file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ + file://libsemanage-fix-path-nologin.patch \ + file://libsemanage-drop-Wno-unused-but-set-variable.patch \ + file://libsemanage-define-FD_CLOEXEC-as-necessary.patch;striplevel=2 \ + file://libsemanage-allow-to-disable-audit-support.patch \ + file://libsemanage-disable-expand-check-on-policy-load.patch \ + file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \ + " +FILES_${PN} += "/usr/libexec" -- cgit v1.2.3-54-g00ecf