meta-selinux on master branch

new file mode 100644
index 0000000..c1e8ed6
@@ -0,0 +1 @@
+inherit with-selinux

deleted file mode 100644
index c1e8ed6..0000000
@@ -1 +0,0 @@
-inherit with-selinux

new file mode 100644
index 0000000..0004f71
@@ -0,0 +1,6 @@
+inherit enable-selinux
+
+# But wait!  There's more!  mesa builds a host program named builtin_compiler
+# and it needs selinux, too.  We replace the PACKAGECONFIG[] in the bbclass.
+#
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux libselinux-native,"

deleted file mode 100644
index 0004f71..0000000
@@ -1,6 +0,0 @@
-inherit enable-selinux
-
-# But wait!  There's more!  mesa builds a host program named builtin_compiler
-# and it needs selinux, too.  We replace the PACKAGECONFIG[] in the bbclass.
-#
-PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux libselinux-native,"

new file mode 100644
index 0000000..3500b9a
@@ -0,0 +1,13 @@
+PR .= ".1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://volatiles.04_bind"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/volatiles.04_bind ${D}${sysconfdir}/default/volatiles/volatiles.04_bind
+
+	sed -i '/^\s*\/usr\/sbin\/rndc-confgen/a\
+	    [ -x /sbin/restorecon ] && /sbin/restorecon -F /etc/bind/rndc.key' ${D}${sysconfdir}/init.d/bind
+}

deleted file mode 100644
index a15e045..0000000
@@ -1,13 +0,0 @@
-PR .= ".3"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://volatiles.04_bind"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/volatiles.04_bind ${D}${sysconfdir}/default/volatiles/volatiles.04_bind
-
-	sed -i '/^\s*\/usr\/sbin\/rndc-confgen/a\
-	    [ -x /sbin/restorecon ] && /sbin/restorecon -F /etc/bind/rndc.key' ${D}${sysconfdir}/init.d/bind
-}

new file mode 100644
index 0000000..f9487f2
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# Enable selinux support in the kernel if the feature is enabled
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}"
+# For inconsistent kallsyms data bug on ARM
+# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718 
+EXTRA_OEMAKE += "${@base_contains('TARGET_ARCH', 'arm', ' KALLSYMS_EXTRA_PASS=1', '', d)}"

deleted file mode 100644
index f9487f2..0000000
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# Enable selinux support in the kernel if the feature is enabled
-SRC_URI += "${@base_contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}"
-# For inconsistent kallsyms data bug on ARM
-# http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718 
-EXTRA_OEMAKE += "${@base_contains('TARGET_ARCH', 'arm', ' KALLSYMS_EXTRA_PASS=1', '', d)}"

new file mode 100644
index 0000000..cab8598
@@ -0,0 +1,13 @@
+PR .= ".1"
+
+inherit with-selinux
+
+FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
+
+# There is no distro feature just for audit.  If we want it,
+# uncomment the following.
+#
+#PACKAGECONFIG += "${@target_selinux(d, 'audit')}"
+
+PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit,"
+

deleted file mode 100644
index 223b8cf..0000000
@@ -1,13 +0,0 @@
-PR .= ".5"
-
-inherit with-selinux
-
-FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
-
-# There is no distro feature just for audit.  If we want it,
-# uncomment the following.
-#
-#PACKAGECONFIG += "${@target_selinux(d, 'audit')}"
-
-PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit,"
-

deleted file mode 100644
index bd8021b..0000000
@@ -1,8 +0,0 @@
-PR .= ".3"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://fix-libmount_la_DEPENDENCIES.patch \
-           "
-
-inherit with-selinux

new file mode 100644
index 0000000..945ad50
@@ -0,0 +1,5 @@
+PR .= ".1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+inherit with-selinux

index 74ce506..9821fa5 100644
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \
                     file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08"
 
 SECTION = "devel"
-INC_PR = "r3"
 
 DEPENDS = "libpcre python"
 

@@ -50,10 +49,15 @@ do_configure() {
     oe_runconf
 }
 
+do_install_append_class-nativesdk() {
+    cd ${D}${bindir}
+    ln -s swig swig2.0
+}
+
 def swiglib_relpath(d):
     swiglib = d.getVar('datadir', True) + "/" + d.getVar('BPN', True) + "/" + d.getVar('PV', True)
     return os.path.relpath(swiglib, d.getVar('bindir', True))
 
 do_install_append_class-native() {
-	create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
+    create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)}
 }

deleted file mode 100644
index 312ce11..0000000
@@ -1,9 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
-
-SRC_URI[md5sum] = "6d5e7ad05b4a404e5e85db9befb70c9a"
-SRC_URI[sha256sum] = "d1eef329e867124ce60838b5ad07c763146b6c8f250dd22a861ead7406f78e63"
-

new file mode 100644
index 0000000..0fbcfa1
@@ -0,0 +1,7 @@
+require ${BPN}.inc
+
+SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch"
+
+SRC_URI[md5sum] = "c3fb0b2d710cc82ed0154b91e43085a4"
+SRC_URI[sha256sum] = "65e13f22a60cecd7279c59882ff8ebe1ffe34078e85c602821a541817a4317f7"
+

deleted file mode 100644
index 8d58a0c..0000000
@@ -1,265 +0,0 @@
-From 89fa40f0a55096a62809e852244d7db3f445b0cd Mon Sep 17 00:00:00 2001
-From: Craig Small <[email protected]>
-Date: Sun, 7 Oct 2012 10:52:46 +1100
-Subject: [PATCH] pstree compiles with SE Linux
-
-Upstream-Status: Backport
-
-pstree failed to compile with SE Linux enabled because one of the
-scontext was missed and without it enabled the bug doesn't appear.
-
-pstree is now re-worked so scontext is defined as a dummy meaning
-most of the code except the reall SE Linux specific stuff is compilied
-meaning this sort of thing shouldn't happen too much again.
-
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=437332
-Bug-Sourceforge: https://sourceforge.net/p/psmisc/bugs/54/
----
- src/pstree.c |   69 +++++-----------------------------------------------------
- 1 file changed, 6 insertions(+), 63 deletions(-)
-
-diff --git a/src/pstree.c b/src/pstree.c
-index db57244..b9a01cf 100644
---- a/src/pstree.c
-+++ b/src/pstree.c
-@@ -47,6 +47,8 @@
- 
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
-+#else
-+typedef void* security_context_t; /* DUMMY to remove most ifdefs */
- #endif                                /*WITH_SELINUX */
- 
- extern const char *__progname;
-@@ -81,9 +83,7 @@ typedef struct _proc {
-     pid_t pid;
-     pid_t pgid;
-     uid_t uid;
--#ifdef WITH_SELINUX
-     security_context_t scontext;
--#endif                                /*WITH_SELINUX */
-     char flags;
-     struct _child *children;
-     struct _proc *parent;
-@@ -131,16 +131,14 @@ static int *more = NULL;
- 
- static int print_args = 0, compact = 1, user_change = 0, pids = 0, pgids = 0,
-     show_parents = 0, by_pid = 0, trunc = 1, wait_end = 0;
--#ifdef WITH_SELINUX
- static int show_scontext = 0;
--#endif                                /*WITH_SELINUX */
- static int output_width = 132;
- static int cur_x = 1;
- static char last_char = 0;
- static int dumped = 0;                /* used by dump_by_user */
- static int charlen = 0;                /* length of character */
- 
--static void fix_orphans(void);
-+static void fix_orphans(security_context_t scontext);
- /*
-  * Allocates additional buffer space for width and more as needed.
-  * The first call will allocate the first buffer.
-@@ -229,15 +227,12 @@ static int out_int(int x)
-     return digits;
- }
- 
--#ifdef WITH_SELINUX
- static void out_scontext(security_context_t scontext)
- {
-     out_string("`");
-     out_string(scontext);
-     out_string("'");
- }
--#endif                                /*WITH_SELINUX */
--
- 
- static void out_newline(void)
- {
-@@ -259,12 +254,8 @@ static PROC *find_proc(pid_t pid)
- 	return NULL;
- }
- 
--#ifdef WITH_SELINUX
- static PROC *new_proc(const char *comm, pid_t pid, uid_t uid,
-                       security_context_t scontext)
--#else                                /*WITH_SELINUX */
--static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
--#endif                                /*WITH_SELINUX */
- {
-     PROC *new;
- 
-@@ -279,9 +270,7 @@ static PROC *new_proc(const char *comm, pid_t pid, uid_t uid)
-     new->flags = 0;
-     new->argc = 0;
-     new->argv = NULL;
--#ifdef WITH_SELINUX
-     new->scontext = scontext;
--#endif                                /*WITH_SELINUX */
-     new->children = NULL;
-     new->parent = NULL;
-     new->next = list;
-@@ -364,24 +353,14 @@ rename_proc(PROC *this, const char *comm, uid_t uid)
- 		}
- 	}
- }
--#ifdef WITH_SELINUX
- static void
- add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
-          const char *args, int size, char isthread, security_context_t scontext)
--#else                                /*WITH_SELINUX */
--static void
--add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
--         const char *args, int size, char isthread)
--#endif                                /*WITH_SELINUX */
- {
-     PROC *this, *parent;
- 
-     if (!(this = find_proc(pid)))
--#ifdef WITH_SELINUX
-         this = new_proc(comm, pid, uid, scontext);
--#else                                /*WITH_SELINUX */
--        this = new_proc(comm, pid, uid);
--#endif                                /*WITH_SELINUX */
-     else {
- 	    rename_proc(this, comm, uid);
-     }
-@@ -393,11 +372,7 @@ add_proc(const char *comm, pid_t pid, pid_t ppid, pid_t pgid, uid_t uid,
-     if (isthread)
-       this->flags |= PFLAG_THREAD;
-     if (!(parent = find_proc(ppid))) {
--#ifdef WITH_SELINUX
-         parent = new_proc("?", ppid, 0, scontext);
--#else                                /*WITH_SELINUX */
--        parent = new_proc("?", ppid, 0);
--#endif
-     }
-     if (pid != 0) {
-       add_child(parent, this);
-@@ -494,12 +469,10 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
-         else
-             (void) out_int(current->uid);
-     }
--#ifdef WITH_SELINUX
-     if (show_scontext) {
-         out_char(info++ ? ',' : '(');
-         out_scontext(current->scontext);
-     }
--#endif                                /*WITH_SELINUX */
-     if ((swapped && print_args && current->argc < 0) || (!swapped && info))
-         out_char(')');
-     if ((current->flags & PFLAG_HILIGHT) && (tmp = tgetstr("me", NULL)))
-@@ -520,11 +493,7 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
-             }
-         }
-     }
--#ifdef WITH_SELINUX
-     if (show_scontext || print_args || !current->children)
--#else                                /*WITH_SELINUX */
--    if (print_args || !current->children)
--#endif                                /*WITH_SELINUX */
-     {
-         while (closing--)
-             out_char(']');
-@@ -533,11 +502,7 @@ dump_tree(PROC * current, int level, int rep, int leaf, int last,
-     ensure_buffer_capacity(level);
-     more[level] = !last;
- 
--#ifdef WITH_SELINUX
-     if (show_scontext || print_args)
--#else                                /*WITH_SELINUX */
--    if (print_args)
--#endif                                /*WITH_SELINUX */
-     {
-         width[level] = swapped + (comm_len > 1 ? 0 : -1);
-         count=0;
-@@ -653,8 +618,8 @@ static void read_proc(void)
-   pid_t pid, ppid, pgid;
-   int fd, size;
-   int empty;
--#ifdef WITH_SELINUX
-   security_context_t scontext = NULL;
-+#ifdef WITH_SELINUX
-   int selinux_enabled = is_selinux_enabled() > 0;
- #endif                /*WITH_SELINUX */
- 
-@@ -726,21 +691,12 @@ static void read_proc(void)
-                 while ((dt = readdir(taskdir)) != NULL) {
-                   if ((thread = atoi(dt->d_name)) != 0) {
-                     if (thread != pid) {
--#ifdef WITH_SELINUX
-                       if (print_args)
-                         add_proc(threadname, thread, pid, pgid, st.st_uid, 
-                             threadname, strlen (threadname) + 1, 1,scontext);
-                       else
-                         add_proc(threadname, thread, pid, pgid, st.st_uid, 
-                             NULL, 0, 1, scontext);
--#else                /*WITH_SELINUX */
--                      if (print_args)
--                        add_proc(threadname, thread, pid, pgid, st.st_uid,
--                            threadname, strlen (threadname) + 1, 1);
--                      else
--                        add_proc(threadname, thread, pid, pgid, st.st_uid,
--                            NULL, 0, 1);
--#endif                /*WITH_SELINUX */
-                       }
-                     }
-                   }
-@@ -749,11 +705,7 @@ static void read_proc(void)
-                 }
-               free(taskpath);
-               if (!print_args)
--#ifdef WITH_SELINUX
-                 add_proc(comm, pid, ppid, pgid, st.st_uid, NULL, 0, 0, scontext);
--#else                /*WITH_SELINUX */
--                add_proc(comm, pid, ppid, pgid, st.st_uid, NULL, 0, 0);
--#endif                /*WITH_SELINUX */
-               else {
-                 sprintf(path, "%s/%d/cmdline", PROC_BASE, pid);
-                 if ((fd = open(path, O_RDONLY)) < 0) {
-@@ -770,13 +722,8 @@ static void read_proc(void)
-                   size--;
-                 if (size)
-                   buffer[size++] = 0;
--#ifdef WITH_SELINUX
-                 add_proc(comm, pid, ppid, pgid, st.st_uid,
-                      buffer, size, 0, scontext);
--#else                /*WITH_SELINUX */
--                add_proc(comm, pid, ppid, pgid, st.st_uid,
--                     buffer, size, 0);
--#endif                /*WITH_SELINUX */
-               }
-             }
-           }
-@@ -787,7 +734,7 @@ static void read_proc(void)
-     }
-   }
-   (void) closedir(dir);
--  fix_orphans();
-+  fix_orphans(scontext);
-   if (print_args)
-     free(buffer);
-   if (empty) {
-@@ -796,7 +743,7 @@ static void read_proc(void)
-   }
- }
- 
--static void fix_orphans(void)
-+static void fix_orphans(security_context_t scontext)
- {
-   /* When using kernel 3.3 with hidepid feature enabled on /proc
-    * then we need fake root pid and gather all the orphan processes
-@@ -807,11 +754,7 @@ static void fix_orphans(void)
-   PROC *root, *walk;
- 
-   if (!(root = find_proc(ROOT_PID))) {
--#ifdef WITH_SELINUX
-     root = new_proc("?", ROOT_PID, 0, scontext);
--#else                                /*WITH_SELINUX */
--    root = new_proc("?", ROOT_PID, 0);
--#endif
-   }
-   for (walk = list; walk; walk = walk->next) {
- 	if (walk->pid == 1 || walk->pid == 0)
--- 
-1.7.9.5
-

deleted file mode 100644
index d25468e..0000000
@@ -1,7 +0,0 @@
-PR .= ".2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://pstree-compiles-with-SE-Linux.patch"
-
-inherit enable-selinux

new file mode 100644
index 0000000..68b266d
@@ -0,0 +1,5 @@
+PR .= ".1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+inherit enable-selinux

index 78ed06d..b3bad6b 100644
@@ -12,6 +12,8 @@ SRC_URI = "http://oss.tresys.com/projects/setools/chrome/site/dists/setools-${PV
 SRC_URI[md5sum] = "d68d0d4e4da0f01da0f208782ff04b91"
 SRC_URI[sha256sum] = "44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999"
 
+PR .= ".1"
+
 SRC_URI += "file://setools-neverallow-rules-all-always-fail.patch"
 SRC_URI += "file://setools-Fix-sepol-calls-to-work-with-latest-libsepol.patch"
 #SRC_URI += "file://setools-Changes-to-support-named-file_trans-rules.patch"

@@ -69,7 +71,7 @@ FILES_${PN} += "\
 	${mandir}/man1/sesearch.1.gz \
 	"
 
-inherit autotools pythonnative
+inherit autotools-brokensep pythonnative
 
 # need to export these variables for python-config to work
 export BUILD_SYS