selinux packages: uprev git recipes to lastest tag 20130423.

Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>

10 files changed, 95 insertions, 19 deletions

diff --git a/recipes-security/selinux/checkpolicy_git.bb b/recipes-security/selinux/checkpolicy_git.bb
index 32240c1..bd59001 100644
--- a/recipes-security/selinux/checkpolicy_git.bb
+++ b/recipes-security/selinux/checkpolicy_git.bb
@@ -1,5 +1,5 @@
-PR = "r2"
-PV = "2.1.8+git${SRCPV}"
+PR = "r0"
+PV = "2.1.12+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc
diff --git a/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch b/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch
new file mode 100644
index 0000000..f011f1a
--- /dev/null
+++ b/recipes-security/selinux/libselinux/libselinux-pcre-link-order.patch
@@ -0,0 +1,31 @@
+Subject: [PATCH] libselinux: Put -lpcre in LDADD for correct linking order
+
+Upstream-Status: pending
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ src/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index c4f5d4c..8f5aec5 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -20,7 +20,7 @@ RUBYINC ?= $(shell pkg-config --cflags ruby)
+ RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+ LIBBASE=$(shell basename $(LIBDIR))
+ 
+-LDFLAGS ?= -lpcre -lpthread
++LDADD ?= -lpcre -lpthread
+ 
+ VERSION = $(shell cat ../VERSION)
+ LIBVERSION = 1
+@@ -116,7 +116,7 @@ $(LIBA): $(OBJS)
+        $(RANLIB) $@
+ 
+ $(LIBSO): $(LOBJS)
+-       $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
++       $(CC) $(CFLAGS) -shared -o $@ $^ -ldl $(LDFLAGS) -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro $(LDADD)
+        ln -sf $@ $(TARGET) 
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
diff --git a/recipes-security/selinux/libselinux_git.bb b/recipes-security/selinux/libselinux_git.bb
index 902e859..6f93fd4 100644
--- a/recipes-security/selinux/libselinux_git.bb
+++ b/recipes-security/selinux/libselinux_git.bb
@@ -1,9 +1,10 @@
-PR = "r3"
-PV = "2.1.9+git${SRCPV}"
+PR = "r0"
+PV = "2.1.13+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=84b4d2c6ef954a2d4081e775a270d0d0"
 
-SRC_URI += "file://libselinux-fix-init-load-policy.patch"
+SRC_URI += "file://libselinux-fix-init-load-policy.patch \
+        file://libselinux-pcre-link-order.patch"
diff --git a/recipes-security/selinux/libsemanage_git.bb b/recipes-security/selinux/libsemanage_git.bb
index b3819a0..6553c6b 100644
--- a/recipes-security/selinux/libsemanage_git.bb
+++ b/recipes-security/selinux/libsemanage_git.bb
@@ -1,14 +1,13 @@
-PR = "r5"
-PV = "2.1.6+git${SRCPV}"
+PR = "r0"
+PV = "2.1.10+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-SRC_URI += "file://Fix-segfault-for-standard-policy.patch \
+SRC_URI += "\
         file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \
-        file://libsemanage-semanage.conf-for-cross-compile.patch \
         file://libsemanage-fix-path-len-limit.patch \
         file://libsemanage-fix-path-nologin.patch \
         file://libsemanage-drop-Wno-unused-but-set-variable.patch \
diff --git a/recipes-security/selinux/libsepol_git.bb b/recipes-security/selinux/libsepol_git.bb
index f7d801c..1fa83a4 100644
--- a/recipes-security/selinux/libsepol_git.bb
+++ b/recipes-security/selinux/libsepol_git.bb
@@ -1,5 +1,5 @@
-PR = "r1"
-PV = "2.1.4+git${SRCPV}"
+PR = "r0"
+PV = "2.1.9+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc
diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc
index 434d7ab..08b14eb 100644
--- a/recipes-security/selinux/policycoreutils.inc
+++ b/recipes-security/selinux/policycoreutils.inc
@@ -52,6 +52,11 @@ FILES_system-config-selinux = "${datadir}/system-config-selinux/*"
 
 inherit pythonnative
 
+export STAGING_INCDIR
+export STAGING_LIBDIR
+export BUILD_SYS
+export HOST_SYS
+
 AUDITH="`ls ${STAGING_INCDIR}/libaudit.h >/dev/null 2>&1 && echo /usr/include/libaudit.h `"
 PAMH="`ls ${STAGING_INCDIR}/security/pam_appl.h >/dev/null 2>&1 && echo /usr/include/security/pam_appl.h `"
 EXTRA_OEMAKE += "${@target_selinux(d, 'PAMH=${PAMH} AUDITH=${AUDITH}', 'PAMH= AUDITH= ')} INOTIFYH=n"
@@ -70,6 +75,14 @@ do_compile_virtclass-native() {
         done
 }
 
+do_compile_prepend() {
+        export PYTHON=python
+        export PYLIBVER='python${PYTHON_BASEVERSION}'
+        export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}"
+        export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so"
+        export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages"
+}
+
 do_install_virtclass-native() {
         for PCU_CMD in ${PCU_NATIVE_CMDS} ; do
              oe_runmake -C $PCU_CMD install \
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fix-strict-prototypes.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fix-strict-prototypes.patch
new file mode 100644
index 0000000..9bb353a
--- /dev/null
+++ b/recipes-security/selinux/policycoreutils/policycoreutils-fix-strict-prototypes.patch
@@ -0,0 +1,34 @@
+From 5944e9908fc12d69d19a1d24128cbc6d1a423c3d Mon Sep 17 00:00:00 2001
+From: Xin Ouyang <Xin.Ouyang@windriver.com>
+Date: Tue, 18 Jun 2013 12:29:00 +0800
+Subject: [PATCH] policycoreutils: fix build strict-prototypes failure
+
+| policy.c:90:6: error: function declaration isn't a prototype
+[-Werror=strict-prototypes]
+| cc1: all warnings being treated as errors
+| error: command 'i586-poky-linux-gcc' failed with exit status 1
+| make[1]: *** [python-build] Error 1
+
+Upstream-Status: pending
+
+Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
+---
+ sepolicy/policy.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sepolicy/policy.c b/sepolicy/policy.c
+index 4eca22d..e454e75 100644
+--- a/sepolicy/policy.c
++++ b/sepolicy/policy.c
+@@ -87,7 +87,7 @@ static PyMethodDef methods[] = {
+        {NULL, NULL, 0, NULL}   /* sentinel */
+ };
+ 
+-void init_policy() {
++void init_policy(void) {
+ PyObject *m;
+ m = Py_InitModule("_policy", methods);
+ init_info(m);
+-- 
+1.7.9.5
+
diff --git a/recipes-security/selinux/policycoreutils_git.bb b/recipes-security/selinux/policycoreutils_git.bb
index cef84f1..fb7b48f 100644
--- a/recipes-security/selinux/policycoreutils_git.bb
+++ b/recipes-security/selinux/policycoreutils_git.bb
@@ -1,11 +1,9 @@
-PR = "r7"
-PV = "2.1.10+git${SRCPV}"
+PR = "r0"
+PV = "2.1.14+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
-SRC_URI += "file://policycoreutils-fix-format-security.patch \
-            file://policycoreutils-remove-empty-po-files.patch \
-           "
+SRC_URI += "file://policycoreutils-fix-strict-prototypes.patch"
diff --git a/recipes-security/selinux/selinux_git.inc b/recipes-security/selinux/selinux_git.inc
index 5dd1aad..37ea8e8 100644
--- a/recipes-security/selinux/selinux_git.inc
+++ b/recipes-security/selinux/selinux_git.inc
@@ -1,4 +1,4 @@
-SRCREV = "339f8079d7b9dd1e0b0138e2d096dc7c60b2092e"
+SRCREV = "3f52a123af40bae33bde2a1f2ecfb2320b61f9ad"
 
 SRC_URI = "git://oss.tresys.com/git/selinux.git;protocol=http"
 SRC_URI[md5sum] = "4ec64a0d24aaa77c80b86e74d271e464"
diff --git a/recipes-security/selinux/sepolgen_git.bb b/recipes-security/selinux/sepolgen_git.bb
index 4c8b7df..710019d 100644
--- a/recipes-security/selinux/sepolgen_git.bb
+++ b/recipes-security/selinux/sepolgen_git.bb
@@ -1,5 +1,5 @@
-PR = "r1"
-PV = "1.1.5+git${SRCPV}" 
+PR = "r0"
+PV = "1.1.9+git${SRCPV}"
 
 include selinux_git.inc
 include ${BPN}.inc