rpms/libsemanage/devel libsemanage-rhat.patch, 1.19, 1.20 libsemanage.spec, 1.120, 1.121

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Mar 27 19:48:12 UTC 2007


Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23057

Modified Files:
	libsemanage-rhat.patch libsemanage.spec 
Log Message:
* Sat Mar 17 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-2
- Add SELinux to Man page Names so man -k will work


libsemanage-rhat.patch:
 semanage_bool.3            |    3 +++
 semanage_bool_set_active.3 |    2 +-
 semanage_count.3           |    3 +++
 semanage_del.3             |    3 +++
 semanage_exists.3          |    3 +++
 semanage_fcontext.3        |    3 +++
 semanage_iface.3           |    3 +++
 semanage_iterate.3         |    3 +++
 semanage_list.3            |    7 +++++--
 semanage_modify.3          |    3 +++
 semanage_node.3            |    3 +++
 semanage_port.3            |    3 +++
 semanage_query.3           |    3 +++
 semanage_seuser.3          |    3 +++
 semanage_user.3            |    3 +++
 15 files changed, 45 insertions(+), 3 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libsemanage-rhat.patch	25 Jan 2007 22:48:00 -0000	1.19
+++ libsemanage-rhat.patch	27 Mar 2007 19:48:04 -0000	1.20
@@ -1,852 +1,184 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_python.i libsemanage-1.10.0/src/semanageswig_python.i
---- nsalibsemanage/src/semanageswig_python.i	2006-11-16 17:14:02.000000000 -0500
-+++ libsemanage-1.10.0/src/semanageswig_python.i	2007-01-24 13:33:28.000000000 -0500
-@@ -99,7 +99,7 @@
- %apply int *OUTPUT { size_t * };
- %apply int *OUTPUT { unsigned int * };
- 
--%typemap(in, numinputs=0) char **(char *temp) {
-+%typemap(in, numinputs=0) char **(char *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -108,7 +108,7 @@
- 	free(*$1);
- }
- 
--%typemap(in, numinputs=0) char ***(char **temp) {
-+%typemap(in, numinputs=0) char ***(char **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -136,7 +136,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_module_info_t ** parameter */
--%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp) {
-+%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -148,7 +148,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_context_t ** parameter */
--%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp) {
-+%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -160,7 +160,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_bool_t *** parameter */
--%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp) {
-+%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -183,7 +183,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp) {
-+%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -195,7 +195,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -203,7 +203,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_fcontext_t *** parameter */
--%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp) {
-+%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp=NULL) {
-         $1 = &temp;
- }
- 
-@@ -226,7 +226,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp) {
-+%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp=NULL) {
-         $1 = &temp;
- }
- 
-@@ -238,7 +238,7 @@
-         $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp=NULL) {
-         $1 = &temp;
- }
- 
-@@ -246,7 +246,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_iface_t *** parameter */
--%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp) {
-+%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -270,7 +270,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp) {
-+%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -282,7 +282,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -290,7 +290,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_seuser_t *** parameter */
--%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp) {
-+%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -314,7 +314,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp) {
-+%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -326,7 +326,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -334,7 +334,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_user_t *** parameter */
--%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp) {
-+%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -357,7 +357,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp) {
-+%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -369,7 +369,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -377,7 +377,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_port_t *** parameter */
--%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp) {
-+%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -400,7 +400,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp) {
-+%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -412,7 +412,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -420,7 +420,7 @@
- 
- /* the wrapper will setup this parameter for passing... the resulting python functions
-    will not take the semanage_node_t *** parameter */
--%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp) {
-+%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -443,7 +443,7 @@
- 	}
- }
- 
--%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp) {
-+%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-@@ -456,7 +456,7 @@
- 	$result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0));
- }
- 
--%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp) {
-+%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp=NULL) {
- 	$1 = &temp;
- }
- 
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_wrap.c libsemanage-1.10.0/src/semanageswig_wrap.c
---- nsalibsemanage/src/semanageswig_wrap.c	2006-11-16 17:14:02.000000000 -0500
-+++ libsemanage-1.10.0/src/semanageswig_wrap.c	2007-01-24 13:34:03.000000000 -0500
-@@ -3528,7 +3528,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_module_info_t *temp2 ;
-+  semanage_module_info_t *temp2 = NULL ;
-   int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -3923,7 +3923,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_context_t *temp2 ;
-+  semanage_context_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -3956,7 +3956,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_context_t *temp3 ;
-+  semanage_context_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4017,7 +4017,7 @@
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  semanage_context_t *temp3 ;
-+  semanage_context_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4058,7 +4058,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4099,7 +4099,7 @@
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  semanage_bool_key_t *temp3 ;
-+  semanage_bool_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4140,7 +4140,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_bool_key_t *temp3 ;
-+  semanage_bool_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4376,7 +4376,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_bool_t *temp2 ;
-+  semanage_bool_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -4409,7 +4409,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_bool_t *temp3 ;
-+  semanage_bool_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4469,7 +4469,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_bool_t *temp3 ;
-+  semanage_bool_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4616,7 +4616,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_bool_t **temp2 ;
-+  semanage_bool_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -4734,7 +4734,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_bool_t *temp3 ;
-+  semanage_bool_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -4881,7 +4881,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_bool_t **temp2 ;
-+  semanage_bool_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -4968,7 +4968,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_bool_t *temp3 ;
-+  semanage_bool_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -5115,7 +5115,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_bool_t **temp2 ;
-+  semanage_bool_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -5225,7 +5225,7 @@
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  semanage_iface_key_t *temp3 ;
-+  semanage_iface_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -5266,7 +5266,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_iface_key_t *temp3 ;
-+  semanage_iface_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -5512,7 +5512,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_iface_t *temp2 ;
-+  semanage_iface_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -5545,7 +5545,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_iface_t *temp3 ;
-+  semanage_iface_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -5676,7 +5676,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_iface_t *temp3 ;
-+  semanage_iface_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -5823,7 +5823,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_iface_t **temp2 ;
-+  semanage_iface_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -5870,7 +5870,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_iface_t *temp3 ;
-+  semanage_iface_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -6017,7 +6017,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_iface_t **temp2 ;
-+  semanage_iface_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -6065,7 +6065,7 @@
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  semanage_user_key_t *temp3 ;
-+  semanage_user_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -6106,7 +6106,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_user_key_t *temp3 ;
-+  semanage_user_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -6621,7 +6621,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char **temp3 ;
-+  char **temp3 = NULL ;
-   unsigned int temp4 ;
-   int res4 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -6675,7 +6675,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   unsigned int val4 ;
-   int ecode4 = 0 ;
-   PyObject * obj0 = 0 ;
-@@ -6720,7 +6720,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_user_t *temp2 ;
-+  semanage_user_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -6753,7 +6753,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_user_t *temp3 ;
-+  semanage_user_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -6884,7 +6884,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_user_t *temp3 ;
-+  semanage_user_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -7031,7 +7031,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_user_t **temp2 ;
-+  semanage_user_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -7078,7 +7078,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_user_t *temp3 ;
-+  semanage_user_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -7225,7 +7225,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_user_t **temp2 ;
-+  semanage_user_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -7340,7 +7340,7 @@
-   int ecode3 = 0 ;
-   int val4 ;
-   int ecode4 = 0 ;
--  semanage_port_key_t *temp5 ;
-+  semanage_port_key_t *temp5 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -7391,7 +7391,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_port_key_t *temp3 ;
-+  semanage_port_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -7697,7 +7697,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_port_t *temp2 ;
-+  semanage_port_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -7730,7 +7730,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_port_t *temp3 ;
-+  semanage_port_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -7861,7 +7861,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_port_t *temp3 ;
-+  semanage_port_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -8008,7 +8008,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_port_t **temp2 ;
-+  semanage_port_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -8055,7 +8055,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_port_t *temp3 ;
-+  semanage_port_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -8202,7 +8202,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_port_t **temp2 ;
-+  semanage_port_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -8315,7 +8315,7 @@
-   int alloc2 = 0 ;
-   int val3 ;
-   int ecode3 = 0 ;
--  semanage_fcontext_key_t *temp4 ;
-+  semanage_fcontext_key_t *temp4 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -8362,7 +8362,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_fcontext_key_t *temp3 ;
-+  semanage_fcontext_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -8620,7 +8620,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_fcontext_t *temp2 ;
-+  semanage_fcontext_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -8653,7 +8653,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_fcontext_t *temp3 ;
-+  semanage_fcontext_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -8784,7 +8784,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_fcontext_t *temp3 ;
-+  semanage_fcontext_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -8931,7 +8931,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_fcontext_t **temp2 ;
-+  semanage_fcontext_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -8978,7 +8978,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_fcontext_t *temp3 ;
-+  semanage_fcontext_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -9125,7 +9125,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_fcontext_t **temp2 ;
-+  semanage_fcontext_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -9173,7 +9173,7 @@
-   int res2 ;
-   char *buf2 = 0 ;
-   int alloc2 = 0 ;
--  semanage_seuser_key_t *temp3 ;
-+  semanage_seuser_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -9214,7 +9214,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_seuser_key_t *temp3 ;
-+  semanage_seuser_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -9528,7 +9528,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_seuser_t *temp2 ;
-+  semanage_seuser_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -9561,7 +9561,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_seuser_t *temp3 ;
-+  semanage_seuser_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -9692,7 +9692,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_seuser_t *temp3 ;
-+  semanage_seuser_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -9839,7 +9839,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_seuser_t **temp2 ;
-+  semanage_seuser_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -9886,7 +9886,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_seuser_t *temp3 ;
-+  semanage_seuser_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -10033,7 +10033,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_seuser_t **temp2 ;
-+  semanage_seuser_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -10150,7 +10150,7 @@
-   int alloc3 = 0 ;
-   int val4 ;
-   int ecode4 = 0 ;
--  semanage_node_key_t *temp5 ;
-+  semanage_node_key_t *temp5 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   PyObject * obj2 = 0 ;
-@@ -10205,7 +10205,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_node_key_t *temp3 ;
-+  semanage_node_key_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -10265,7 +10265,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -10306,7 +10306,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   size_t temp4 ;
-   int res4 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -10459,7 +10459,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -10500,7 +10500,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  char *temp3 ;
-+  char *temp3 = NULL ;
-   size_t temp4 ;
-   int res4 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -10786,7 +10786,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_node_t *temp2 ;
-+  semanage_node_t *temp2 = NULL ;
-   PyObject * obj0 = 0 ;
-   
-   {
-@@ -10819,7 +10819,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_node_t *temp3 ;
-+  semanage_node_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -10950,7 +10950,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_node_t *temp3 ;
-+  semanage_node_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -11097,7 +11097,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_node_t **temp2 ;
-+  semanage_node_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
-@@ -11144,7 +11144,7 @@
-   int res1 = 0 ;
-   void *argp2 = 0 ;
-   int res2 = 0 ;
--  semanage_node_t *temp3 ;
-+  semanage_node_t *temp3 = NULL ;
-   PyObject * obj0 = 0 ;
-   PyObject * obj1 = 0 ;
-   
-@@ -11291,7 +11291,7 @@
-   int result;
-   void *argp1 = 0 ;
-   int res1 = 0 ;
--  semanage_node_t **temp2 ;
-+  semanage_node_t **temp2 = NULL ;
-   unsigned int temp3 ;
-   int res3 = SWIG_TMPOBJ ;
-   PyObject * obj0 = 0 ;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_bool.3 libsemanage-2.0.0/man/man3/semanage_bool.3
+--- nsalibsemanage/man/man3/semanage_bool.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_bool.3	2007-03-17 09:09:50.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_bool 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Policy Booleans Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/boolean_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_bool_set_active.3 libsemanage-2.0.0/man/man3/semanage_bool_set_active.3
+--- nsalibsemanage/man/man3/semanage_bool_set_active.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_bool_set_active.3	2007-03-17 09:09:13.000000000 -0400
+@@ -1,7 +1,7 @@
+ .TH semanage_bool_set_local 3 "4 January 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ .SH "NAME"
+ .B semanage_bool_set_active \- 
+-update an existing boolean in the currently active policy
++update an existing SELinux boolean in the currently active policy
+ 
+ .SH "SYNOPSIS"
+ .B #include <semanage/booleans_active.h>
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_count.3 libsemanage-2.0.0/man/man3/semanage_count.3
+--- nsalibsemanage/man/man3/semanage_count.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_count.3	2007-03-17 09:08:40.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_count 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following count function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_del.3 libsemanage-2.0.0/man/man3/semanage_del.3
+--- nsalibsemanage/man/man3/semanage_del.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_del.3	2007-03-17 09:08:29.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_del 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following delete function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_exists.3 libsemanage-2.0.0/man/man3/semanage_exists.3
+--- nsalibsemanage/man/man3/semanage_exists.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_exists.3	2007-03-17 09:08:21.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_exists 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following exists function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_fcontext.3 libsemanage-2.0.0/man/man3/semanage_fcontext.3
+--- nsalibsemanage/man/man3/semanage_fcontext.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_fcontext.3	2007-03-17 09:08:09.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_fcontext 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux File Context Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/fcontext_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_iface.3 libsemanage-2.0.0/man/man3/semanage_iface.3
+--- nsalibsemanage/man/man3/semanage_iface.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_iface.3	2007-03-17 09:07:46.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_iface 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Network Interfaces Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/iface_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_iterate.3 libsemanage-2.0.0/man/man3/semanage_iterate.3
+--- nsalibsemanage/man/man3/semanage_iterate.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_iterate.3	2007-03-17 09:07:10.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_iterate 3 "15 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following iterate function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_list.3 libsemanage-2.0.0/man/man3/semanage_list.3
+--- nsalibsemanage/man/man3/semanage_list.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_list.3	2007-03-17 09:06:54.000000000 -0400
+@@ -1,7 +1,10 @@
+-.TH semanage_list 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
++.TH semanage_list 3 "16 March 2006" "ivg2 at cornell.edu" "SELinux managent API documentation"
++
++.SH "NAME" 
++SELinux Lists Management API
+ 
+ .SH "SYNOPSIS"
+-The following list function is supported for any semanage record.
++The following list function is supported for any SELinux managent record.
+ .br
+ Replace the function and object name as necessary.
+ 
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_modify.3 libsemanage-2.0.0/man/man3/semanage_modify.3
+--- nsalibsemanage/man/man3/semanage_modify.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_modify.3	2007-03-17 09:06:23.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_modify 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following modify function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_node.3 libsemanage-2.0.0/man/man3/semanage_node.3
+--- nsalibsemanage/man/man3/semanage_node.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_node.3	2007-03-17 09:06:05.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_node 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Network Nodes Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/node_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_port.3 libsemanage-2.0.0/man/man3/semanage_port.3
+--- nsalibsemanage/man/man3/semanage_port.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_port.3	2007-03-17 09:05:34.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_port 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Network Ports Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/port_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_query.3 libsemanage-2.0.0/man/man3/semanage_query.3
+--- nsalibsemanage/man/man3/semanage_query.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_query.3	2007-03-17 09:05:06.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_query 3 "15 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux Management API
++
+ .SH "SYNOPSIS"
+ The following query function is supported for any semanage record.
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_seuser.3 libsemanage-2.0.0/man/man3/semanage_seuser.3
+--- nsalibsemanage/man/man3/semanage_seuser.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_seuser.3	2007-03-17 09:04:38.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_seuser 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++Linux UID to SELinux User Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/seuser_record.h>
+ .br
+diff --exclude-from=exclude -N -u -r nsalibsemanage/man/man3/semanage_user.3 libsemanage-2.0.0/man/man3/semanage_user.3
+--- nsalibsemanage/man/man3/semanage_user.3	2006-11-16 17:14:05.000000000 -0500
++++ libsemanage-2.0.0/man/man3/semanage_user.3	2007-03-17 09:03:36.000000000 -0400
+@@ -1,5 +1,8 @@
+ .TH semanage_user 3 "16 March 2006" "ivg2 at cornell.edu" "Libsemanage API documentation"
+ 
++.SH "NAME" 
++SELinux User Management API
++
+ .SH "SYNOPSIS"
+ .B #include <semanage/user_record.h>
+ .br


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- libsemanage.spec	13 Mar 2007 00:21:38 -0000	1.120
+++ libsemanage.spec	27 Mar 2007 19:48:04 -0000	1.121
@@ -3,10 +3,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} swig
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -75,6 +77,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Mar 17 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-2
+- Add SELinux to Man page Names so man -k will work
+
 * Mon Mar 12 2007 Dan Walsh <dwalsh at redhat.com> - 2.0.1-1
 	* Merged dbase_file_flush patch from Dan Walsh.
 	  This removes any mention of specific tools (e.g. semanage)




More information about the fedora-cvs-commits mailing list