diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h

index 0725b57..b2a38fb 100644

--- a/libselinux/include/selinux/selinux.h

+++ b/libselinux/include/selinux/selinux.h

@@ -514,6 +514,9 @@ extern int selinux_check_securetty_context(const security_context_t tty_context)

    which performs the initial mount of selinuxfs. */

 void set_selinuxmnt(char *mnt);

+/* clear selinuxmnt variable and free allocated memory */

+void fini_selinuxmnt(void);

+

 /* Execute a helper for rpm in an appropriate security context. */

 extern int rpm_execcon(unsigned int verified,

 		       const char *filename,

diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile

index bf665ab..ccd08ae 100644

--- a/libselinux/src/Makefile

+++ b/libselinux/src/Makefile

@@ -1,10 +1,11 @@

 # Installation directories.

+PYTHON ?= python

 PREFIX ?= $(DESTDIR)/usr

 LIBDIR ?= $(PREFIX)/lib

 SHLIBDIR ?= $(DESTDIR)/lib

 INCLUDEDIR ?= $(PREFIX)/include

-PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')

-PYINC ?= /usr/include/$(PYLIBVER)

+PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_info[0:2])')

+PYINC ?= $(shell pkg-config --cflags `basename $(PYTHON)`)

 PYLIB ?= /usr/lib/$(PYLIBVER)

 PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)

 RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')

@@ -23,13 +24,13 @@ SWIGIF= selinuxswig_python.i selinuxswig_python_exception.i

 SWIGRUBYIF= selinuxswig_ruby.i

 SWIGCOUT= selinuxswig_wrap.c

 SWIGRUBYCOUT= selinuxswig_ruby_wrap.c

-SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) 

+SWIGLOBJ:= $(patsubst %.c,$(PYPREFIX)%.lo,$(SWIGCOUT)) 

 SWIGRUBYLOBJ:= $(patsubst %.c,%.lo,$(SWIGRUBYCOUT)) 

-SWIGSO=_selinux.so

+SWIGSO=$(PYPREFIX)_selinux.so

 SWIGFILES=$(SWIGSO) selinux.py selinuxswig_python_exception.i

 SWIGRUBYSO=_rubyselinux.so

 LIBSO=$(TARGET).$(LIBVERSION)

-AUDIT2WHYSO=audit2why.so

+AUDIT2WHYSO=$(PYPREFIX)audit2why.so

 ifeq ($(DISABLE_AVC),y)

 	UNUSED_SRCS+=avc.c avc_internal.c avc_sidtab.c mapping.c stringrep.c checkAccess.c

@@ -70,7 +71,7 @@ $(LIBA):  $(OBJS)

 	$(RANLIB) $@

 $(SWIGLOBJ): $(SWIGCOUT)

-	$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<

+	$(CC) $(filter-out -Werror,$(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<

 $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)

 	$(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<

@@ -91,10 +92,10 @@ $(LIBPC): $(LIBPC).in

 selinuxswig_python_exception.i: ../include/selinux/selinux.h

 	bash exception.sh > $@ 

-audit2why.lo: audit2why.c

-	$(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<

+$(PYPREFIX)audit2why.lo: audit2why.c

+	$(CC) $(CFLAGS) $(PYINC) -fPIC -DSHARED -c -o $@ $<

-$(AUDIT2WHYSO): audit2why.lo

+$(AUDIT2WHYSO): $(PYPREFIX)audit2why.lo

 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux ${LIBDIR}/libsepol.a -L$(LIBDIR) -Wl,-soname,$@

 %.o:  %.c policy.h

@@ -123,8 +124,8 @@ install: all

 install-pywrap: pywrap

 	test -d $(PYTHONLIBDIR)/site-packages/selinux || install -m 755 -d $(PYTHONLIBDIR)/site-packages/selinux

-	install -m 755 $(SWIGSO) $(PYTHONLIBDIR)/site-packages/selinux

-	install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux

+	install -m 755 $(SWIGSO) $(PYTHONLIBDIR)/site-packages/selinux/_selinux.so

+	install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux/audit2why.so

 	install -m 644  selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py

 install-rubywrap: rubywrap

diff --git a/libselinux/src/audit2why.c b/libselinux/src/audit2why.c

index 691bc67..12e8614 100644

--- a/libselinux/src/audit2why.c

+++ b/libselinux/src/audit2why.c

@@ -1,3 +1,6 @@

+/* Workaround for http://bugs.python.org/issue4835 */

+#define SIZEOF_SOCKET_T SIZEOF_INT

+

 #include <Python.h>

 #include <unistd.h>

 #include <stdlib.h>

@@ -255,6 +258,8 @@ static int __policy_init(const char *init_path)

 	fclose(fp);

 	sepol_set_policydb(&avc->policydb->p);

 	avc->handle = sepol_handle_create();

+	/* Turn off messages */

+	sepol_msg_set_callback(avc->handle, NULL, NULL);

 	rc = sepol_bool_count(avc->handle,

 			      avc->policydb, &cnt);

@@ -287,8 +292,10 @@ static int __policy_init(const char *init_path)

 static PyObject *init(PyObject *self __attribute__((unused)), PyObject *args) {

   int result;

   char *init_path=NULL;

-  if (PyArg_ParseTuple(args,(char *)"|s:policy_init",&init_path)) 

-	  result = __policy_init(init_path);

+  if (!PyArg_ParseTuple(args,(char *)"|s:policy_init",&init_path)) {

+    return NULL;

+  }

+  result = __policy_init(init_path);

   return Py_BuildValue("i", result);

 }

@@ -353,7 +360,11 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args

 		strObj = PyList_GetItem(listObj, i); /* Can't fail */

 		/* make it a string */

+#if PY_MAJOR_VERSION >= 3

+		permstr = _PyUnicode_AsString( strObj );

+#else

 		permstr = PyString_AsString( strObj );

+#endif

 		perm = string_to_av_perm(tclass, permstr);

 		if (!perm) {

@@ -423,10 +434,39 @@ static PyMethodDef audit2whyMethods[] = {

     {NULL, NULL, 0, NULL}        /* Sentinel */

 };

+#if PY_MAJOR_VERSION >= 3

+/* Module-initialization logic specific to Python 3 */

+struct module_state {

+	/* empty for now */

+};

+static struct PyModuleDef moduledef = {

+	PyModuleDef_HEAD_INIT,

+	"audit2why",

+	NULL,

+	sizeof(struct module_state),

+	audit2whyMethods,

+	NULL,

+	NULL,

+	NULL,

+	NULL

+};

+

+PyMODINIT_FUNC

+PyInit_audit2why(void)

+#else

 PyMODINIT_FUNC

 initaudit2why(void)

+#endif

 {

-	PyObject *m = Py_InitModule("audit2why", audit2whyMethods);

+	PyObject *m;

+#if PY_MAJOR_VERSION >= 3

+	m = PyModule_Create(&moduledef);

+	if (m == NULL) {

+		return NULL;

+	}

+#else

+	m  = Py_InitModule("audit2why", audit2whyMethods);

+#endif

 	PyModule_AddIntConstant(m,"UNKNOWN", UNKNOWN);

 	PyModule_AddIntConstant(m,"BADSCON", BADSCON);

 	PyModule_AddIntConstant(m,"BADTCON", BADTCON);

@@ -440,4 +480,8 @@ initaudit2why(void)

 	PyModule_AddIntConstant(m,"BOOLEAN", BOOLEAN);

 	PyModule_AddIntConstant(m,"CONSTRAINT", CONSTRAINT);

 	PyModule_AddIntConstant(m,"RBAC", RBAC);

+

+#if PY_MAJOR_VERSION >= 3

+	return m;

+#endif

 }

diff --git a/libselinux/src/callbacks.c b/libselinux/src/callbacks.c

index b245364..7c47222 100644

--- a/libselinux/src/callbacks.c

+++ b/libselinux/src/callbacks.c

@@ -16,6 +16,7 @@ default_selinux_log(int type __attribute__((unused)), const char *fmt, ...)

 {

 	int rc;

 	va_list ap;

+	if (is_selinux_enabled() == 0) return 0;

 	va_start(ap, fmt);

 	rc = vfprintf(stderr, fmt, ap);

 	va_end(ap);

diff --git a/libselinux/src/init.c b/libselinux/src/init.c

index 1dd9838..a948920 100644

--- a/libselinux/src/init.c

+++ b/libselinux/src/init.c

@@ -96,12 +96,14 @@ static void init_selinuxmnt(void)

 	return;

 }

-static void fini_selinuxmnt(void)

+void fini_selinuxmnt(void)

 {

 	free(selinux_mnt);

 	selinux_mnt = NULL;

 }

+hidden_def(fini_selinuxmnt)

+

 void set_selinuxmnt(char *mnt)

 {

 	selinux_mnt = strdup(mnt);

diff --git a/libselinux/src/load_policy.c b/libselinux/src/load_policy.c

index 36ce029..83d2143 100644

--- a/libselinux/src/load_policy.c

+++ b/libselinux/src/load_policy.c

@@ -329,7 +329,7 @@ int selinux_init_load_policy(int *enforce)

 	selinux_getenforcemode(&seconfig);

 	/* Check for an override of the mode via the kernel command line. */

-	rc = mount("none", "/proc", "proc", 0, 0);

+	rc = mount("proc", "/proc", "proc", 0, 0);

 	cfg = fopen("/proc/cmdline", "r");

 	if (cfg) {

 		char *tmp;

@@ -369,7 +369,7 @@ int selinux_init_load_policy(int *enforce)

 	 * Check for the existence of SELinux via selinuxfs, and 

 	 * mount it if present for use in the calls below.  

 	 */

-	if (mount("none", SELINUXMNT, "selinuxfs", 0, 0) < 0 && errno != EBUSY) {

+	if (mount("selinuxfs", SELINUXMNT, "selinuxfs", 0, 0) < 0 && errno != EBUSY) {

 		if (errno == ENODEV) {

 			/*

 			 * SELinux was disabled in the kernel, either

@@ -398,6 +398,7 @@ int selinux_init_load_policy(int *enforce)

 		if (rc == 0) {

 			/* Successfully disabled, so umount selinuxfs too. */

 			umount(SELINUXMNT);

+			fini_selinuxmnt();

 		}

 		/*

 		 * If we failed to disable, SELinux will still be 

diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c

index f3e45af..2f3c16a 100644

--- a/libselinux/src/matchpathcon.c

+++ b/libselinux/src/matchpathcon.c

@@ -2,6 +2,7 @@

 #include <string.h>

 #include <errno.h>

 #include <stdio.h>

+#include <syslog.h>

 #include "selinux_internal.h"

 #include "label_internal.h"

 #include "callbacks.h"

@@ -60,7 +61,7 @@ static void

 {

 	va_list ap;

 	va_start(ap, fmt);

-	vfprintf(stderr, fmt, ap);

+	vsyslog(LOG_ERR, fmt, ap);

 	va_end(ap);

 }

diff --git a/libselinux/src/selinux.py b/libselinux/src/selinux.py

index fd63a4f..705012c 100644

--- a/libselinux/src/selinux.py

+++ b/libselinux/src/selinux.py

@@ -1,5 +1,5 @@

 # This file was automatically generated by SWIG (http://www.swig.org).

-# Version 1.3.40

+# Version 2.0.1

 #

 # Do not make changes to this file unless you know what you are doing--modify

 # the SWIG interface file instead.

@@ -79,6 +79,14 @@ def restorecon(path, recursive=False):

                              map(restorecon, [os.path.join(dirname, fname)

                                               for fname in fnames]), None)

+def chcon(path, context, recursive=False):

+    """ Set the SELinux context on a given path """

+    lsetfilecon(path, context)

+    if recursive:

+        for root, dirs, files in os.walk(path):

+            for name in files + dirs:

+               lsetfilecon(os.path.join(root,name), context)

+

 def copytree(src, dest):

     """ An SELinux-friendly shutil.copytree method """

     shutil.copytree(src, dest)

@@ -1588,6 +1596,7 @@ get_default_type = _selinux.get_default_type

 SELABEL_CTX_FILE = _selinux.SELABEL_CTX_FILE

 SELABEL_CTX_MEDIA = _selinux.SELABEL_CTX_MEDIA

 SELABEL_CTX_X = _selinux.SELABEL_CTX_X

+SELABEL_CTX_DB = _selinux.SELABEL_CTX_DB

 SELABEL_OPT_UNUSED = _selinux.SELABEL_OPT_UNUSED

 SELABEL_OPT_VALIDATE = _selinux.SELABEL_OPT_VALIDATE

 SELABEL_OPT_BASEONLY = _selinux.SELABEL_OPT_BASEONLY

@@ -1621,6 +1630,15 @@ SELABEL_X_EVENT = _selinux.SELABEL_X_EVENT

 SELABEL_X_SELN = _selinux.SELABEL_X_SELN

 SELABEL_X_POLYPROP = _selinux.SELABEL_X_POLYPROP

 SELABEL_X_POLYSELN = _selinux.SELABEL_X_POLYSELN

+SELABEL_DB_DATABASE = _selinux.SELABEL_DB_DATABASE

+SELABEL_DB_SCHEMA = _selinux.SELABEL_DB_SCHEMA

+SELABEL_DB_TABLE = _selinux.SELABEL_DB_TABLE

+SELABEL_DB_COLUMN = _selinux.SELABEL_DB_COLUMN

+SELABEL_DB_SEQUENCE = _selinux.SELABEL_DB_SEQUENCE

+SELABEL_DB_VIEW = _selinux.SELABEL_DB_VIEW

+SELABEL_DB_PROCEDURE = _selinux.SELABEL_DB_PROCEDURE

+SELABEL_DB_BLOB = _selinux.SELABEL_DB_BLOB

+SELABEL_DB_TUPLE = _selinux.SELABEL_DB_TUPLE

 def is_selinux_enabled():

   return _selinux.is_selinux_enabled()

@@ -2201,6 +2219,10 @@ def selinux_x_context_path():

   return _selinux.selinux_x_context_path()

 selinux_x_context_path = _selinux.selinux_x_context_path

+def selinux_sepgsql_context_path():

+  return _selinux.selinux_sepgsql_context_path()

+selinux_sepgsql_context_path = _selinux.selinux_sepgsql_context_path

+

 def selinux_contexts_path():

   return _selinux.selinux_contexts_path()

 selinux_contexts_path = _selinux.selinux_contexts_path

diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h

index fdddfaf..14cc412 100644

--- a/libselinux/src/selinux_internal.h

+++ b/libselinux/src/selinux_internal.h

@@ -3,6 +3,7 @@

 #include "dso.h"

 hidden_proto(selinux_mkload_policy)

+    hidden_proto(fini_selinuxmnt)

     hidden_proto(set_selinuxmnt)

     hidden_proto(security_disable)

     hidden_proto(security_policyvers)

diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i

index dea0e80..bb227e9 100644

--- a/libselinux/src/selinuxswig_python.i

+++ b/libselinux/src/selinuxswig_python.i

@@ -45,7 +45,7 @@ def install(src, dest):

 	PyObject* list = PyList_New(*$2);

 	int i;

 	for (i = 0; i < *$2; i++) {

-		PyList_SetItem(list, i, PyString_FromString((*$1)[i]));

+		PyList_SetItem(list, i, PyBytes_FromString((*$1)[i]));

 	}

 	$result = SWIG_Python_AppendOutput($result, list);

 }

@@ -74,7 +74,9 @@ def install(src, dest):

 			len++;

 		plist = PyList_New(len);

 		for (i = 0; i < len; i++) {

-			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));

+			PyList_SetItem(plist, i, 

+                                       PyBytes_FromString((*$1)[i])

+                                       );

 		}

 	} else {

 		plist = PyList_New(0);

@@ -91,7 +93,9 @@ def install(src, dest):

 	if (*$1) {

 		plist = PyList_New(result);

 		for (i = 0; i < result; i++) {

-			PyList_SetItem(plist, i, PyString_FromString((*$1)[i]));

+			PyList_SetItem(plist, i, 

+                                       PyBytes_FromString((*$1)[i])

+                                       );

 		}

 	} else {

 		plist = PyList_New(0);

@@ -144,16 +148,20 @@ def install(src, dest):

 	$1 = (char**) malloc(size + 1);

 	for(i = 0; i < size; i++) {

-		if (!PyString_Check(PySequence_GetItem($input, i))) {

-			PyErr_SetString(PyExc_ValueError, "Sequence must contain only strings");

+		if (!PyBytes_Check(PySequence_GetItem($input, i))) {

+			PyErr_SetString(PyExc_ValueError, "Sequence must contain only bytes");

+

 			return NULL;

 		}

+

 	}

 	for(i = 0; i < size; i++) {

 		s = PySequence_GetItem($input, i);

-		$1[i] = (char*) malloc(PyString_Size(s) + 1);

-		strcpy($1[i], PyString_AsString(s));

+

+		$1[i] = (char*) malloc(PyBytes_Size(s) + 1);

+		strcpy($1[i], PyBytes_AsString(s));

+

 	}

 	$1[size] = NULL;

 }

diff --git a/libselinux/src/selinuxswig_wrap.c b/libselinux/src/selinuxswig_wrap.c

index e0884f6..e60a3d3 100644

--- a/libselinux/src/selinuxswig_wrap.c

+++ b/libselinux/src/selinuxswig_wrap.c

@@ -1,6 +1,6 @@

 /* ----------------------------------------------------------------------------

  * This file was automatically generated by SWIG (http://www.swig.org).

- * Version 1.3.40

+ * Version 2.0.1

  * 

  * This file is not intended to be easily readable and contains a number of 

  * coding conventions designed to improve portability and efficiency. Do not make

@@ -177,7 +177,7 @@

 /* 

    Flags/methods for returning states.

-   The SWIG conversion methods, as ConvertPtr, return and integer 

+   The SWIG conversion methods, as ConvertPtr, return an integer 

    that tells if the conversion was successful or not. And if not,

    an error code can be returned (see swigerrors.swg for the codes).

@@ -1064,9 +1064,6 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)

 /* -----------------------------------------------------------------------------

- * See the LICENSE file for information on copyright, usage and redistribution

- * of SWIG, and the README file for authors - http://www.swig.org/release.html.

- *

  * pyrun.swg

  *

  * This file contains the runtime support for Python modules

@@ -1113,8 +1110,18 @@ SWIGRUNTIME PyObject* SWIG_PyInstanceMethod_New(PyObject *self, PyObject *func)

 #define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   

 #define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        

 #define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 

-#define SWIG_fail                        		goto fail					   

+#define SWIG_fail                        		goto fail				

+/*

+ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of

+ * CObjects API.

+ */

+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \

+     (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0))

+#define USE_CAPSULES

+#define TYPE_POINTER_NAME \

+    ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)

+#endif

 /* Runtime API implementation */

@@ -2047,10 +2054,13 @@ _SWIG_This(void)

     return SWIG_Python_str_FromChar("this");

 }

+static PyObject *swig_this = NULL;

+

 SWIGRUNTIME PyObject *

 SWIG_This(void)

 {

-  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();

+  if (swig_this == NULL)

+    swig_this = _SWIG_This();

   return swig_this;

 }

@@ -2154,7 +2164,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int

               int newmemory = 0;

               *ptr = SWIG_TypeCast(tc,vptr,&newmemory);

               if (newmemory == SWIG_CAST_NEW_MEMORY) {

-                assert(own);

+                assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */

                 if (own)

                   *own = *own | SWIG_CAST_NEW_MEMORY;

               }

@@ -2424,8 +2434,12 @@ SWIG_Python_GetModule(void) {

 #ifdef SWIG_LINK_RUNTIME

     type_pointer = SWIG_ReturnGlobalTypeList((void *)0);

 #else

+#ifdef USE_CAPSULES

+    type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0);

+#else

     type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,

 				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);

+#endif

     if (PyErr_Occurred()) {

       PyErr_Clear();

       type_pointer = (void *)0;

@@ -2470,9 +2484,14 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o)

 SWIGRUNTIME void

 SWIG_Python_DestroyModule(void *vptr)

 {

+  size_t i;

+#ifdef USE_CAPSULES

+  swig_module_info *swig_module =

+    (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME);

+#else

   swig_module_info *swig_module = (swig_module_info *) vptr;

+#endif

   swig_type_info **types = swig_module->types;

-  size_t i;

   for (i =0; i < swig_module->size; ++i) {

     swig_type_info *ty = types[i];

     if (ty->owndata) {

@@ -2481,6 +2500,7 @@ SWIG_Python_DestroyModule(void *vptr)

     }

   }

   Py_DECREF(SWIG_This());

+  swig_this = NULL;

 }

 SWIGRUNTIME void

@@ -2494,9 +2514,18 @@ SWIG_Python_SetModule(swig_module_info *swig_module) {

   PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,

 				   swig_empty_runtime_method_table);

 #endif

+#ifdef USE_CAPSULES

+  PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME,

+				    (PyCapsule_Destructor)SWIG_Python_DestroyModule);

+#else

   PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);

+#endif

   if (pointer && module) {

+#ifdef USE_CAPSULES

+    PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);

+#else

     PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);

+#endif

   } else {

     Py_XDECREF(pointer);

   }

@@ -2517,12 +2546,20 @@ SWIG_Python_TypeQuery(const char *type)

   PyObject *obj = PyDict_GetItem(cache, key);

   swig_type_info *descriptor;

   if (obj) {

+#ifdef USE_CAPSULES

+    descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type);

+#else

     descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);

+#endif

   } else {

     swig_module_info *swig_module = SWIG_Python_GetModule();

     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);

     if (descriptor) {

+#ifdef USE_CAPSULES

+      obj = PyCapsule_New(descriptor, type, NULL);

+#else

       obj = PyCObject_FromVoidPtr(descriptor, NULL);

+#endif

       PyDict_SetItem(cache, key, obj);

       Py_DECREF(obj);

     }

@@ -2717,7 +2754,7 @@ static swig_module_info swig_module = {swig_types, 34, 0, 0, 0, 0};

 #endif

 #define SWIG_name    "_selinux"

-#define SWIGVERSION 0x010340 

+#define SWIGVERSION 0x020001 

 #define SWIG_VERSION SWIGVERSION

@@ -3345,7 +3382,7 @@ fail:

 SWIGINTERN PyObject *_wrap_avc_context_to_sid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   security_id_t *arg2 = (security_id_t *) 0 ;

   int res1 ;

   char *buf1 = 0 ;

@@ -3360,7 +3397,7 @@ SWIGINTERN PyObject *_wrap_avc_context_to_sid(PyObject *SWIGUNUSEDPARM(self), Py

   if (!PyArg_ParseTuple(args,(char *)"O:avc_context_to_sid",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "avc_context_to_sid" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "avc_context_to_sid" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   result = (int)avc_context_to_sid(arg1,arg2);

@@ -3383,7 +3420,7 @@ fail:

 SWIGINTERN PyObject *_wrap_avc_context_to_sid_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   security_id_t *arg2 = (security_id_t *) 0 ;

   int res1 ;

   char *buf1 = 0 ;

@@ -3398,7 +3435,7 @@ SWIGINTERN PyObject *_wrap_avc_context_to_sid_raw(PyObject *SWIGUNUSEDPARM(self)

   if (!PyArg_ParseTuple(args,(char *)"O:avc_context_to_sid_raw",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "avc_context_to_sid_raw" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "avc_context_to_sid_raw" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   result = (int)avc_context_to_sid_raw(arg1,arg2);

@@ -5641,7 +5678,9 @@ SWIGINTERN PyObject *_wrap_get_ordered_context_list(PyObject *SWIGUNUSEDPARM(sel

     if (*arg3) {

       plist = PyList_New(result);

       for (i = 0; i < result; i++) {

-        PyList_SetItem(plist, i, PyString_FromString((*arg3)[i]));

+        PyList_SetItem(plist, i, 

+          PyBytes_FromString((*arg3)[i])

+          );

       }

     } else {

       plist = PyList_New(0);

@@ -5714,7 +5753,9 @@ SWIGINTERN PyObject *_wrap_get_ordered_context_list_with_level(PyObject *SWIGUNU

     if (*arg4) {

       plist = PyList_New(result);

       for (i = 0; i < result; i++) {

-        PyList_SetItem(plist, i, PyString_FromString((*arg4)[i]));

+        PyList_SetItem(plist, i, 

+          PyBytes_FromString((*arg4)[i])

+          );

       }

     } else {

       plist = PyList_New(0);

@@ -6390,7 +6431,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6400,7 +6441,7 @@ SWIGINTERN PyObject *_wrap_setcon(PyObject *SWIGUNUSEDPARM(self), PyObject *args

   if (!PyArg_ParseTuple(args,(char *)"O:setcon",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setcon" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setcon" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   {

@@ -6421,7 +6462,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setcon_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6431,7 +6472,7 @@ SWIGINTERN PyObject *_wrap_setcon_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *

   if (!PyArg_ParseTuple(args,(char *)"O:setcon_raw",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setcon_raw" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setcon_raw" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   {

@@ -6650,7 +6691,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setexeccon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6660,7 +6701,7 @@ SWIGINTERN PyObject *_wrap_setexeccon(PyObject *SWIGUNUSEDPARM(self), PyObject *

   if (!PyArg_ParseTuple(args,(char *)"O:setexeccon",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setexeccon" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setexeccon" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   {

@@ -6681,7 +6722,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setexeccon_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6691,7 +6732,7 @@ SWIGINTERN PyObject *_wrap_setexeccon_raw(PyObject *SWIGUNUSEDPARM(self), PyObje

   if (!PyArg_ParseTuple(args,(char *)"O:setexeccon_raw",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setexeccon_raw" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setexeccon_raw" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   {

@@ -6772,7 +6813,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setfscreatecon(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6782,7 +6823,7 @@ SWIGINTERN PyObject *_wrap_setfscreatecon(PyObject *SWIGUNUSEDPARM(self), PyObje

   if (!PyArg_ParseTuple(args,(char *)"O:setfscreatecon",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setfscreatecon" "', argument " "1"" of type '" "security_context_t""'");

+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setfscreatecon" "', argument " "1"" of type '" "security_context_t const""'");

   }

   arg1 = (security_context_t)(buf1);

   {

@@ -6803,7 +6844,7 @@ fail:

 SWIGINTERN PyObject *_wrap_setfscreatecon_raw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {

   PyObject *resultobj = 0;

-  security_context_t arg1 = (security_context_t) 0 ;

+  security_context_t arg1 = (security_context_t) (security_context_t)0 ;

   int res1 ;

   char *buf1 = 0 ;

   int alloc1 = 0 ;

@@ -6813,7 +6854,7 @@ SWIGINTERN PyObject *_wrap_setfscreatecon_raw(PyObject *SWIGUNUSEDPARM(self), Py

   if (!PyArg_ParseTuple(args,(char *)"O:setfscreatecon_raw",&obj0)) SWIG_fail;

   res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);

   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "setfscreatecon_raw" "', argument " "1"" of type '" "security_context_t""'");