rpms/libselinux/devel libselinux-rhat.patch, 1.151, 1.152 libselinux.spec, 1.323, 1.324

Daniel J Walsh (dwalsh) fedora-extras-commits at redhat.com
Mon Apr 14 18:54:28 UTC 2008


Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20216

Modified Files:
	libselinux-rhat.patch libselinux.spec 
Log Message:
* Thu Apr 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.61-3
- Add avc.h to swig code


libselinux-rhat.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.151 -r 1.152 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- libselinux-rhat.patch	13 Mar 2008 23:45:19 -0000	1.151
+++ libselinux-rhat.patch	14 Apr 2008 18:54:09 -0000	1.152
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/label.c libselinux-2.0.59/src/label.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/label.c libselinux-2.0.61/src/label.c
 --- nsalibselinux/src/label.c	2007-07-16 14:20:46.000000000 -0400
-+++ libselinux-2.0.59/src/label.c	2008-03-13 19:40:24.000000000 -0400
++++ libselinux-2.0.61/src/label.c	2008-04-09 08:54:15.000000000 -0400
 @@ -95,7 +95,7 @@
  	if (compat_validate(rec, lr, "file_contexts", 0))
  		return NULL;
@@ -18,9 +18,48 @@
  	free(rec);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.59/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/load_policy.c libselinux-2.0.61/src/load_policy.c
+--- nsalibselinux/src/load_policy.c	2008-04-08 09:37:21.000000000 -0400
++++ libselinux-2.0.61/src/load_policy.c	2008-04-09 09:02:16.000000000 -0400
+@@ -43,6 +43,9 @@
+ 
+ int load_setlocaldefs hidden = 1;
+ 
++#undef max
++#define max(a, b) (((a) > (b)) ? (a) : (b))
++
+ int selinux_mkload_policy(int preservebools)
+ {	
+ 	int kernvers = security_policyvers();
+@@ -127,11 +130,6 @@
+ 
+ #endif
+ 
+-	if (usesepol) {
+-		maxvers = vers_max();
+-		minvers = vers_min();
+-	}
+-
+ 	/*
+ 	 * Check whether we need to support local boolean and user definitions.
+ 	 */
+@@ -157,6 +155,13 @@
+ 	if (preservebools && uname(&uts) == 0 && strverscmp(uts.release, "2.6.22") >= 0)
+ 		preservebools = 0;
+ 
++	if (usesepol) {
++		maxvers = vers_max();
++		minvers = vers_min();
++		if (!setlocaldefs && !preservebools)
++			maxvers = max(kernvers, maxvers);
++	}
++
+ 	vers = maxvers;
+       search:
+ 	snprintf(path, sizeof(path), "%s.%d",
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.61/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2007-09-28 09:48:58.000000000 -0400
-+++ libselinux-2.0.59/src/matchpathcon.c	2008-03-13 19:23:39.000000000 -0400
++++ libselinux-2.0.61/src/matchpathcon.c	2008-04-09 08:54:15.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -38,3 +77,2607 @@
  	va_end(ap);
  }
  
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.61/src/selinux.py
+--- nsalibselinux/src/selinux.py	2008-01-23 14:36:29.000000000 -0500
++++ libselinux-2.0.61/src/selinux.py	2008-04-10 16:21:08.000000000 -0400
+@@ -300,6 +300,204 @@
+ selinux_file_context_cmp = _selinux.selinux_file_context_cmp
+ selinux_file_context_verify = _selinux.selinux_file_context_verify
+ selinux_lsetfilecon_default = _selinux.selinux_lsetfilecon_default
++class security_id(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, security_id, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, security_id, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["ctx"] = _selinux.security_id_ctx_set
++    __swig_getmethods__["ctx"] = _selinux.security_id_ctx_get
++    if _newclass:ctx = _swig_property(_selinux.security_id_ctx_get, _selinux.security_id_ctx_set)
++    __swig_setmethods__["refcnt"] = _selinux.security_id_refcnt_set
++    __swig_getmethods__["refcnt"] = _selinux.security_id_refcnt_get
++    if _newclass:refcnt = _swig_property(_selinux.security_id_refcnt_get, _selinux.security_id_refcnt_set)
++    def __init__(self, *args): 
++        this = _selinux.new_security_id(*args)
++        try: self.this.append(this)
++        except: self.this = this
++    __swig_destroy__ = _selinux.delete_security_id
++    __del__ = lambda self : None;
++security_id_swigregister = _selinux.security_id_swigregister
++security_id_swigregister(security_id)
++
++avc_sid_to_context = _selinux.avc_sid_to_context
++avc_sid_to_context_raw = _selinux.avc_sid_to_context_raw
++avc_context_to_sid = _selinux.avc_context_to_sid
++avc_context_to_sid_raw = _selinux.avc_context_to_sid_raw
++sidget = _selinux.sidget
++sidput = _selinux.sidput
++avc_get_initial_sid = _selinux.avc_get_initial_sid
++class avc_entry_ref(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, avc_entry_ref, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, avc_entry_ref, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["ae"] = _selinux.avc_entry_ref_ae_set
++    __swig_getmethods__["ae"] = _selinux.avc_entry_ref_ae_get
++    if _newclass:ae = _swig_property(_selinux.avc_entry_ref_ae_get, _selinux.avc_entry_ref_ae_set)
++    def __init__(self, *args): 
++        this = _selinux.new_avc_entry_ref(*args)
++        try: self.this.append(this)
++        except: self.this = this
++    __swig_destroy__ = _selinux.delete_avc_entry_ref
++    __del__ = lambda self : None;
++avc_entry_ref_swigregister = _selinux.avc_entry_ref_swigregister
++avc_entry_ref_swigregister(avc_entry_ref)
++
++class avc_memory_callback(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, avc_memory_callback, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, avc_memory_callback, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["func_malloc"] = _selinux.avc_memory_callback_func_malloc_set
++    __swig_getmethods__["func_malloc"] = _selinux.avc_memory_callback_func_malloc_get
++    if _newclass:func_malloc = _swig_property(_selinux.avc_memory_callback_func_malloc_get, _selinux.avc_memory_callback_func_malloc_set)
++    __swig_setmethods__["func_free"] = _selinux.avc_memory_callback_func_free_set
++    __swig_getmethods__["func_free"] = _selinux.avc_memory_callback_func_free_get
++    if _newclass:func_free = _swig_property(_selinux.avc_memory_callback_func_free_get, _selinux.avc_memory_callback_func_free_set)
++    def __init__(self, *args): 
++        this = _selinux.new_avc_memory_callback(*args)
++        try: self.this.append(this)
++        except: self.this = this
++    __swig_destroy__ = _selinux.delete_avc_memory_callback
++    __del__ = lambda self : None;
++avc_memory_callback_swigregister = _selinux.avc_memory_callback_swigregister
++avc_memory_callback_swigregister(avc_memory_callback)
++
++class avc_log_callback(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, avc_log_callback, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, avc_log_callback, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["func_log"] = _selinux.avc_log_callback_func_log_set
++    __swig_getmethods__["func_log"] = _selinux.avc_log_callback_func_log_get
++    if _newclass:func_log = _swig_property(_selinux.avc_log_callback_func_log_get, _selinux.avc_log_callback_func_log_set)
++    __swig_setmethods__["func_audit"] = _selinux.avc_log_callback_func_audit_set
++    __swig_getmethods__["func_audit"] = _selinux.avc_log_callback_func_audit_get
++    if _newclass:func_audit = _swig_property(_selinux.avc_log_callback_func_audit_get, _selinux.avc_log_callback_func_audit_set)
++    def __init__(self, *args): 
++        this = _selinux.new_avc_log_callback(*args)
++        try: self.this.append(this)
++        except: self.this = this
++    __swig_destroy__ = _selinux.delete_avc_log_callback
++    __del__ = lambda self : None;
++avc_log_callback_swigregister = _selinux.avc_log_callback_swigregister
++avc_log_callback_swigregister(avc_log_callback)
++
++class avc_thread_callback(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, avc_thread_callback, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, avc_thread_callback, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["func_create_thread"] = _selinux.avc_thread_callback_func_create_thread_set
++    __swig_getmethods__["func_create_thread"] = _selinux.avc_thread_callback_func_create_thread_get
++    if _newclass:func_create_thread = _swig_property(_selinux.avc_thread_callback_func_create_thread_get, _selinux.avc_thread_callback_func_create_thread_set)
++    __swig_setmethods__["func_stop_thread"] = _selinux.avc_thread_callback_func_stop_thread_set
++    __swig_getmethods__["func_stop_thread"] = _selinux.avc_thread_callback_func_stop_thread_get
++    if _newclass:func_stop_thread = _swig_property(_selinux.avc_thread_callback_func_stop_thread_get, _selinux.avc_thread_callback_func_stop_thread_set)
++    def __init__(self, *args): 
++        this = _selinux.new_avc_thread_callback(*args)
++        try: self.this.append(this)
++        except: self.this = this
++    __swig_destroy__ = _selinux.delete_avc_thread_callback
++    __del__ = lambda self : None;
++avc_thread_callback_swigregister = _selinux.avc_thread_callback_swigregister
++avc_thread_callback_swigregister(avc_thread_callback)
++
++class avc_lock_callback(_object):
++    __swig_setmethods__ = {}
++    __setattr__ = lambda self, name, value: _swig_setattr(self, avc_lock_callback, name, value)
++    __swig_getmethods__ = {}
++    __getattr__ = lambda self, name: _swig_getattr(self, avc_lock_callback, name)
++    __repr__ = _swig_repr
++    __swig_setmethods__["func_alloc_lock"] = _selinux.avc_lock_callback_func_alloc_lock_set
++    __swig_getmethods__["func_alloc_lock"] = _selinux.avc_lock_callback_func_alloc_lock_get
++    if _newclass:func_alloc_lock = _swig_property(_selinux.avc_lock_callback_func_alloc_lock_get, _selinux.avc_lock_callback_func_alloc_lock_set)
++    __swig_setmethods__["func_get_lock"] = _selinux.avc_lock_callback_func_get_lock_set
++    __swig_getmethods__["func_get_lock"] = _selinux.avc_lock_callback_func_get_lock_get
++    if _newclass:func_get_lock = _swig_property(_selinux.avc_lock_callback_func_get_lock_get, _selinux.avc_lock_callback_func_get_lock_set)
[...2276 lines suppressed...]
++	 { (char *)"avc_log_callback_func_log_get", _wrap_avc_log_callback_func_log_get, METH_VARARGS, NULL},
++	 { (char *)"avc_log_callback_func_audit_set", _wrap_avc_log_callback_func_audit_set, METH_VARARGS, NULL},
++	 { (char *)"avc_log_callback_func_audit_get", _wrap_avc_log_callback_func_audit_get, METH_VARARGS, NULL},
++	 { (char *)"new_avc_log_callback", _wrap_new_avc_log_callback, METH_VARARGS, NULL},
++	 { (char *)"delete_avc_log_callback", _wrap_delete_avc_log_callback, METH_VARARGS, NULL},
++	 { (char *)"avc_log_callback_swigregister", avc_log_callback_swigregister, METH_VARARGS, NULL},
++	 { (char *)"avc_thread_callback_func_create_thread_set", _wrap_avc_thread_callback_func_create_thread_set, METH_VARARGS, NULL},
++	 { (char *)"avc_thread_callback_func_create_thread_get", _wrap_avc_thread_callback_func_create_thread_get, METH_VARARGS, NULL},
++	 { (char *)"avc_thread_callback_func_stop_thread_set", _wrap_avc_thread_callback_func_stop_thread_set, METH_VARARGS, NULL},
++	 { (char *)"avc_thread_callback_func_stop_thread_get", _wrap_avc_thread_callback_func_stop_thread_get, METH_VARARGS, NULL},
++	 { (char *)"new_avc_thread_callback", _wrap_new_avc_thread_callback, METH_VARARGS, NULL},
++	 { (char *)"delete_avc_thread_callback", _wrap_delete_avc_thread_callback, METH_VARARGS, NULL},
++	 { (char *)"avc_thread_callback_swigregister", avc_thread_callback_swigregister, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_alloc_lock_set", _wrap_avc_lock_callback_func_alloc_lock_set, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_alloc_lock_get", _wrap_avc_lock_callback_func_alloc_lock_get, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_get_lock_set", _wrap_avc_lock_callback_func_get_lock_set, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_get_lock_get", _wrap_avc_lock_callback_func_get_lock_get, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_release_lock_set", _wrap_avc_lock_callback_func_release_lock_set, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_release_lock_get", _wrap_avc_lock_callback_func_release_lock_get, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_free_lock_set", _wrap_avc_lock_callback_func_free_lock_set, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_func_free_lock_get", _wrap_avc_lock_callback_func_free_lock_get, METH_VARARGS, NULL},
++	 { (char *)"new_avc_lock_callback", _wrap_new_avc_lock_callback, METH_VARARGS, NULL},
++	 { (char *)"delete_avc_lock_callback", _wrap_delete_avc_lock_callback, METH_VARARGS, NULL},
++	 { (char *)"avc_lock_callback_swigregister", avc_lock_callback_swigregister, METH_VARARGS, NULL},
++	 { (char *)"avc_init", _wrap_avc_init, METH_VARARGS, NULL},
++	 { (char *)"avc_open", _wrap_avc_open, METH_VARARGS, NULL},
++	 { (char *)"avc_cleanup", _wrap_avc_cleanup, METH_VARARGS, NULL},
++	 { (char *)"avc_reset", _wrap_avc_reset, METH_VARARGS, NULL},
++	 { (char *)"avc_destroy", _wrap_avc_destroy, METH_VARARGS, NULL},
++	 { (char *)"avc_has_perm_noaudit", _wrap_avc_has_perm_noaudit, METH_VARARGS, NULL},
++	 { (char *)"avc_has_perm", _wrap_avc_has_perm, METH_VARARGS, NULL},
++	 { (char *)"avc_audit", _wrap_avc_audit, METH_VARARGS, NULL},
++	 { (char *)"avc_compute_create", _wrap_avc_compute_create, METH_VARARGS, NULL},
++	 { (char *)"avc_compute_member", _wrap_avc_compute_member, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_lookups_set", _wrap_avc_cache_stats_entry_lookups_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_lookups_get", _wrap_avc_cache_stats_entry_lookups_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_hits_set", _wrap_avc_cache_stats_entry_hits_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_hits_get", _wrap_avc_cache_stats_entry_hits_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_misses_set", _wrap_avc_cache_stats_entry_misses_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_misses_get", _wrap_avc_cache_stats_entry_misses_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_discards_set", _wrap_avc_cache_stats_entry_discards_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_entry_discards_get", _wrap_avc_cache_stats_entry_discards_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_lookups_set", _wrap_avc_cache_stats_cav_lookups_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_lookups_get", _wrap_avc_cache_stats_cav_lookups_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_hits_set", _wrap_avc_cache_stats_cav_hits_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_hits_get", _wrap_avc_cache_stats_cav_hits_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_probes_set", _wrap_avc_cache_stats_cav_probes_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_probes_get", _wrap_avc_cache_stats_cav_probes_get, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_misses_set", _wrap_avc_cache_stats_cav_misses_set, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_cav_misses_get", _wrap_avc_cache_stats_cav_misses_get, METH_VARARGS, NULL},
++	 { (char *)"new_avc_cache_stats", _wrap_new_avc_cache_stats, METH_VARARGS, NULL},
++	 { (char *)"delete_avc_cache_stats", _wrap_delete_avc_cache_stats, METH_VARARGS, NULL},
++	 { (char *)"avc_cache_stats_swigregister", avc_cache_stats_swigregister, METH_VARARGS, NULL},
++	 { (char *)"avc_av_stats", _wrap_avc_av_stats, METH_VARARGS, NULL},
++	 { (char *)"avc_sid_stats", _wrap_avc_sid_stats, METH_VARARGS, NULL},
+ 	 { (char *)"selinux_default_type_path", _wrap_selinux_default_type_path, METH_VARARGS, NULL},
+ 	 { (char *)"get_default_type", _wrap_get_default_type, METH_VARARGS, NULL},
+ 	 { (char *)"get_ordered_context_list", _wrap_get_ordered_context_list, METH_VARARGS, NULL},
+@@ -8146,15 +10317,30 @@
+ 
+ static swig_type_info _swigt__p_SELboolean = {"_p_SELboolean", "SELboolean *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_av_decision = {"_p_av_decision", "struct av_decision *|av_decision *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_cache_stats = {"_p_avc_cache_stats", "struct avc_cache_stats *|avc_cache_stats *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_entry = {"_p_avc_entry", "struct avc_entry *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_entry_ref = {"_p_avc_entry_ref", "struct avc_entry_ref *|avc_entry_ref *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_lock_callback = {"_p_avc_lock_callback", "struct avc_lock_callback *|avc_lock_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_log_callback = {"_p_avc_log_callback", "struct avc_log_callback *|avc_log_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_memory_callback = {"_p_avc_memory_callback", "struct avc_memory_callback *|avc_memory_callback *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct avc_thread_callback *|avc_thread_callback *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_int_p_q_const__char_v_______int = {"_p_f_int_p_q_const__char_v_______int", "int (*)(int,char const *,...)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_p_f_void__void__p_void = {"_p_f_p_f_void__void__p_void", "void *(*)(void (*)(void))", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_p_char__int = {"_p_f_p_p_char__int", "int (*)(char **)|int (*)(security_context_t *)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_p_q_const__char_v_______void = {"_p_f_p_q_const__char_v_______void", "void (*)(char const *,...)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_p_void__void = {"_p_f_p_void__void", "void (*)(void *)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__int = {"_p_f_p_void_unsigned_short_p_char_size_t__int", "int (*)(void *,unsigned short,char *,size_t)|int (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_p_void_unsigned_short_p_char_size_t__void = {"_p_f_p_void_unsigned_short_p_char_size_t__void", "void (*)(void *,unsigned short,char *,size_t)|void (*)(void *,security_class_t,char *,size_t)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_size_t__p_void = {"_p_f_size_t__p_void", "void *(*)(size_t)", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_f_void__p_void = {"_p_f_void__p_void", "void *(*)(void)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_ino_t = {"_p_ino_t", "ino_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **|security_context_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***|security_context_t **", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_p_security_id = {"_p_p_security_id", "struct security_id **|security_id_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_security_class_mapping = {"_p_security_class_mapping", "struct security_class_mapping *|security_class_mapping *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_security_id = {"_p_security_id", "security_id_t|struct security_id *|security_id *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_selinux_callback = {"_p_selinux_callback", "union selinux_callback *|selinux_callback *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct selinux_opt *|selinux_opt *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|access_vector_t *|mode_t *|pid_t *", 0, 0, (void*)0, 0};
+@@ -8163,15 +10349,30 @@
+ static swig_type_info *swig_type_initial[] = {
+   &_swigt__p_SELboolean,
+   &_swigt__p_av_decision,
++  &_swigt__p_avc_cache_stats,
++  &_swigt__p_avc_entry,
++  &_swigt__p_avc_entry_ref,
++  &_swigt__p_avc_lock_callback,
++  &_swigt__p_avc_log_callback,
++  &_swigt__p_avc_memory_callback,
++  &_swigt__p_avc_thread_callback,
+   &_swigt__p_char,
+   &_swigt__p_f_int_p_q_const__char_v_______int,
++  &_swigt__p_f_p_f_void__void__p_void,
+   &_swigt__p_f_p_p_char__int,
++  &_swigt__p_f_p_q_const__char_v_______void,
++  &_swigt__p_f_p_void__void,
+   &_swigt__p_f_p_void_unsigned_short_p_char_size_t__int,
++  &_swigt__p_f_p_void_unsigned_short_p_char_size_t__void,
++  &_swigt__p_f_size_t__p_void,
++  &_swigt__p_f_void__p_void,
+   &_swigt__p_ino_t,
+   &_swigt__p_int,
+   &_swigt__p_p_char,
+   &_swigt__p_p_p_char,
++  &_swigt__p_p_security_id,
+   &_swigt__p_security_class_mapping,
++  &_swigt__p_security_id,
+   &_swigt__p_selinux_callback,
+   &_swigt__p_selinux_opt,
+   &_swigt__p_unsigned_int,
+@@ -8180,15 +10381,30 @@
+ 
+ static swig_cast_info _swigc__p_SELboolean[] = {  {&_swigt__p_SELboolean, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_av_decision[] = {  {&_swigt__p_av_decision, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_cache_stats[] = {  {&_swigt__p_avc_cache_stats, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_entry[] = {  {&_swigt__p_avc_entry, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_entry_ref[] = {  {&_swigt__p_avc_entry_ref, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_lock_callback[] = {  {&_swigt__p_avc_lock_callback, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_log_callback[] = {  {&_swigt__p_avc_log_callback, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_memory_callback[] = {  {&_swigt__p_avc_memory_callback, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_avc_thread_callback[] = {  {&_swigt__p_avc_thread_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_int_p_q_const__char_v_______int[] = {  {&_swigt__p_f_int_p_q_const__char_v_______int, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_p_f_void__void__p_void[] = {  {&_swigt__p_f_p_f_void__void__p_void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_p_char__int[] = {  {&_swigt__p_f_p_p_char__int, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_p_q_const__char_v_______void[] = {  {&_swigt__p_f_p_q_const__char_v_______void, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_p_void__void[] = {  {&_swigt__p_f_p_void__void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__int[] = {  {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__int, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_p_void_unsigned_short_p_char_size_t__void[] = {  {&_swigt__p_f_p_void_unsigned_short_p_char_size_t__void, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_size_t__p_void[] = {  {&_swigt__p_f_size_t__p_void, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_f_void__p_void[] = {  {&_swigt__p_f_void__p_void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_ino_t[] = {  {&_swigt__p_ino_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_p_security_id[] = {  {&_swigt__p_p_security_id, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_security_class_mapping[] = {  {&_swigt__p_security_class_mapping, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_security_id[] = {  {&_swigt__p_security_id, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_selinux_callback[] = {  {&_swigt__p_selinux_callback, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_selinux_opt[] = {  {&_swigt__p_selinux_opt, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+@@ -8197,15 +10413,30 @@
+ static swig_cast_info *swig_cast_initial[] = {
+   _swigc__p_SELboolean,
+   _swigc__p_av_decision,
++  _swigc__p_avc_cache_stats,
++  _swigc__p_avc_entry,
++  _swigc__p_avc_entry_ref,
++  _swigc__p_avc_lock_callback,
++  _swigc__p_avc_log_callback,
++  _swigc__p_avc_memory_callback,
++  _swigc__p_avc_thread_callback,
+   _swigc__p_char,
+   _swigc__p_f_int_p_q_const__char_v_______int,
++  _swigc__p_f_p_f_void__void__p_void,
+   _swigc__p_f_p_p_char__int,
++  _swigc__p_f_p_q_const__char_v_______void,
++  _swigc__p_f_p_void__void,
+   _swigc__p_f_p_void_unsigned_short_p_char_size_t__int,
++  _swigc__p_f_p_void_unsigned_short_p_char_size_t__void,
++  _swigc__p_f_size_t__p_void,
++  _swigc__p_f_void__p_void,
+   _swigc__p_ino_t,
+   _swigc__p_int,
+   _swigc__p_p_char,
+   _swigc__p_p_p_char,
++  _swigc__p_p_security_id,
+   _swigc__p_security_class_mapping,
++  _swigc__p_security_id,
+   _swigc__p_selinux_callback,
+   _swigc__p_selinux_opt,
+   _swigc__p_unsigned_int,
+@@ -8740,6 +10971,17 @@
+   SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
+   SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
+   SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4)));
++  SWIG_Python_SetConstant(d, "AVC_OPT_UNUSED",SWIG_From_int((int)(0)));
++  SWIG_Python_SetConstant(d, "AVC_OPT_SETENFORCE",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_GRANT",SWIG_From_int((int)(1)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_TRY_REVOKE",SWIG_From_int((int)(2)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_REVOKE",SWIG_From_int((int)(4)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_RESET",SWIG_From_int((int)(8)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITALLOW_ENABLE",SWIG_From_int((int)(16)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITALLOW_DISABLE",SWIG_From_int((int)(32)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITDENY_ENABLE",SWIG_From_int((int)(64)));
++  SWIG_Python_SetConstant(d, "AVC_CALLBACK_AUDITDENY_DISABLE",SWIG_From_int((int)(128)));
++  SWIG_Python_SetConstant(d, "AVC_CACHE_STATS",SWIG_From_int((int)(1)));
+   SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
+ }
+ 


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- libselinux.spec	1 Apr 2008 04:16:52 -0000	1.323
+++ libselinux.spec	14 Apr 2008 18:54:09 -0000	1.324
@@ -4,7 +4,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.61
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -137,6 +137,12 @@
 %{python_sitearch}/selinux/*
 
 %changelog
+* Thu Apr 10 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.61-3
+- Add avc.h to swig code
+
+* Wed Apr 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.61-2
+- Grab the latest policy for the kernel
+
 * Tue Apr 1 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.61-1
 - Update to Upstream
 	* Man page typo fix from Jim Meyering.




More information about the fedora-extras-commits mailing list