rpms/libselinux/devel libselinux-rhat.patch, 1.180, 1.181 libselinux.spec, 1.354, 1.355 sources, 1.181, 1.182

Daniel J Walsh dwalsh at fedoraproject.org
Tue Jan 27 20:01:17 UTC 2009


Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26477

Modified Files:
	libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-3
- Throw exeptions in python swig bindings on failures


libselinux-rhat.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.180 -r 1.181 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- libselinux-rhat.patch	6 Jan 2009 15:44:49 -0000	1.180
+++ libselinux-rhat.patch	27 Jan 2009 20:00:46 -0000	1.181
@@ -1,7 +1,7 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.76/include/selinux/selinux.h
---- nsalibselinux/include/selinux/selinux.h	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/include/selinux/selinux.h	2008-12-12 10:06:21.000000000 -0500
-@@ -511,6 +511,14 @@
+diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-2.0.77/include/selinux/selinux.h
+--- nsalibselinux/include/selinux/selinux.h	2009-01-05 17:45:35.000000000 -0500
++++ libselinux-2.0.77/include/selinux/selinux.h	2009-01-27 14:49:41.000000000 -0500
+@@ -520,6 +520,14 @@
     Caller must free the returned strings via free. */
  extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
  
@@ -16,9 +16,9 @@
  /* Compare two file contexts, return 0 if equivalent. */
  int selinux_file_context_cmp(const security_context_t a,
  			     const security_context_t b);
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.76/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.77/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.76/man/man8/selinuxconlist.8	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/man/man8/selinuxconlist.8	2009-01-27 14:49:41.000000000 -0500
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -38,9 +38,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.76/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.77/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.76/man/man8/selinuxdefcon.8	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/man/man8/selinuxdefcon.8	2009-01-27 14:49:41.000000000 -0500
 @@ -0,0 +1,19 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -61,9 +61,9 @@
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.76/src/callbacks.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.77/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/callbacks.c	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/src/callbacks.c	2009-01-27 14:49:41.000000000 -0500
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -72,9 +72,9 @@
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.76/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.77/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/matchpathcon.c	2008-12-02 09:14:48.000000000 -0500
++++ libselinux-2.0.77/src/matchpathcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -92,33 +92,20 @@
  	va_end(ap);
  }
  
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.76/src/selinux.py
---- nsalibselinux/src/selinux.py	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/selinux.py	2008-12-12 10:08:01.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.77/src/selinux.py
+--- nsalibselinux/src/selinux.py	2009-01-13 08:45:35.000000000 -0500
++++ libselinux-2.0.77/src/selinux.py	2009-01-27 14:56:18.000000000 -0500
 @@ -1,5 +1,5 @@
  # This file was automatically generated by SWIG (http://www.swig.org).
--# Version 1.3.33
+-# Version 1.3.35
 +# Version 1.3.36
  #
  # Don't modify this file, modify the SWIG interface instead.
  # This file is compatible with both classic and new-style classes.
-@@ -48,6 +48,29 @@
- del types
+@@ -61,6 +61,15 @@
+                              map(restorecon, [os.path.join(dirname, fname)
+                                               for fname in fnames]), None)
  
- 
-+import shutil, os, stat
-+
-+def restorecon(path, recursive=False):
-+    """ Restore SELinux context on a given path """
-+    mode = os.lstat(path)[stat.ST_MODE]
-+    status, context = matchpathcon(path, mode)
-+    if status == 0:
-+        lsetfilecon(path, context)
-+        if recursive:
-+            os.path.walk(path, lambda arg, dirname, fnames:
-+                             map(restorecon, [os.path.join(dirname, fname)
-+                                              for fname in fnames]), None)
-+
 +def copytree(src, dest):
 +    """ An SELinux-friendly shutil.copytree method """
 +    shutil.copytree(src, dest)
@@ -128,40 +115,432 @@
 +    """ An SELinux-friendly shutil.move method """
 +    shutil.move(src, dest)
 +    restorecon(dest, recursive=True)
-+
+ 
  is_selinux_enabled = _selinux.is_selinux_enabled
  is_selinux_mls_enabled = _selinux.is_selinux_mls_enabled
- getcon = _selinux.getcon
-@@ -297,6 +320,7 @@
+@@ -102,86 +111,9 @@
+ fsetfilecon_raw = _selinux.fsetfilecon_raw
+ getpeercon = _selinux.getpeercon
+ getpeercon_raw = _selinux.getpeercon_raw
+-class av_decision(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, av_decision, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, av_decision, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["allowed"] = _selinux.av_decision_allowed_set
+-    __swig_getmethods__["allowed"] = _selinux.av_decision_allowed_get
+-    if _newclass:allowed = _swig_property(_selinux.av_decision_allowed_get, _selinux.av_decision_allowed_set)
+-    __swig_setmethods__["decided"] = _selinux.av_decision_decided_set
+-    __swig_getmethods__["decided"] = _selinux.av_decision_decided_get
+-    if _newclass:decided = _swig_property(_selinux.av_decision_decided_get, _selinux.av_decision_decided_set)
+-    __swig_setmethods__["auditallow"] = _selinux.av_decision_auditallow_set
+-    __swig_getmethods__["auditallow"] = _selinux.av_decision_auditallow_get
+-    if _newclass:auditallow = _swig_property(_selinux.av_decision_auditallow_get, _selinux.av_decision_auditallow_set)
+-    __swig_setmethods__["auditdeny"] = _selinux.av_decision_auditdeny_set
+-    __swig_getmethods__["auditdeny"] = _selinux.av_decision_auditdeny_get
+-    if _newclass:auditdeny = _swig_property(_selinux.av_decision_auditdeny_get, _selinux.av_decision_auditdeny_set)
+-    __swig_setmethods__["seqno"] = _selinux.av_decision_seqno_set
+-    __swig_getmethods__["seqno"] = _selinux.av_decision_seqno_get
+-    if _newclass:seqno = _swig_property(_selinux.av_decision_seqno_get, _selinux.av_decision_seqno_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_av_decision(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_av_decision
+-    __del__ = lambda self : None;
+-av_decision_swigregister = _selinux.av_decision_swigregister
+-av_decision_swigregister(av_decision)
+-
+-class selinux_opt(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_opt, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_opt, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["type"] = _selinux.selinux_opt_type_set
+-    __swig_getmethods__["type"] = _selinux.selinux_opt_type_get
+-    if _newclass:type = _swig_property(_selinux.selinux_opt_type_get, _selinux.selinux_opt_type_set)
+-    __swig_setmethods__["value"] = _selinux.selinux_opt_value_set
+-    __swig_getmethods__["value"] = _selinux.selinux_opt_value_get
+-    if _newclass:value = _swig_property(_selinux.selinux_opt_value_get, _selinux.selinux_opt_value_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_opt(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_opt
+-    __del__ = lambda self : None;
+-selinux_opt_swigregister = _selinux.selinux_opt_swigregister
+-selinux_opt_swigregister(selinux_opt)
+-
+-class selinux_callback(_object):
+-    __swig_setmethods__ = {}
+-    __setattr__ = lambda self, name, value: _swig_setattr(self, selinux_callback, name, value)
+-    __swig_getmethods__ = {}
+-    __getattr__ = lambda self, name: _swig_getattr(self, selinux_callback, name)
+-    __repr__ = _swig_repr
+-    __swig_setmethods__["func_log"] = _selinux.selinux_callback_func_log_set
+-    __swig_getmethods__["func_log"] = _selinux.selinux_callback_func_log_get
+-    if _newclass:func_log = _swig_property(_selinux.selinux_callback_func_log_get, _selinux.selinux_callback_func_log_set)
+-    __swig_setmethods__["func_audit"] = _selinux.selinux_callback_func_audit_set
+-    __swig_getmethods__["func_audit"] = _selinux.selinux_callback_func_audit_get
+-    if _newclass:func_audit = _swig_property(_selinux.selinux_callback_func_audit_get, _selinux.selinux_callback_func_audit_set)
+-    __swig_setmethods__["func_validate"] = _selinux.selinux_callback_func_validate_set
+-    __swig_getmethods__["func_validate"] = _selinux.selinux_callback_func_validate_get
+-    if _newclass:func_validate = _swig_property(_selinux.selinux_callback_func_validate_get, _selinux.selinux_callback_func_validate_set)
+-    def __init__(self, *args): 
+-        this = _selinux.new_selinux_callback(*args)
+-        try: self.this.append(this)
+-        except: self.this = this
+-    __swig_destroy__ = _selinux.delete_selinux_callback
+-    __del__ = lambda self : None;
+-selinux_callback_swigregister = _selinux.selinux_callback_swigregister
+-selinux_callback_swigregister(selinux_callback)
+-
+ SELINUX_CB_LOG = _selinux.SELINUX_CB_LOG
+ SELINUX_CB_AUDIT = _selinux.SELINUX_CB_AUDIT
[...11501 lines suppressed...]
+-	 { (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},
+@@ -10389,64 +8455,38 @@
+ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+ 
+ 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_av_decision = {"_p_av_decision", "struct av_decision *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_entry_ref = {"_p_avc_entry_ref", "struct 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 *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_log_callback = {"_p_avc_log_callback", "struct 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 *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_avc_thread_callback = {"_p_avc_thread_callback", "struct 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_security_id = {"_p_security_id", "security_id_t|struct security_id *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_selinux_opt = {"_p_selinux_opt", "struct 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};
+ static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "security_class_t *|unsigned short *", 0, 0, (void*)0, 0};
+ 
+ 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,
+   &_swigt__p_unsigned_short,
+@@ -10454,31 +8494,18 @@
+ 
+ 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}};
+ static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
+@@ -10486,31 +8513,18 @@
+ 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,
+   _swigc__p_unsigned_short,
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-2.0.77/src/seusers.c
 --- nsalibselinux/src/seusers.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/src/seusers.c	2008-12-16 09:36:39.000000000 -0500
++++ libselinux-2.0.77/src/seusers.c	2009-01-27 14:49:41.000000000 -0500
 @@ -243,3 +243,67 @@
  	*r_level = NULL;
  	return 0;
@@ -3030,9 +10300,9 @@
 +
 +	return (ret ? getseuserbyname(username, r_seuser, r_level) : ret);
 +}
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.76/utils/getdefaultcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libselinux-2.0.77/utils/getdefaultcon.c
 --- nsalibselinux/utils/getdefaultcon.c	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/utils/getdefaultcon.c	2008-12-02 09:33:14.000000000 -0500
++++ libselinux-2.0.77/utils/getdefaultcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -22,8 +22,9 @@
  	security_context_t usercon = NULL, cur_context = NULL;
  	char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
@@ -3078,9 +10348,9 @@
 -	return 0;
 +	return ret >= 0;
  }
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.76/utils/Makefile
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.77/utils/Makefile
 --- nsalibselinux/utils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ libselinux-2.0.76/utils/Makefile	2008-12-19 15:55:54.000000000 -0500
++++ libselinux-2.0.77/utils/Makefile	2009-01-27 14:49:41.000000000 -0500
 @@ -2,28 +2,33 @@
  PREFIX ?= $(DESTDIR)/usr
  LIBDIR ?= $(PREFIX)/lib
@@ -3119,9 +10389,9 @@
  
  indent:
  	../../scripts/Lindent $(wildcard *.[ch])
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.76/utils/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.77/utils/matchpathcon.c
 --- nsalibselinux/utils/matchpathcon.c	2008-10-28 10:06:51.000000000 -0400
-+++ libselinux-2.0.76/utils/matchpathcon.c	2008-12-19 15:14:20.000000000 -0500
++++ libselinux-2.0.77/utils/matchpathcon.c	2009-01-27 14:49:41.000000000 -0500
 @@ -101,6 +101,11 @@
  	for (i = optind; i < argc; i++) {
  		int mode = 0;


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- libselinux.spec	6 Jan 2009 15:44:49 -0000	1.354
+++ libselinux.spec	27 Jan 2009 20:00:46 -0000	1.355
@@ -5,7 +5,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.0.77
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -164,6 +164,9 @@
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-3
+- Throw exeptions in python swig bindings on failures
+
 * Tue Jan 6 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.77-2
 - Fix restorecon python code
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- sources	6 Jan 2009 14:31:47 -0000	1.181
+++ sources	27 Jan 2009 20:00:47 -0000	1.182
@@ -1 +1 @@
-f0660b8d415b25e39d20f31717d48f2c  libselinux-2.0.77.tgz
+d6c274a09a741d28ba30e5a0dc89839b  libselinux-2.0.77.tgz




More information about the fedora-extras-commits mailing list