rpms/libselinux/F-9 .cvsignore, 1.170, 1.171 libselinux-rhat.patch, 1.153, 1.154 libselinux.spec, 1.326, 1.327 sources, 1.172, 1.173
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Tue Jul 15 13:08:23 UTC 2008
Author: dwalsh
Update of /cvs/extras/rpms/libselinux/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21429
Modified Files:
.cvsignore libselinux-rhat.patch libselinux.spec sources
Log Message:
* Wed Jul 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.67-4
- Add ruby support for puppet
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-9/.cvsignore,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- .cvsignore 7 May 2008 17:42:02 -0000 1.170
+++ .cvsignore 15 Jul 2008 13:07:35 -0000 1.171
@@ -151,3 +151,5 @@
libselinux-2.0.60.tgz
libselinux-2.0.61.tgz
libselinux-2.0.64.tgz
+libselinux-2.0.65.tgz
+libselinux-2.0.67.tgz
libselinux-rhat.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.153 -r 1.154 libselinux-rhat.patch
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-9/libselinux-rhat.patch,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- libselinux-rhat.patch 7 May 2008 17:42:02 -0000 1.153
+++ libselinux-rhat.patch 15 Jul 2008 13:07:35 -0000 1.154
@@ -1,6 +1,21 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.64/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-2.0.67/man/man3/freecon.3
+--- nsalibselinux/man/man3/freecon.3 2008-06-12 23:25:12.000000000 -0400
++++ libselinux-2.0.67/man/man3/freecon.3 2008-07-09 16:52:33.000000000 -0400
+@@ -15,6 +15,11 @@
+ .B freeconary
+ frees the memory allocated for a context array.
+
++If
++.I con
++is NULL, no operation is performed.
++
++
+ .SH "SEE ALSO"
+ .BR selinux "(8)"
+
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.67/man/man8/selinuxconlist.8
--- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.64/man/man8/selinuxconlist.8 2008-05-07 13:32:06.000000000 -0400
++++ libselinux-2.0.67/man/man8/selinuxconlist.8 2008-07-09 16:52:33.000000000 -0400
@@ -0,0 +1,18 @@
+.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
+.SH "NAME"
@@ -20,9 +35,9 @@
+
+.SH "SEE ALSO"
+secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.64/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.67/man/man8/selinuxdefcon.8
--- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.64/man/man8/selinuxdefcon.8 2008-05-07 13:32:25.000000000 -0400
++++ libselinux-2.0.67/man/man8/selinuxdefcon.8 2008-07-09 16:52:33.000000000 -0400
@@ -0,0 +1,19 @@
+.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
+.SH "NAME"
@@ -43,9 +58,147 @@
+
+.SH "SEE ALSO"
+secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.64/src/matchpathcon.c
---- nsalibselinux/src/matchpathcon.c 2007-09-28 09:48:58.000000000 -0400
-+++ libselinux-2.0.64/src/matchpathcon.c 2008-05-07 13:08:06.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.67/src/Makefile
+--- nsalibselinux/src/Makefile 2008-06-22 09:40:25.000000000 -0400
++++ libselinux-2.0.67/src/Makefile 2008-07-09 16:56:37.000000000 -0400
+@@ -7,16 +7,24 @@
+ PYINC ?= /usr/include/$(PYLIBVER)
+ PYLIB ?= /usr/lib/$(PYLIBVER)
+ PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
++RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
++RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
++RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
++RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+
+ LIBVERSION = 1
+
+ LIBA=libselinux.a
+ TARGET=libselinux.so
+ SWIGIF= selinuxswig_python.i
++SWIGRUBYIF= selinuxswig_ruby.i
+ SWIGCOUT= selinuxswig_wrap.c
++SWIGRUBYCOUT= selinuxswig_ruby_wrap.c
+ SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT))
++SWIGRUBYLOBJ:= $(patsubst %.c,%.lo,$(SWIGRUBYCOUT))
+ SWIGSO=_selinux.so
+ SWIGFILES=$(SWIGSO) selinux.py
++SWIGRUBYSO=_rubyselinux.so
+ LIBSO=$(TARGET).$(LIBVERSION)
+ AUDIT2WHYSO=audit2why.so
+
+@@ -29,7 +37,9 @@
+ ifeq ($(DISABLE_RPM),y)
+ UNUSED_SRCS+=rpm.c
+ endif
+-SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(SWIGCOUT),$(wildcard *.c)))
++
++GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT)
++SRCS= $(filter-out $(UNUSED_SRCS), $(filter-out audit2why.c $(GENERATED),$(wildcard *.c)))
+
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+ LOBJS= $(patsubst %.c,%.lo,$(SRCS))
+@@ -44,11 +54,11 @@
+
+ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
+
+-GENERATED=$(SWIGCOUT)
++SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./
+
+ all: $(LIBA) $(LIBSO)
+
+-pywrap: all $(SWIGSO) $(AUDIT2WHYSO)
++pywrap: all $(SWIGSO) $(AUDIT2WHYSO) $(SWIGRUBYSO)
+
+ $(LIBA): $(OBJS)
+ $(AR) rcs $@ $^
+@@ -57,8 +67,14 @@
+ $(SWIGLOBJ): $(SWIGCOUT)
+ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+
++$(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
++ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $<
++
+ $(SWIGSO): $(SWIGLOBJ)
+- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
++
++$(SWIGRUBYSO): $(SWIGRUBYLOBJ)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
+
+ $(LIBSO): $(LOBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
+@@ -79,6 +95,9 @@
+ $(SWIGCOUT): $(SWIGIF)
+ $(SWIG) $^
+
++$(SWIGRUBYCOUT): $(SWIGRUBYIF)
++ $(SWIGRUBY) $^
++
+ swigify: $(SWIGIF)
+ $(SWIG) $^
+
+@@ -95,6 +114,9 @@
+ install -m 755 $(AUDIT2WHYSO) $(PYTHONLIBDIR)/site-packages/selinux
+ install -m 644 selinux.py $(PYTHONLIBDIR)/site-packages/selinux/__init__.py
+
++ test -d $(RUBYINSTALL) || install -m 755 -d $(RUBYINSTALL)
++ install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/selinux.so
++
+ relabel:
+ /sbin/restorecon $(SHLIBDIR)/$(LIBSO)
+
+@@ -102,7 +124,7 @@
+ -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~
+
+ distclean: clean
+- rm -f $(SWIGCOUT) $(SWIGFILES)
++ rm -f $(GENERATED) $(SWIGFILES)
+
+ indent:
+ ../../scripts/Lindent $(filter-out $(GENERATED),$(wildcard *.[ch]))
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/audit2why.c libselinux-2.0.67/src/audit2why.c
+--- nsalibselinux/src/audit2why.c 2008-06-12 23:25:14.000000000 -0400
++++ libselinux-2.0.67/src/audit2why.c 2008-07-09 16:52:33.000000000 -0400
+@@ -55,7 +55,7 @@
+ return 0;
+ }
+
+-static int check_booleans(struct avc_t *avc, struct boolean_t **bools)
++static int check_booleans(struct boolean_t **bools)
+ {
+ char errormsg[PATH_MAX];
+ struct sepol_av_decision avd;
+@@ -376,7 +376,7 @@
+ avc->tsid = tsid;
+ avc->tclass = tclass;
+ avc->av = av;
+- if (check_booleans(avc, &bools) == 0) {
++ if (check_booleans(&bools) == 0) {
+ if (av & ~avd.auditdeny) {
+ RETURN(DONTAUDIT)
+ } else {
+@@ -390,15 +390,15 @@
+ len++; b++;
+ }
+ b = bools;
+- PyObject *boollist = PyTuple_New(len);
++ PyObject *outboollist = PyTuple_New(len);
+ len=0;
+ while(b->name) {
+ PyObject *bool = Py_BuildValue("(si)", b->name, b->active);
+- PyTuple_SetItem(boollist, len++, bool);
++ PyTuple_SetItem(outboollist, len++, bool);
+ b++;
+ }
+ free(bools);
+- PyTuple_SetItem(result, 1, boollist);
++ PyTuple_SetItem(result, 1, outboollist);
+ return result;
+ }
+ }
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.67/src/matchpathcon.c
+--- nsalibselinux/src/matchpathcon.c 2008-06-12 23:25:14.000000000 -0400
++++ libselinux-2.0.67/src/matchpathcon.c 2008-07-09 16:52:33.000000000 -0400
@@ -2,6 +2,7 @@
#include <string.h>
#include <errno.h>
@@ -63,2631 +216,154 @@
va_end(ap);
}
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.64/src/selinux.py
[...2550 lines suppressed...]
-+ { (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"));
- }
-
++%include "selinuxswig.i"
Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-9/libselinux.spec,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- libselinux.spec 16 May 2008 19:00:59 -0000 1.326
+++ libselinux.spec 15 Jul 2008 13:07:35 -0000 1.327
@@ -1,17 +1,18 @@
-%define libsepolver 2.0.18-2
+%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%define libsepolver 2.0.32-1
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: SELinux library and simple utilities
Name: libselinux
-Version: 2.0.64
-Release: 3%{?dist}
+Version: 2.0.67
+Release: 4%{?dist}
License: Public Domain
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
Patch: libselinux-rhat.patch
URL: http://www.nsa.gov/selinux
-BuildRequires: python-devel libsepol-static >= %{libsepolver} swig
+BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig
Requires: libsepol >= %{libsepolver}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,15 @@
The libselinux-python package contains the python bindings for developing
SELinux applications.
+%package ruby
+Summary: SELinux ruby bindings for libselinux
+Group: Development/Libraries
+Requires: libselinux = %{version}-%{release}
+
+%description ruby
+The libselinux-ruby package contains the ruby bindings for developing
+SELinux applications.
+
%package devel
Summary: Header files and libraries used to build SELinux
Group: Development/Libraries
@@ -135,7 +145,30 @@
%dir %{python_sitearch}/selinux
%{python_sitearch}/selinux/*
+%files ruby
+%defattr(-,root,root,-)
+%{ruby_sitearch}/selinux.so
+
%changelog
+* Wed Jul 9 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.67-4
+- Add ruby support for puppet
+
+* Tue Jul 8 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.67-3
+- Rebuild for new libsepol
+
+* Sun Jun 29 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.67-2
+- Add Karel Zak patch for freecon man page
+
+* Sun Jun 22 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.67-1
+- Update to Upstream
+ * New and revised AVC, label, and mapping man pages from Eamon Walsh.
+ * Add swig python bindings for avc interfaces from Dan Walsh.
+
+* Sun Jun 22 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.65-1
+- Update to Upstream
+ * Fix selinux_file_context_verify() and selinux_lsetfilecon_default() to call matchpathcon_init_prefix if not already initialized.
+ * Add -q qualifier for -V option of matchpathcon and change it to indicate whether verification succeeded or failed via exit status.
+
* Fri May 16 2008 Dan Walsh <dwalsh at redhat.com> - 2.0.64-3
- libselinux no longer neets to telnet -u in post install
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-9/sources,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- sources 7 May 2008 17:42:02 -0000 1.172
+++ sources 15 Jul 2008 13:07:35 -0000 1.173
@@ -1 +1 @@
-6d2df9a800e1960c96ddef129c83dc34 libselinux-2.0.64.tgz
+76f43d37b71d72ada3f5f698ece19bde libselinux-2.0.67.tgz
More information about the fedora-extras-commits
mailing list