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 <wenzong.fan@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

9 files changed, 13 insertions, 15 deletions

diff --git a/recipes-security/selinux/checkpolicy_2.1.12.bb b/recipes-security/selinux/checkpolicy_2.2.bb
index 198de31..198de31 100644
--- a/recipes-security/selinux/checkpolicy_2.1.12.bb
+++ b/recipes-security/selinux/checkpolicy_2.2.bb
diff --git a/recipes-security/selinux/libselinux_2.1.13.bb b/recipes-security/selinux/libselinux_2.2.bb
index caed650..caed650 100644
--- a/recipes-security/selinux/libselinux_2.1.13.bb
+++ b/recipes-security/selinux/libselinux_2.2.bb
diff --git a/recipes-security/selinux/libsemanage_2.1.10.bb b/recipes-security/selinux/libsemanage_2.2.bb
index 900d608..900d608 100644
--- a/recipes-security/selinux/libsemanage_2.1.10.bb
+++ b/recipes-security/selinux/libsemanage_2.2.bb
diff --git a/recipes-security/selinux/libsepol_2.1.9.bb b/recipes-security/selinux/libsepol_2.2.bb
index efedb63..efedb63 100644
--- a/recipes-security/selinux/libsepol_2.1.9.bb
+++ b/recipes-security/selinux/libsepol_2.2.bb
diff --git a/recipes-security/selinux/policycoreutils_2.1.14.bb b/recipes-security/selinux/policycoreutils_2.2.5.bb
index da91ddb..da91ddb 100644
--- a/recipes-security/selinux/policycoreutils_2.1.14.bb
+++ b/recipes-security/selinux/policycoreutils_2.2.5.bb
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.2.1.bb
index a132727..a132727 100644
--- a/recipes-security/selinux/sepolgen_1.1.9.bb
+++ b/recipes-security/selinux/sepolgen_1.2.1.bb