selinux: upgrade 2.7 -> 2.8
cover selinux: upgrade 2.7 -> 2.8
Yi Zhao (16):
selinux: uprev inc files to 2.8 (20180524)
libsepol: uprev to 2.8 (20180524)
libselinux: uprev to 2.8 (20180524)
libsemanage: uprev to 2.8 (20180524)
checkpolicy: uprev to 2.8 (20180524)
secilc: uprev to 2.8 (20180524)
policycoreutils: uprev to 2.8 (20180524)
mcstrans: uprev to 2.8 (20180524)
restorecond: uprev to 2.8 (20180524)
selinux-sandbox: uprev to 2.8 (20180524)
selinux-python: uprev to 2.8 (20180524)
semodule-utils: uprev to 2.8 (20180524)
selinux-dbus: uprev to 2.8 (20180524)
selinux-gui: uprev to 2.8 (20180524)
packagegroup-selinux-policycoreutils: remove
semodule-utils-semodule-deps
audit: uprev to 2.8.4
.../audit/{audit_2.7.6.bb => audit_2.8.4.bb} | 18 +++++++-------
.../packagegroup-selinux-policycoreutils.bb | 1 -
recipes-security/selinux/checkpolicy.inc | 1 -
recipes-security/selinux/checkpolicy_2.7.bb | 7 ------
recipes-security/selinux/checkpolicy_2.8.bb | 7 ++++++
recipes-security/selinux/libselinux.inc | 2 +-
...-Makefile-fix-includedir-in-libselinux.pc.patch | 20 ++++++++-------
.../{libselinux_2.7.bb => libselinux_2.8.bb} | 6 ++---
recipes-security/selinux/libsemanage.inc | 12 ++-------
...-Makefile-fix-includedir-in-libselinux.pc.patch | 20 ++++++++-------
.../{libsemanage_2.7.bb => libsemanage_2.8.bb} | 6 ++---
...rc-Makefile-fix-includedir-in-libsepol.pc.patch | 13 +++++-----
recipes-security/selinux/libsepol_2.7.bb | 9 -------
recipes-security/selinux/libsepol_2.8.bb | 9 +++++++
recipes-security/selinux/mcstrans.inc | 1 -
recipes-security/selinux/mcstrans_2.7.bb | 7 ------
recipes-security/selinux/mcstrans_2.8.bb | 7 ++++++
recipes-security/selinux/policycoreutils.inc | 8 +++---
...policycoreutils-fix-fixfiles-install-path.patch | 29 ++++++++++++++++++++++
...icycoreutils-fix-load_policy-install-path.patch | 29 ++++++++++++++++++++++
.../policycoreutils-loadpolicy-symlink.patch | 19 --------------
recipes-security/selinux/policycoreutils_2.7.bb | 8 ------
recipes-security/selinux/policycoreutils_2.8.bb | 8 ++++++
recipes-security/selinux/restorecond.inc | 4 ---
recipes-security/selinux/restorecond_2.7.bb | 7 ------
recipes-security/selinux/restorecond_2.8.bb | 7 ++++++
recipes-security/selinux/secilc_2.7.bb | 7 ------
recipes-security/selinux/secilc_2.8.bb | 7 ++++++
recipes-security/selinux/selinux-dbus_2.7.bb | 7 ------
recipes-security/selinux/selinux-dbus_2.8.bb | 7 ++++++
recipes-security/selinux/selinux-gui_2.7.bb | 7 ------
recipes-security/selinux/selinux-gui_2.8.bb | 7 ++++++
recipes-security/selinux/selinux-python.inc | 2 +-
.../selinux-python/fix-sepolicy-install-path.patch | 23 +++++++++--------
recipes-security/selinux/selinux-python_2.7.bb | 7 ------
recipes-security/selinux/selinux-python_2.8.bb | 7 ++++++
recipes-security/selinux/selinux-sandbox_2.7.bb | 7 ------
recipes-security/selinux/selinux-sandbox_2.8.bb | 7 ++++++
.../{selinux_20170804.inc => selinux_20180524.inc} | 2 +-
recipes-security/selinux/selinux_common.inc | 9 ++++---
recipes-security/selinux/semodule-utils.inc | 2 --
recipes-security/selinux/semodule-utils_2.7.bb | 7 ------
recipes-security/selinux/semodule-utils_2.8.bb | 7 ++++++
43 files changed, 209 insertions(+), 178 deletions(-)
rename recipes-security/audit/{audit_2.7.6.bb => audit_2.8.4.bb} (91%)
delete mode 100644 recipes-security/selinux/checkpolicy_2.7.bb
create mode 100644 recipes-security/selinux/checkpolicy_2.8.bb
rename recipes-security/selinux/{libselinux_2.7.bb => libselinux_2.8.bb} (72%)
rename recipes-security/selinux/{libsemanage_2.7.bb => libsemanage_2.8.bb} (76%)
delete mode 100644 recipes-security/selinux/libsepol_2.7.bb
create mode 100644 recipes-security/selinux/libsepol_2.8.bb
delete mode 100644 recipes-security/selinux/mcstrans_2.7.bb
create mode 100644 recipes-security/selinux/mcstrans_2.8.bb
create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch
create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch
delete mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch
delete mode 100644 recipes-security/selinux/policycoreutils_2.7.bb
create mode 100644 recipes-security/selinux/policycoreutils_2.8.bb
delete mode 100644 recipes-security/selinux/restorecond_2.7.bb
create mode 100644 recipes-security/selinux/restorecond_2.8.bb
delete mode 100644 recipes-security/selinux/secilc_2.7.bb
create mode 100644 recipes-security/selinux/secilc_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-dbus_2.7.bb
create mode 100644 recipes-security/selinux/selinux-dbus_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-gui_2.7.bb
create mode 100644 recipes-security/selinux/selinux-gui_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-python_2.7.bb
create mode 100644 recipes-security/selinux/selinux-python_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-sandbox_2.7.bb
create mode 100644 recipes-security/selinux/selinux-sandbox_2.8.bb
rename recipes-security/selinux/{selinux_20170804.inc => selinux_20180524.inc} (84%)
delete mode 100644 recipes-security/selinux/semodule-utils_2.7.bb
create mode 100644 recipes-security/selinux/semodule-utils_2.8.bbSignature · 1 line
2.7.4
PATCH 1/16 selinux: uprev inc files to 2.8 (20180524)
---
.../selinux/{selinux_20170804.inc => selinux_20180524.inc} | 2 +-
recipes-security/selinux/selinux_common.inc | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
rename recipes-security/selinux/{selinux_20170804.inc => selinux_20180524.inc} (84%)recipes-security/selinux/selinux_20180524.inc renamed from recipes-security/selinux/selinux_20170804.inc +1 -1
@@ -1,4 +1,4 @@ -SELINUX_RELEASE = "20170804" +SELINUX_RELEASE = "20180524" SRC_URI = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz"
recipes-security/selinux/selinux_common.inc +5 -4
@@ -9,8 +9,9 @@ do_compile() { do_install() { oe_runmake install \ DESTDIR="${D}" \ - PREFIX="${D}/${prefix}" \ - INCLUDEDIR="${D}/${includedir}" \ - LIBDIR="${D}/${libdir}" \ - SHLIBDIR="${D}/${base_libdir}" + PREFIX="${prefix}" \ + INCLUDEDIR="${includedir}" \ + LIBDIR="${libdir}" \ + SHLIBDIR="${base_libdir}" \ + SYSTEMDDIR="${systemd_unitdir}" }
Signature · 1 line
2.7.4
PATCH 2/16 libsepol: uprev to 2.8 (20180524)
In reply to Yi ZhaoRebase patch:
0001-src-Makefile-fix-includedir-in-libsepol.pc.patch
--- .../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
recipes-security/selinux/libsepol/0001-src-Makefile-fix-includedir-in-libsepol.pc.patch +7 -6
@@ -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 <[email protected]> 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 <[email protected]> +Signed-off-by: Yi Zhao <[email protected]> --- 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
recipes-security/selinux/libsepol_2.7.bb deleted +0 -9
@@ -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"
recipes-security/selinux/libsepol_2.8.bb new file +9 -0
@@ -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"
Signature · 1 line
2.7.4
PATCH 3/16 libselinux: uprev to 2.8 (20180524)
In reply to Yi ZhaoRebase patch:
0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
---
recipes-security/selinux/libselinux.inc | 2 +-
...rc-Makefile-fix-includedir-in-libselinux.pc.patch | 20 +++++++++++---------
.../selinux/{libselinux_2.7.bb => libselinux_2.8.bb} | 6 +++---
3 files changed, 15 insertions(+), 13 deletions(-)
rename recipes-security/selinux/{libselinux_2.7.bb => libselinux_2.8.bb} (72%)recipes-security/selinux/libselinux.inc +1 -1
@@ -33,7 +33,7 @@ do_compile_append() { do_install_append() { oe_runmake install-pywrap swigify \ - PYSITEDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages + PYTHONLIBDIR=${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages rm -rf ${D}${base_sbindir} }
recipes-security/selinux/libselinux/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +11 -9
@@ -1,4 +1,4 @@ -From 3f633e310851cb029cb4f38d9e11a3aaef8d1099 Mon Sep 17 00:00:00 2001 +From 37f3299e8f5c468fe692f36356c2c35f968b6aee Mon Sep 17 00:00:00 2001 From: Robert Yang <[email protected]> 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 <[email protected]> - +Signed-off-by: Yi Zhao <[email protected]> --- - 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 a89c0f7..f304032 100644 +index 977b5c8..92a4289 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -148,7 +148,7 @@ $(LIBSO): $(LOBJS) - ln -sf $@ $(TARGET) +@@ -156,6 +156,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):; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ ++ sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:${libdir}:; s:@includedir@:${prefix}/include:; s:@PCRE_MODULE@:$(PCRE_MODULE):' < $< > $@ selinuxswig_python_exception.i: ../include/selinux/selinux.h bash -e exception.sh > $@ || (rm -f $@ ; false) +-- +2.7.4 +
recipes-security/selinux/libselinux_2.8.bb renamed from recipes-security/selinux/libselinux_2.7.bb +3 -3
@@ -1,10 +1,10 @@ -include selinux_20170804.inc +include selinux_20180524.inc include ${BPN}.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" -SRC_URI[md5sum] = "1d48ee4e9fadd76794d70c806b69ba7d" -SRC_URI[sha256sum] = "d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57" +SRC_URI[md5sum] = "56057e60192b21122c1aede8ff723ca2" +SRC_URI[sha256sum] = "31db96ec7643ce10912b3c3f98506a08a9116dcfe151855fd349c3fda96187e1" SRC_URI += "\ file://libselinux-drop-Wno-unused-but-set-variable.patch \
Signature · 1 line
2.7.4
PATCH 4/16 libsemanage: uprev to 2.8 (20180524)
In reply to Yi ZhaoRebase patch:
0001-src-Makefile-fix-includedir-in-libselinux.pc.patch
---
recipes-security/selinux/libsemanage.inc | 12 ++----------
...rc-Makefile-fix-includedir-in-libselinux.pc.patch | 20 +++++++++++---------
.../{libsemanage_2.7.bb => libsemanage_2.8.bb} | 6 +++---
3 files changed, 16 insertions(+), 22 deletions(-)
rename recipes-security/selinux/{libsemanage_2.7.bb => libsemanage_2.8.bb} (76%)recipes-security/selinux/libsemanage.inc +2 -10
@@ -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)'
recipes-security/selinux/libsemanage/0001-src-Makefile-fix-includedir-in-libselinux.pc.patch +11 -9
@@ -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 <[email protected]> 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 <[email protected]> - +Signed-off-by: Yi Zhao <[email protected]> --- - 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 +
recipes-security/selinux/libsemanage_2.8.bb renamed from recipes-security/selinux/libsemanage_2.7.bb +3 -3
@@ -1,10 +1,10 @@ -include selinux_20170804.inc +include selinux_20180524.inc include ${BPN}.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[md5sum] = "a6b5c451fbe45ff9e3e0e65f2db0ae1d" -SRC_URI[sha256sum] = "07e9477714ce6a4557a1fe924ea4cb06501b62d0fa0e3c0dc32a2cf47cb8d476" +SRC_URI[md5sum] = "62ed7bb2ede677a735f2750751677a4f" +SRC_URI[sha256sum] = "1c0de8d2c51e5460926c21e371105c84a39087dfd8f8e9f0cc1d017e4cbea8e2" SRC_URI += "\ file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \
Signature · 1 line
2.7.4
PATCH 5/16 checkpolicy: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/checkpolicy.inc | 1 - recipes-security/selinux/checkpolicy_2.7.bb | 7 ------- recipes-security/selinux/checkpolicy_2.8.bb | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy_2.7.bb create mode 100644 recipes-security/selinux/checkpolicy_2.8.bb
recipes-security/selinux/checkpolicy.inc +0 -1
@@ -11,7 +11,6 @@ LICENSE = "GPLv2+" DEPENDS += "libsepol bison-native flex-native" -EXTRA_OEMAKE += "PREFIX=${D}" EXTRA_OEMAKE += "LEX='flex'" EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a"
recipes-security/selinux/checkpolicy_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "5c718eaad4d3015bd5665ffde77b50fd" -SRC_URI[sha256sum] = "5413479f1dcde866c19896b4dbfec315d822aa431606e1d03c944408984c3201"
recipes-security/selinux/checkpolicy_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "5d23a3209048c8cf70f3c13c4ce4245f" +SRC_URI[sha256sum] = "9dec811c24b88e58c3bf741365eacf1dbb945531a2fcb8f284aacf68098194c8"
Signature · 1 line
2.7.4
PATCH 6/16 secilc: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/secilc_2.7.bb | 7 ------- recipes-security/selinux/secilc_2.8.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/secilc_2.7.bb create mode 100644 recipes-security/selinux/secilc_2.8.bb
recipes-security/selinux/secilc_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=5fb82e8deb357d4e5fd8f3fed01d2f38" - -SRC_URI[md5sum] = "301a4e477bc7214be16558f7c2dcbcff" -SRC_URI[sha256sum] = "9ec63dd64645c718f66d33c96299adfe0445b0aa62d7ac8c642f873c570609c5"
recipes-security/selinux/secilc_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=5fb82e8deb357d4e5fd8f3fed01d2f38" + +SRC_URI[md5sum] = "a3c363545842aadc6645a94112b476e7" +SRC_URI[sha256sum] = "cfe15f2e06b3013c9dfc46cf42234ff07fb61866c4c29d739eb8858f83b214d4"
Signature · 1 line
2.7.4
PATCH 7/16 policycoreutils: uprev to 2.8 (20180524)
In reply to Yi ZhaoRemove unused patch:
policycoreutils-loadpolicy-symlink.patch
Add the following patches to change commands path for backward compatibility:
policycoreutils-fix-fixfiles-install-path.patch policycoreutils-fix-fixfiles-install-path.patch
--- recipes-security/selinux/policycoreutils.inc | 8 +++--- ...policycoreutils-fix-fixfiles-install-path.patch | 29 ++++++++++++++++++++++ ...icycoreutils-fix-load_policy-install-path.patch | 29 ++++++++++++++++++++++ .../policycoreutils-loadpolicy-symlink.patch | 19 -------------- recipes-security/selinux/policycoreutils_2.7.bb | 8 ------ recipes-security/selinux/policycoreutils_2.8.bb | 8 ++++++ 6 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch create mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch delete mode 100644 recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch delete mode 100644 recipes-security/selinux/policycoreutils_2.7.bb create mode 100644 recipes-security/selinux/policycoreutils_2.8.bb
recipes-security/selinux/policycoreutils.inc +4 -4
@@ -9,6 +9,8 @@ LICENSE = "GPLv2+" SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://policycoreutils-fixfiles-de-bashify.patch \ + file://policycoreutils-fix-fixfiles-install-path.patch \ + file://policycoreutils-fix-load_policy-install-path.patch \ " PAM_SRC_URI = "file://pam.d/newrole \
@@ -46,7 +48,6 @@ RDEPENDS_${BPN}-semodule += "\ libsemanage \ " # static link to libsepol -DEPENDS_${BPN}-semodule-deps += "libsepol" RDEPENDS_${BPN}-semodule-expand += "libsepol libselinux" RDEPENDS_${BPN}-semodule-link += "libsepol libselinux" RDEPENDS_${BPN}-semodule-package += "libsepol libselinux"
@@ -157,15 +158,14 @@ do_compile_prepend() { do_install_prepend() { export PYTHON=python - export SEMODULE_PATH=${sbindir} SYSTEMDDIR=${D}/${systemd_unitdir} } do_install_class-native() { for PCU_CMD in ${PCU_NATIVE_CMDS} ; do oe_runmake -C $PCU_CMD install \ DESTDIR="${D}" \ - PREFIX="${D}/${prefix}" \ - SBINDIR="${D}/${base_sbindir}" + PREFIX="${prefix}" \ + SBINDIR="${base_sbindir}" done }
recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 0546ad883d98799972034f8e0fdc6ca2a7319b07 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Tue, 4 Sep 2018 14:14:45 +0800 +Subject: [PATCH] policycoreutils: fix fixfiles install path + +Change path from /usr/sbin to /sbin for backward compatibility + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <[email protected]> +--- + scripts/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/Makefile b/scripts/Makefile +index afe5dc4..f7a9e34 100644 +--- a/scripts/Makefile ++++ b/scripts/Makefile +@@ -1,6 +1,6 @@ + # Installation directories. + PREFIX ?= /usr +-SBINDIR ?= $(PREFIX)/sbin ++SBINDIR ?= /sbin + MANDIR ?= $(PREFIX)/share/man + + .PHONY: all +-- +2.7.4 +
recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 46077df498b8bb54964506f03fd95390aaaaa392 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Tue, 4 Sep 2018 14:41:13 +0800 +Subject: [PATCH] policycoreutils: fix load_policy install path + +Change path from /usr/sbin to /sbin for backward compatibility + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <[email protected]> +--- + load_policy/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/load_policy/Makefile b/load_policy/Makefile +index 568d5d4..7fbd077 100644 +--- a/load_policy/Makefile ++++ b/load_policy/Makefile +@@ -1,6 +1,6 @@ + # Installation directories. + PREFIX ?= /usr +-SBINDIR ?= $(PREFIX)/sbin ++SBINDIR ?= /sbin + MANDIR ?= $(PREFIX)/share/man + LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale + +-- +2.7.4 +
recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch deleted +0 -19
@@ -1,19 +0,0 @@ -policycoreutils: Patch Makefile to get load_policy symlink right - -Setting DESTDIR in the policycoreutils do_install creates a bad -symlink for load_policy. This patch fixes up the Makefile to -create the symlink relative to DESTDIR. - -Signed-off-by: Philip Tricca <[email protected]> - ---- a/load_policy/Makefile -+++ b/load_policy/Makefile -@@ -19,7 +19,7 @@ install: all - test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 - install -m 644 load_policy.8 $(MANDIR)/man8/ - -mkdir -p $(USRSBINDIR) -- -ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy -+ -ln -sf $(subst $(DESTDIR),,$(SBINDIR))/load_policy $(USRSBINDIR)/load_policy - - clean: - -rm -f $(TARGETS) *.o
recipes-security/selinux/policycoreutils_2.7.bb deleted +0 -8
@@ -1,8 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "65311b66ae01f7b7ad7c2ea7401b68ed" -SRC_URI[sha256sum] = "0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4" -
recipes-security/selinux/policycoreutils_2.8.bb new file +8 -0
@@ -0,0 +1,8 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "da5ceb9c7e1e6f8c573731031b91cffe" +SRC_URI[sha256sum] = "986553a235f27bee7ad7c2b7c35ea51eb2ee68e2cf03b661b1585de101bc1099" +
Signature · 1 line
2.7.4
PATCH 8/16 mcstrans: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/mcstrans.inc | 1 - recipes-security/selinux/mcstrans_2.7.bb | 7 ------- recipes-security/selinux/mcstrans_2.8.bb | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 recipes-security/selinux/mcstrans_2.7.bb create mode 100644 recipes-security/selinux/mcstrans_2.8.bb
recipes-security/selinux/mcstrans.inc +0 -1
@@ -14,7 +14,6 @@ inherit systemd update-rc.d DEPENDS += "libsepol libselinux libcap" -EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir} SBINDIR=${D}/${base_sbindir}" do_install_append() { install -d ${D}${sbindir} install -m 755 utils/untranscon ${D}${sbindir}/
recipes-security/selinux/mcstrans_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI[md5sum] = "edba0f72fdf7fdd1ad0a2c6d102e8cfa" -SRC_URI[sha256sum] = "cdca003282d160b50ad695ab5b013c05ca21387a419b2f89288534184d16e1e2"
recipes-security/selinux/mcstrans_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI[md5sum] = "3a0edb2a8b6a255199824abd58c0906c" +SRC_URI[sha256sum] = "ec6ea65660550ed6bbd2a834725ba7526ac53599753d7b95072e4afd4afc14e4"
Signature · 1 line
2.7.4
PATCH 9/16 restorecond: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/restorecond.inc | 4 ---- recipes-security/selinux/restorecond_2.7.bb | 7 ------- recipes-security/selinux/restorecond_2.8.bb | 7 +++++++ 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 recipes-security/selinux/restorecond_2.7.bb create mode 100644 recipes-security/selinux/restorecond_2.8.bb
recipes-security/selinux/restorecond.inc +0 -4
@@ -18,10 +18,6 @@ DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native" FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ " -do_install_prepend() { - export SYSTEMDDIR=${D}/${systemd_unitdir} -} - SYSTEMD_SERVICE_restorecond = "restorecond.service" INITSCRIPT_PACKAGES = "restorecond" INITSCRIPT_NAME_restorecond = "restorecond"
recipes-security/selinux/restorecond_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "46f8ad0a37f955ef148d4e19b8cc8b1f" -SRC_URI[sha256sum] = "cb8e0a8d706cb2c1f105125f3514dffffefcbcfb49199183a7f91ab0bdf1f24d"
recipes-security/selinux/restorecond_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "cfe4e4d6184623fdcb9bc2681e693abb" +SRC_URI[sha256sum] = "323cab1128e5308cd85fea0e5c98e3c8973e1ada0b659f2fce76187e192271bf"
Signature · 1 line
2.7.4
PATCH 10/16 selinux-sandbox: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/selinux-sandbox_2.7.bb | 7 ------- recipes-security/selinux/selinux-sandbox_2.8.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/selinux-sandbox_2.7.bb create mode 100644 recipes-security/selinux/selinux-sandbox_2.8.bb
recipes-security/selinux/selinux-sandbox_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "7360e9dc7b1757b7f82face655982bfa" -SRC_URI[sha256sum] = "9490620380ab6d428a92869002a51ada0343ca35fa2a6905595745902a64c541"
recipes-security/selinux/selinux-sandbox_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "957f5d0fc7724f93f502d1d632568894" +SRC_URI[sha256sum] = "025f84f76e07b7bfc9ba1e9215f4ddb646d41a2e935a65e07560feaa6fc20ef3"
Signature · 1 line
2.7.4
PATCH 11/16 selinux-python: uprev to 2.8 (20180524)
In reply to Yi ZhaoRebase patch:
fix-sepolicy-install-path.patch
--- recipes-security/selinux/selinux-python.inc | 2 +- .../selinux-python/fix-sepolicy-install-path.patch | 23 ++++++++++++---------- recipes-security/selinux/selinux-python_2.7.bb | 7 ------- recipes-security/selinux/selinux-python_2.8.bb | 7 +++++++ 4 files changed, 21 insertions(+), 18 deletions(-) delete mode 100644 recipes-security/selinux/selinux-python_2.7.bb create mode 100644 recipes-security/selinux/selinux-python_2.8.bb
recipes-security/selinux/selinux-python.inc +1 -1
@@ -102,7 +102,7 @@ FILES_${PN} += "\ EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" do_install() { oe_runmake DESTDIR=${D} \ - LIBDIR="${D}${libdir}" \ + LIBDIR="${libdir}" \ PYTHONLIBDIR='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ install }
recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch +13 -10
@@ -1,4 +1,4 @@ -From 69e8697cd2ae48710ff8190bad3e61d2fd115b99 Mon Sep 17 00:00:00 2001 +From c1aae6cc131371729f098e4b0aa02142a85b5890 Mon Sep 17 00:00:00 2001 From: Xin Ouyang <[email protected]> Date: Mon, 23 Sep 2013 21:17:59 +0800 Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy
@@ -7,16 +7,16 @@ Uptream-Status: Pending Signed-off-by: Xin Ouyang <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> - +Signed-off-by: Yi Zhao <[email protected]> --- sepolicy/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 5a56e6c..82c3e36 100644 +index fb8a132..a6ee749 100644 --- a/sepolicy/Makefile +++ b/sepolicy/Makefile -@@ -12,6 +12,8 @@ SHAREDIR ?= $(PREFIX)/share/sandbox +@@ -8,6 +8,8 @@ BASHCOMPLETIONDIR ?= $(PREFIX)/share/bash-completion/completions CFLAGS ?= -Wall -Werror -Wextra -W override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared
@@ -25,12 +25,15 @@ index 5a56e6c..82c3e36 100644 BASHCOMPLETIONS=sepolicy-bash-completion.sh all: python-build -@@ -30,7 +32,7 @@ test: +@@ -26,7 +28,7 @@ test: @$(PYTHON) test_sepolicy.py -v install: -- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py install --install-lib $(LIBDIR)/$(PYLIBVER)/site-packages - [ -d $(BINDIR) ] || mkdir -p $(BINDIR) - install -m 755 sepolicy.py $(BINDIR)/sepolicy - (cd $(BINDIR); ln -sf sepolicy sepolgen) +- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` ++ $(PYTHON) setup.py install --prefix=$(PREFIX) --install-lib $(DESTDIR)$(LIBDIR)/$(PYLIBVER)/site-packages + [ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) + install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy + (cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen) +-- +2.7.4 +
recipes-security/selinux/selinux-python_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "b118229d34a6aec34471c3c2c9cac172" -SRC_URI[sha256sum] = "4217cb965ecda96c91e15ffcc2e7ddd13ecc2bf5631100f3cd072a7616f140ed"
recipes-security/selinux/selinux-python_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "bd9850808203c76f07efd396bde790e3" +SRC_URI[sha256sum] = "e69f5e24820cb247a3d881a9c90efba1e64d76af863c82fb81bc3b87ed71e238"
Signature · 1 line
2.7.4
PATCH 12/16 semodule-utils: uprev to 2.8 (20180524)
In reply to Yi ZhaoRemove package semodule-deps as it had been removed upstream.
--- recipes-security/selinux/semodule-utils.inc | 2 -- recipes-security/selinux/semodule-utils_2.7.bb | 7 ------- recipes-security/selinux/semodule-utils_2.8.bb | 7 +++++++ 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 recipes-security/selinux/semodule-utils_2.7.bb create mode 100644 recipes-security/selinux/semodule-utils_2.8.bb
recipes-security/selinux/semodule-utils.inc +0 -2
@@ -12,12 +12,10 @@ RDEPENDS_${PN}-dev = "" EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" PACKAGES =+ "\ - ${PN}-semodule-deps \ ${PN}-semodule-expand \ ${PN}-semodule-link \ ${PN}-semodule-package \ " -FILES_${PN}-semodule-deps += "${bindir}/semodule_deps" FILES_${PN}-semodule-expand += "${bindir}/semodule_expand" FILES_${PN}-semodule-link += "${bindir}/semodule_link" FILES_${PN}-semodule-package += "\
recipes-security/selinux/semodule-utils_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "678e3a5225f9645d40fd9d13bbaa156f" -SRC_URI[sha256sum] = "90c98b3362a43b4da2a51a9176820a56f3e615225e23e3395bc566c4490786ba"
recipes-security/selinux/semodule-utils_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "51c69e612481ce971e2ae825139d2ca0" +SRC_URI[sha256sum] = "44f59c13070c637440b143ceab4dfe1efb9018b1e47828dd8789def74c1ccadf"
Signature · 1 line
2.7.4
PATCH 13/16 selinux-dbus: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/selinux-dbus_2.7.bb | 7 ------- recipes-security/selinux/selinux-dbus_2.8.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/selinux-dbus_2.7.bb create mode 100644 recipes-security/selinux/selinux-dbus_2.8.bb
recipes-security/selinux/selinux-dbus_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "6944aa95cfb44e4d76b1aff48b38f08e" -SRC_URI[sha256sum] = "a7f3dbe68c0d02cd1cbe6aac06e87c2957668cb88083389654fabacb79641ae4"
recipes-security/selinux/selinux-dbus_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "23f0264df3ed123904a17d71f2a5b325" +SRC_URI[sha256sum] = "3339cb9cd77579bab6158afc054409c3bf952e282ef957ea732b19c9f4697bc6"
Signature · 1 line
2.7.4
PATCH 14/16 selinux-gui: uprev to 2.8 (20180524)
In reply to Yi Zhao--- recipes-security/selinux/selinux-gui_2.7.bb | 7 ------- recipes-security/selinux/selinux-gui_2.8.bb | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-security/selinux/selinux-gui_2.7.bb create mode 100644 recipes-security/selinux/selinux-gui_2.8.bb
recipes-security/selinux/selinux-gui_2.7.bb deleted +0 -7
@@ -1,7 +0,0 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "f3555cb50a9e67b42bc917ede1982c7d" -SRC_URI[sha256sum] = "693fb3347041b5a2273c52c33be0a256b109e60f2039ae1d7e90ba8a2ec0324f"
recipes-security/selinux/selinux-gui_2.8.bb new file +7 -0
@@ -0,0 +1,7 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "52000c14ffa86840220915bd1d777845" +SRC_URI[sha256sum] = "17acd3004f01f92b288cc1322317d7964f5039fb26ba1542b6713a7147a2351d"
Signature · 1 line
2.7.4
PATCH 15/16 packagegroup-selinux-policycoreutils: remove semodule-utils-semodule-deps
In reply to Yi ZhaoRemove package semodule-utils-semodule-deps as it had been removed upstream.
--- recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb | 1 - 1 file changed, 1 deletion(-)
recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb +0 -1
@@ -20,7 +20,6 @@ RDEPENDS_${PN} = "\ policycoreutils-setfiles \ policycoreutils-setsebool \ policycoreutils-hll \ - semodule-utils-semodule-deps \ semodule-utils-semodule-expand \ semodule-utils-semodule-link \ semodule-utils-semodule-package \
Signature · 1 line
2.7.4
PATCH 16/16 audit: uprev to 2.8.4
In reply to Yi Zhao---
.../audit/{audit_2.7.6.bb => audit_2.8.4.bb} | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
rename recipes-security/audit/{audit_2.7.6.bb => audit_2.8.4.bb} (91%)recipes-security/audit/audit_2.8.4.bb renamed from recipes-security/audit/audit_2.7.6.bb +9 -9
@@ -15,8 +15,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/${BPN}/${BPN}-${PV}.tar.gz \ file://auditd.service \ file://audit-volatile.conf \ " -SRC_URI[md5sum] = "55a81bbed973b58a90590c949e71dc3e" -SRC_URI[sha256sum] = "fa65289cffdc95a25bfbdba541f43ee1b12c707090a38fd027dcf9354b9014e7" +SRC_URI[md5sum] = "ec9510312564c3d9483bccf8dbda4779" +SRC_URI[sha256sum] = "a410694d09fc5708d980a61a5abcb9633a591364f1ecc7e97ad5daef9c898c38" inherit autotools pythonnative update-rc.d systemd
@@ -30,15 +30,15 @@ SYSTEMD_SERVICE_auditd = "auditd.service" DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30) swig-native" EXTRA_OECONF += "--without-prelude \ - --with-libwrap \ - --enable-gssapi-krb5=no \ - --with-libcap-ng=yes \ - --with-python=yes \ - --libdir=${base_libdir} \ - --sbindir=${base_sbindir} \ + --with-libwrap \ + --enable-gssapi-krb5=no \ + --with-libcap-ng=yes \ + --with-python=yes \ + --libdir=${base_libdir} \ + --sbindir=${base_sbindir} \ --without-python3 \ --disable-zos-remote \ - " + " EXTRA_OECONF_append_arm = " --with-arm=yes" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \
Signature · 1 line
2.7.4
PATCH v2 16/16 audit: uprev to 2.8.4
Add aarch64 support
---
.../audit/{audit_2.7.6.bb => audit_2.8.4.bb} | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
rename recipes-security/audit/{audit_2.7.6.bb => audit_2.8.4.bb} (90%)recipes-security/audit/audit_2.8.4.bb renamed from recipes-security/audit/audit_2.7.6.bb +10 -9
@@ -15,8 +15,8 @@ SRC_URI = "http://people.redhat.com/sgrubb/${BPN}/${BPN}-${PV}.tar.gz \ file://auditd.service \ file://audit-volatile.conf \ " -SRC_URI[md5sum] = "55a81bbed973b58a90590c949e71dc3e" -SRC_URI[sha256sum] = "fa65289cffdc95a25bfbdba541f43ee1b12c707090a38fd027dcf9354b9014e7" +SRC_URI[md5sum] = "ec9510312564c3d9483bccf8dbda4779" +SRC_URI[sha256sum] = "a410694d09fc5708d980a61a5abcb9633a591364f1ecc7e97ad5daef9c898c38" inherit autotools pythonnative update-rc.d systemd
@@ -30,16 +30,17 @@ SYSTEMD_SERVICE_auditd = "auditd.service" DEPENDS += "python tcp-wrappers libcap-ng linux-libc-headers (>= 2.6.30) swig-native" EXTRA_OECONF += "--without-prelude \ - --with-libwrap \ - --enable-gssapi-krb5=no \ - --with-libcap-ng=yes \ - --with-python=yes \ - --libdir=${base_libdir} \ - --sbindir=${base_sbindir} \ + --with-libwrap \ + --enable-gssapi-krb5=no \ + --with-libcap-ng=yes \ + --with-python=yes \ + --libdir=${base_libdir} \ + --sbindir=${base_sbindir} \ --without-python3 \ --disable-zos-remote \ - " + " EXTRA_OECONF_append_arm = " --with-arm=yes" +EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \
Signature · 1 line
2.7.4
Ping
//Yi
Quoted 94 lines · Yi Zhao
Yi Zhao (16):
selinux: uprev inc files to 2.8 (20180524) libsepol: uprev to 2.8 (20180524) libselinux: uprev to 2.8 (20180524) libsemanage: uprev to 2.8 (20180524) checkpolicy: uprev to 2.8 (20180524) secilc: uprev to 2.8 (20180524) policycoreutils: uprev to 2.8 (20180524) mcstrans: uprev to 2.8 (20180524) restorecond: uprev to 2.8 (20180524) selinux-sandbox: uprev to 2.8 (20180524) selinux-python: uprev to 2.8 (20180524) semodule-utils: uprev to 2.8 (20180524) selinux-dbus: uprev to 2.8 (20180524) selinux-gui: uprev to 2.8 (20180524) packagegroup-selinux-policycoreutils: remove semodule-utils-semodule-deps audit: uprev to 2.8.4.../audit/{audit_2.7.6.bb => audit_2.8.4.bb} | 18 +++++++------- .../packagegroup-selinux-policycoreutils.bb | 1 - recipes-security/selinux/checkpolicy.inc | 1 - recipes-security/selinux/checkpolicy_2.7.bb | 7 ------ recipes-security/selinux/checkpolicy_2.8.bb | 7 ++++++ recipes-security/selinux/libselinux.inc | 2 +- ...-Makefile-fix-includedir-in-libselinux.pc.patch | 20 ++++++++------- .../{libselinux_2.7.bb => libselinux_2.8.bb} | 6 ++--- recipes-security/selinux/libsemanage.inc | 12 ++------- ...-Makefile-fix-includedir-in-libselinux.pc.patch | 20 ++++++++------- .../{libsemanage_2.7.bb => libsemanage_2.8.bb} | 6 ++--- ...rc-Makefile-fix-includedir-in-libsepol.pc.patch | 13 +++++----- recipes-security/selinux/libsepol_2.7.bb | 9 ------- recipes-security/selinux/libsepol_2.8.bb | 9 +++++++ recipes-security/selinux/mcstrans.inc | 1 - recipes-security/selinux/mcstrans_2.7.bb | 7 ------ recipes-security/selinux/mcstrans_2.8.bb | 7 ++++++ recipes-security/selinux/policycoreutils.inc | 8 +++--- ...policycoreutils-fix-fixfiles-install-path.patch | 29 ++++++++++++++++++++++ ...icycoreutils-fix-load_policy-install-path.patch | 29 ++++++++++++++++++++++ .../policycoreutils-loadpolicy-symlink.patch | 19 -------------- recipes-security/selinux/policycoreutils_2.7.bb | 8 ------ recipes-security/selinux/policycoreutils_2.8.bb | 8 ++++++ recipes-security/selinux/restorecond.inc | 4 --- recipes-security/selinux/restorecond_2.7.bb | 7 ------ recipes-security/selinux/restorecond_2.8.bb | 7 ++++++ recipes-security/selinux/secilc_2.7.bb | 7 ------ recipes-security/selinux/secilc_2.8.bb | 7 ++++++ recipes-security/selinux/selinux-dbus_2.7.bb | 7 ------ recipes-security/selinux/selinux-dbus_2.8.bb | 7 ++++++ recipes-security/selinux/selinux-gui_2.7.bb | 7 ------ recipes-security/selinux/selinux-gui_2.8.bb | 7 ++++++ recipes-security/selinux/selinux-python.inc | 2 +- .../selinux-python/fix-sepolicy-install-path.patch | 23 +++++++++-------- recipes-security/selinux/selinux-python_2.7.bb | 7 ------ recipes-security/selinux/selinux-python_2.8.bb | 7 ++++++ recipes-security/selinux/selinux-sandbox_2.7.bb | 7 ------ recipes-security/selinux/selinux-sandbox_2.8.bb | 7 ++++++ .../{selinux_20170804.inc => selinux_20180524.inc} | 2 +- recipes-security/selinux/selinux_common.inc | 9 ++++--- recipes-security/selinux/semodule-utils.inc | 2 -- recipes-security/selinux/semodule-utils_2.7.bb | 7 ------ recipes-security/selinux/semodule-utils_2.8.bb | 7 ++++++ 43 files changed, 209 insertions(+), 178 deletions(-)rename recipes-security/audit/{audit_2.7.6.bb => audit_2.8.4.bb} (91%)
delete mode 100644 recipes-security/selinux/checkpolicy_2.7.bb
create mode 100644 recipes-security/selinux/checkpolicy_2.8.bb
rename recipes-security/selinux/{libselinux_2.7.bb => libselinux_2.8.bb} (72%)
rename recipes-security/selinux/{libsemanage_2.7.bb => libsemanage_2.8.bb} (76%)
delete mode 100644 recipes-security/selinux/libsepol_2.7.bb
create mode 100644 recipes-security/selinux/libsepol_2.8.bb
delete mode 100644 recipes-security/selinux/mcstrans_2.7.bb
create mode 100644 recipes-security/selinux/mcstrans_2.8.bb
create mode 100644recipes-security/selinux/policycoreutils/policycoreutils-fix-fixfiles-install-path.patchcreate mode 100644recipes-security/selinux/policycoreutils/policycoreutils-fix-load_policy-install-path.patchdelete mode 100644recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patchdelete mode 100644 recipes-security/selinux/policycoreutils_2.7.bb
create mode 100644 recipes-security/selinux/policycoreutils_2.8.bb
delete mode 100644 recipes-security/selinux/restorecond_2.7.bb
create mode 100644 recipes-security/selinux/restorecond_2.8.bb
delete mode 100644 recipes-security/selinux/secilc_2.7.bb
create mode 100644 recipes-security/selinux/secilc_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-dbus_2.7.bb
create mode 100644 recipes-security/selinux/selinux-dbus_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-gui_2.7.bb
create mode 100644 recipes-security/selinux/selinux-gui_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-python_2.7.bb
create mode 100644 recipes-security/selinux/selinux-python_2.8.bb
delete mode 100644 recipes-security/selinux/selinux-sandbox_2.7.bb
create mode 100644 recipes-security/selinux/selinux-sandbox_2.8.bb
rename recipes-security/selinux/{selinux_20170804.inc => selinux_20180524.inc} (84%)
delete mode 100644 recipes-security/selinux/semodule-utils_2.7.bb
create mode 100644 recipes-security/selinux/semodule-utils_2.8.bb