Blob Blame Raw
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/av_permissions.h libselinux-2.0.49/include/selinux/av_permissions.h
--- nsalibselinux/include/selinux/av_permissions.h	2007-11-15 15:52:46.000000000 -0500
+++ libselinux-2.0.49/include/selinux/av_permissions.h	2008-01-25 10:31:28.000000000 -0500
@@ -900,6 +900,8 @@
 #define PACKET__SEND                              0x00000001UL
 #define PACKET__RECV                              0x00000002UL
 #define PACKET__RELABELTO                         0x00000004UL
+#define PACKET__FLOW_IN                           0x00000008UL
+#define PACKET__FLOW_OUT                          0x00000010UL
 #define KEY__VIEW                                 0x00000001UL
 #define KEY__READ                                 0x00000002UL
 #define KEY__WRITE                                0x00000004UL
diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.49/src/audit2why.c
--- nsalibselinux/src/audit2why.c	2008-01-23 16:47:07.000000000 -0500
+++ libselinux-2.0.49/src/audit2why.c	2008-01-25 10:58:28.000000000 -0500
@@ -5,6 +5,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <sepol/sepol.h>
+#include <sepol/policydb.h>
 #include <sepol/policydb/services.h>
 #include <Python.h>
 #include <selinux/selinux.h>
@@ -200,7 +201,7 @@
 			return 0;    // trigger exception
 		}
 	} else {
-		vers = security_policyvers();
+		vers = sepol_policy_kern_vers_max();
 		if (vers < 0) {
 			snprintf(errormsg, sizeof(errormsg), 
 				 "Could not get policy version:  %s\n",
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.49/src/matchpathcon.c
--- nsalibselinux/src/matchpathcon.c	2007-09-28 09:48:58.000000000 -0400
+++ libselinux-2.0.49/src/matchpathcon.c	2008-01-25 10:31:28.000000000 -0500
@@ -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"
@@ -57,7 +58,7 @@
 {
 	va_list ap;
 	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
+	vsyslog(LOG_ERR, fmt, ap);
 	va_end(ap);
 }
 
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-2.0.49/src/selinuxswig.i
--- nsalibselinux/src/selinuxswig.i	2008-01-23 14:36:29.000000000 -0500
+++ libselinux-2.0.49/src/selinuxswig.i	2008-01-25 10:31:28.000000000 -0500
@@ -14,6 +14,7 @@
 
 %typedef unsigned mode_t;
 %typedef unsigned pid_t;
+%typedef char * security_context_t;
 
 %typemap(in, numinputs=0) (char ***names, int *len) (char **temp1, int temp2) {
 	$1 = &temp1;