PERFORCE change 100124 for review

Tue Jun 27 08:28:13 UTC 2006

http://perforce.freebsd.org/chv.cgi?CH=100124

Change 100124 by dongmei at soc-dongmei-sebsd on 2006/06/27 08:27:32

	Modify part of c files in contrib/sebsd/setools/libapol to complie on Freebsd environment and write a Makefile file for libapol under lib directory in source tree

Affected files ...

.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/Makefile#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/VERSION#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol-perm-mapping#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_parse.y#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_scan.l#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/borrowed.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_parse.y#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_scan.l#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.c#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.h#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/etc/mtree/BSD.include.dist#2 edit
.. //depot/projects/soc2006/dongmei_sebsd/lib/libapol/Makefile#1 add

Differences ...

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/Makefile#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/VERSION#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/analysis.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol-perm-mapping#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apol_tcl_render.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_parse.y#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/apolicy_scan.l#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/avl-util.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.c#2 (text+ko) ====

@@ -11,7 +11,7 @@
  */
 
 #include <sys/types.h>
-#include <asm/types.h>
+//#include <asm/types.h>
 #include "binpol.h"
 #include "fbuf.h"
 #include "borrowed.h"

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/binpol.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/borrowed.h#2 (text+ko) ====

@@ -8,8 +8,8 @@
 #ifndef _APOLICY_BINPOL_BORROWED_H_
 #define _APOLICY_BINPOL_BORROWED_H_
 
-#include <byteswap.h>
-#include <endian.h>
+//#include <byteswap.h>
+#include <sys/endian.h>
 #include <sys/types.h>
 
 

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.c#2 (text+ko) ====

@@ -9,7 +9,7 @@
  *
  * Also contains our ebitmap unique functions
  */
-#include <asm/types.h>
+//#include <asm/types.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "ebitmap.h"

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/bpmaps.h#2 (text+ko) ====

@@ -11,7 +11,7 @@
 #ifndef _APOLICY_BINPOL_BMAPS_H_
 #define _APOLICY_BINPOL_BMAPS_H_
 
-#include <asm/types.h>
+#include <sys/types.h>
 #include "ebitmap.h"
 #include "../policy.h"
 

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.c#2 (text+ko) ====

@@ -13,7 +13,7 @@
 #include "borrowed.h"
 #include "fbuf.h"
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <errno.h>
 
 #define EBITMAP_ERR		-8

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/ebitmap.h#2 (text+ko) ====

@@ -21,8 +21,8 @@
 #define _APOL_EBITMAP_H_
 
 #include <sys/types.h>
-#include <asm/types.h>
-#include <malloc.h>
+//#include <asm/types.h>
+#include <stdlib.h>
 #include <string.h>
 #include "fbuf.h"
 

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.c#2 (text+ko) ====

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "fbuf.h"
 
 int ap_init_fbuf(ap_fbuf_t **fb)

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/binpol/fbuf.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/clone.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/cond.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/dta.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_parse.y#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/flowassert_scan.l#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/infoflow.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/perm-map.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/poldiff.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-avl.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-io.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy-query.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
 #include "perm-map.h"
 #include "util.h"
 #include "cond.h"
-#include <asm/types.h>
+#include <sys/types.h>
 
 #include <stdlib.h>
 #include <assert.h>

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/policy.h#2 (text+ko) ====

@@ -21,7 +21,7 @@
 #include "avl-util.h"
 #include "util.h"
 #include "semantic/avhash.h"
-#include <asm/types.h>
+#include <sys/types.h>
 
 #include <stdio.h>
 #include <string.h>

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/queue.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/relabel_analysis.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/render.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/symtable.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.c#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/setools/libapol/util.h#2 (text+ko) ====


==== //depot/projects/soc2006/dongmei_sebsd/etc/mtree/BSD.include.dist#2 (text+ko) ====

@@ -233,6 +233,16 @@
     ..
     semanage
     ..
+    libapol
+		semantic
+		..
+		binpol
+		..
+	..
+	libsefs
+		sqlite
+		..
+	..
     sepol
     ..
     sys
