From dc3cd6149ce443e693d2ed490d0fa3fa01f68a45 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 25 Dec 2013 21:34:13 -0500 Subject: selinux userspace: uprev packages to release 20131030 Upreved packages: - checkpolicy to 2.2 - libselinux to 2.2 - libsemanage to 2.2 - libsepol to 2.2 - policycoreutils to 2.2.5 - sepolgen to 1.2.1 Migrate patches in next commits. Signed-off-by: Wenzong Fan Signed-off-by: Mark Hatle --- recipes-security/selinux/checkpolicy_2.1.12.bb | 9 --------- recipes-security/selinux/checkpolicy_2.2.bb | 9 +++++++++ recipes-security/selinux/libselinux_2.1.13.bb | 18 ------------------ recipes-security/selinux/libselinux_2.2.bb | 18 ++++++++++++++++++ recipes-security/selinux/libsemanage_2.1.10.bb | 17 ----------------- recipes-security/selinux/libsemanage_2.2.bb | 17 +++++++++++++++++ recipes-security/selinux/libsepol_2.1.9.bb | 11 ----------- recipes-security/selinux/libsepol_2.2.bb | 11 +++++++++++ recipes-security/selinux/policycoreutils_2.1.14.bb | 17 ----------------- recipes-security/selinux/policycoreutils_2.2.5.bb | 17 +++++++++++++++++ recipes-security/selinux/selinux_20130423.inc | 12 ------------ recipes-security/selinux/selinux_20131030.inc | 12 ++++++++++++ recipes-security/selinux/selinux_git.inc | 4 +--- recipes-security/selinux/sepolgen_1.1.9.bb | 9 --------- recipes-security/selinux/sepolgen_1.2.1.bb | 9 +++++++++ 15 files changed, 94 insertions(+), 96 deletions(-) delete mode 100644 recipes-security/selinux/checkpolicy_2.1.12.bb create mode 100644 recipes-security/selinux/checkpolicy_2.2.bb delete mode 100644 recipes-security/selinux/libselinux_2.1.13.bb create mode 100644 recipes-security/selinux/libselinux_2.2.bb delete mode 100644 recipes-security/selinux/libsemanage_2.1.10.bb create mode 100644 recipes-security/selinux/libsemanage_2.2.bb delete mode 100644 recipes-security/selinux/libsepol_2.1.9.bb create mode 100644 recipes-security/selinux/libsepol_2.2.bb delete mode 100644 recipes-security/selinux/policycoreutils_2.1.14.bb create mode 100644 recipes-security/selinux/policycoreutils_2.2.5.bb delete mode 100644 recipes-security/selinux/selinux_20130423.inc create mode 100644 recipes-security/selinux/selinux_20131030.inc delete mode 100644 recipes-security/selinux/sepolgen_1.1.9.bb create mode 100644 recipes-security/selinux/sepolgen_1.2.1.bb diff --git a/recipes-security/selinux/checkpolicy_2.1.12.bb b/recipes-security/selinux/checkpolicy_2.1.12.bb deleted file mode 100644 index 198de31..0000000 --- a/recipes-security/selinux/checkpolicy_2.1.12.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r0" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "b82c55a95855611b67ac99c7e8f48552" -SRC_URI[sha256sum] = "e6a0ac539b74859b4262b317eb90d9914deb15e7aa509659f47724d50fe2ecc6" diff --git a/recipes-security/selinux/checkpolicy_2.2.bb b/recipes-security/selinux/checkpolicy_2.2.bb new file mode 100644 index 0000000..198de31 --- /dev/null +++ b/recipes-security/selinux/checkpolicy_2.2.bb @@ -0,0 +1,9 @@ +PR = "r0" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "b82c55a95855611b67ac99c7e8f48552" +SRC_URI[sha256sum] = "e6a0ac539b74859b4262b317eb90d9914deb15e7aa509659f47724d50fe2ecc6" diff --git a/recipes-security/selinux/libselinux_2.1.13.bb b/recipes-security/selinux/libselinux_2.1.13.bb deleted file mode 100644 index caed650..0000000 --- a/recipes-security/selinux/libselinux_2.1.13.bb +++ /dev/null @@ -1,18 +0,0 @@ -PR = "r0" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" - -SRC_URI[md5sum] = "32bf7b5182977a8a9248a1eeefe49a22" -SRC_URI[sha256sum] = "57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a" - -SRC_URI += "\ - file://libselinux-fix-init-load-policy.patch \ - file://libselinux-pcre-link-order.patch \ - file://libselinux-drop-Wno-unused-but-set-variable.patch \ - file://libselinux-make-O_CLOEXEC-optional.patch \ - file://libselinux-make-SOCK_CLOEXEC-optional.patch \ - file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ - " diff --git a/recipes-security/selinux/libselinux_2.2.bb b/recipes-security/selinux/libselinux_2.2.bb new file mode 100644 index 0000000..caed650 --- /dev/null +++ b/recipes-security/selinux/libselinux_2.2.bb @@ -0,0 +1,18 @@ +PR = "r0" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0" + +SRC_URI[md5sum] = "32bf7b5182977a8a9248a1eeefe49a22" +SRC_URI[sha256sum] = "57aad47c06b7ec18a76e8d9870539277a84cb40109cfdcf70ed3260bdb04447a" + +SRC_URI += "\ + file://libselinux-fix-init-load-policy.patch \ + file://libselinux-pcre-link-order.patch \ + file://libselinux-drop-Wno-unused-but-set-variable.patch \ + file://libselinux-make-O_CLOEXEC-optional.patch \ + file://libselinux-make-SOCK_CLOEXEC-optional.patch \ + file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ + " diff --git a/recipes-security/selinux/libsemanage_2.1.10.bb b/recipes-security/selinux/libsemanage_2.1.10.bb deleted file mode 100644 index 900d608..0000000 --- a/recipes-security/selinux/libsemanage_2.1.10.bb +++ /dev/null @@ -1,17 +0,0 @@ -PR = "r0" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "44fc8a3387486378a21d8df7454b9d42" -SRC_URI[sha256sum] = "de2e8077245581e94576276f54e80a53c23c28d6961d2dfbe2f004eaba452e91" - -SRC_URI += "\ - file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ - file://libsemanage-fix-path-len-limit.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 \ - " diff --git a/recipes-security/selinux/libsemanage_2.2.bb b/recipes-security/selinux/libsemanage_2.2.bb new file mode 100644 index 0000000..900d608 --- /dev/null +++ b/recipes-security/selinux/libsemanage_2.2.bb @@ -0,0 +1,17 @@ +PR = "r0" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "44fc8a3387486378a21d8df7454b9d42" +SRC_URI[sha256sum] = "de2e8077245581e94576276f54e80a53c23c28d6961d2dfbe2f004eaba452e91" + +SRC_URI += "\ + file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ + file://libsemanage-fix-path-len-limit.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 \ + " diff --git a/recipes-security/selinux/libsepol_2.1.9.bb b/recipes-security/selinux/libsepol_2.1.9.bb deleted file mode 100644 index efedb63..0000000 --- a/recipes-security/selinux/libsepol_2.1.9.bb +++ /dev/null @@ -1,11 +0,0 @@ -PR = "r0" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI[md5sum] = "980964224683fa29d4ed65beb94b56ee" -SRC_URI[sha256sum] = "290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b" - -SRC_URI += "file://libsepol-Change-ranlib-for-cross-compiling.patch" diff --git a/recipes-security/selinux/libsepol_2.2.bb b/recipes-security/selinux/libsepol_2.2.bb new file mode 100644 index 0000000..efedb63 --- /dev/null +++ b/recipes-security/selinux/libsepol_2.2.bb @@ -0,0 +1,11 @@ +PR = "r0" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI[md5sum] = "980964224683fa29d4ed65beb94b56ee" +SRC_URI[sha256sum] = "290d17f583635a4a5d8a2141511272adf0571c4205cdea38b5a68df20d58a70b" + +SRC_URI += "file://libsepol-Change-ranlib-for-cross-compiling.patch" diff --git a/recipes-security/selinux/policycoreutils_2.1.14.bb b/recipes-security/selinux/policycoreutils_2.1.14.bb deleted file mode 100644 index da91ddb..0000000 --- a/recipes-security/selinux/policycoreutils_2.1.14.bb +++ /dev/null @@ -1,17 +0,0 @@ -PR = "r3" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "f34216414b650a0a25dec89a758234fb" -SRC_URI[sha256sum] = "b6881741f9f9988346a73bfeccb0299941dc117349753f0ef3f23ee86f06c1b5" - -SRC_URI += "\ - file://policycoreutils-fix-strict-prototypes.patch \ - file://policycoreutils-revert-run_init-open_init_pty.patch \ - file://policycoreutils-fix-sepolicy-install-path.patch \ - file://policycoreutils-make-O_CLOEXEC-optional.patch \ - file://policycoreutils-loadpolicy-symlink.patch \ - " diff --git a/recipes-security/selinux/policycoreutils_2.2.5.bb b/recipes-security/selinux/policycoreutils_2.2.5.bb new file mode 100644 index 0000000..da91ddb --- /dev/null +++ b/recipes-security/selinux/policycoreutils_2.2.5.bb @@ -0,0 +1,17 @@ +PR = "r3" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "f34216414b650a0a25dec89a758234fb" +SRC_URI[sha256sum] = "b6881741f9f9988346a73bfeccb0299941dc117349753f0ef3f23ee86f06c1b5" + +SRC_URI += "\ + file://policycoreutils-fix-strict-prototypes.patch \ + file://policycoreutils-revert-run_init-open_init_pty.patch \ + file://policycoreutils-fix-sepolicy-install-path.patch \ + file://policycoreutils-make-O_CLOEXEC-optional.patch \ + file://policycoreutils-loadpolicy-symlink.patch \ + " diff --git a/recipes-security/selinux/selinux_20130423.inc b/recipes-security/selinux/selinux_20130423.inc deleted file mode 100644 index d692a57..0000000 --- a/recipes-security/selinux/selinux_20130423.inc +++ /dev/null @@ -1,12 +0,0 @@ -SELINUX_RELEASE = "20130423" - -SRC_URI = "http://userspace.selinuxproject.org/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz" - -PREFERRED_VERSION_checkpolicy = "2.1.12" -PREFERRED_VERSION_libselinux = "2.1.13" -PREFERRED_VERSION_libsemanage = "2.1.10" -PREFERRED_VERSION_libsepol = "2.1.9" -PREFERRED_VERSION_policycoreutils = "2.1.14" -PREFERRED_VERSION_sepolgen = "1.1.9" - -include selinux_common.inc diff --git a/recipes-security/selinux/selinux_20131030.inc b/recipes-security/selinux/selinux_20131030.inc new file mode 100644 index 0000000..807a37c --- /dev/null +++ b/recipes-security/selinux/selinux_20131030.inc @@ -0,0 +1,12 @@ +SELINUX_RELEASE = "20131030" + +SRC_URI = "http://userspace.selinuxproject.org/releases/${SELINUX_RELEASE}/${BPN}-${PV}.tar.gz" + +PREFERRED_VERSION_checkpolicy = "2.2" +PREFERRED_VERSION_libselinux = "2.2" +PREFERRED_VERSION_libsemanage = "2.2" +PREFERRED_VERSION_libsepol = "2.2" +PREFERRED_VERSION_policycoreutils = "2.2.5" +PREFERRED_VERSION_sepolgen = "1.2.1" + +include selinux_common.inc diff --git a/recipes-security/selinux/selinux_git.inc b/recipes-security/selinux/selinux_git.inc index 37ea8e8..bb64d0d 100644 --- a/recipes-security/selinux/selinux_git.inc +++ b/recipes-security/selinux/selinux_git.inc @@ -1,8 +1,6 @@ -SRCREV = "3f52a123af40bae33bde2a1f2ecfb2320b61f9ad" +SRCREV = "edc2e99687b050d5be21a78a66d038aa1fc068d9" SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http" -SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464" -SRC_URI[sha256sum] = "9c8a8643c9a4dd0eb76fcda1420d636b750b84b27656c6f8bc6886a829d7e520" S = "${WORKDIR}/git/${BPN}" diff --git a/recipes-security/selinux/sepolgen_1.1.9.bb b/recipes-security/selinux/sepolgen_1.1.9.bb deleted file mode 100644 index a132727..0000000 --- a/recipes-security/selinux/sepolgen_1.1.9.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r0" - -include selinux_20130423.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "505a8b70eb110b770119e6560d183216" -SRC_URI[sha256sum] = "8a1c6d3a78c9b6ad3555c74def555f65a62950bf21c111c585bfc382fec3a645" diff --git a/recipes-security/selinux/sepolgen_1.2.1.bb b/recipes-security/selinux/sepolgen_1.2.1.bb new file mode 100644 index 0000000..a132727 --- /dev/null +++ b/recipes-security/selinux/sepolgen_1.2.1.bb @@ -0,0 +1,9 @@ +PR = "r0" + +include selinux_20130423.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "505a8b70eb110b770119e6560d183216" +SRC_URI[sha256sum] = "8a1c6d3a78c9b6ad3555c74def555f65a62950bf21c111c585bfc382fec3a645" -- cgit v1.2.3-54-g00ecf