rpms/libsemanage/devel libsemanage-rhat.patch, 1.5, 1.6 libsemanage.spec, 1.54, 1.55
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 2 12:56:31 UTC 2006
Author: dwalsh
Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3352
Modified Files:
libsemanage-rhat.patch libsemanage.spec
Log Message:
* Tue Dec 27 2005 Dan Walsh <dwalsh at redhat.com> 1.5.3-3
- Add Ivans patch to turn on ports
libsemanage-rhat.patch:
include/semanage/semanage.h | 4
src/libsemanage.map | 2
src/policy_components.c | 4
src/port_record.c | 18
src/ports_policydb.c | 7
src/semanage.py | 290 +--
src/semanageswig.i | 28
src/semanageswig_wrap.c | 3944 ++++++++++++++++++++++++++------------------
8 files changed, 2601 insertions(+), 1696 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 libsemanage-rhat.patch
Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsemanage-rhat.patch 7 Dec 2005 17:32:18 -0000 1.5
+++ libsemanage-rhat.patch 2 Jan 2006 12:56:28 -0000 1.6
@@ -1,11 +1,6616 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.3.64/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c 2005-11-16 08:44:47.000000000 -0500
-+++ libsemanage-1.3.64/src/semanage_store.c 2005-12-07 08:07:02.000000000 -0500
-@@ -917,6 +917,7 @@
- INFO(sh, "Non-fatal error: Could not copy %s to %s.", active_seusers, store_seusers);
- /* Non-fatal; fall through */
- }
-+ chmod(store_seusers, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/semanage.h libsemanage-1.5.3/include/semanage/semanage.h
+--- nsalibsemanage/include/semanage/semanage.h 2005-11-04 15:37:49.000000000 -0500
++++ libsemanage-1.5.3/include/semanage/semanage.h 2005-12-27 10:56:24.000000000 -0500
+@@ -32,9 +32,7 @@
+ #include <semanage/seuser_record.h>
+ #include <semanage/context_record.h>
+ #include <semanage/iface_record.h>
+-#if 0
+ #include <semanage/port_record.h>
+-#endif
+
+ /* Dbase */
+ #include <semanage/booleans_local.h>
+@@ -42,10 +40,8 @@
+ #include <semanage/users_local.h>
+ #include <semanage/users_policy.h>
+ #include <semanage/seusers.h>
+-#if 0
+ #include <semanage/ports_local.h>
+ #include <semanage/ports_policy.h>
+-#endif
+ #include <semanage/interfaces_local.h>
+ #include <semanage/interfaces_policy.h>
+
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-1.5.3/src/libsemanage.map
+--- nsalibsemanage/src/libsemanage.map 2005-11-08 14:48:37.000000000 -0500
++++ libsemanage-1.5.3/src/libsemanage.map 2005-12-27 10:56:26.000000000 -0500
+@@ -10,6 +10,6 @@
+ semanage_module_get_version; semanage_select_store;
+ semanage_reload_policy; semanage_set_reload;
+ semanage_user_*; semanage_bool_*; semanage_seuser_*;
+- semanage_iface_*; semanage_context_*;
++ semanage_iface_*; semanage_port_*; semanage_context_*;
+ local: *;
+ };
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy_components.c libsemanage-1.5.3/src/policy_components.c
+--- nsalibsemanage/src/policy_components.c 2005-12-13 11:18:11.000000000 -0500
++++ libsemanage-1.5.3/src/policy_components.c 2005-12-27 10:56:28.000000000 -0500
+@@ -127,10 +127,10 @@
+
+ { semanage_user_dbase_local(handle),
+ semanage_user_dbase_policy(handle), MODE_MODIFY },
+-#if 0
++
+ { semanage_port_dbase_local(handle),
+ semanage_port_dbase_policy(handle), MODE_MODIFY },
+-#endif
++
+ { semanage_iface_dbase_local(handle),
+ semanage_iface_dbase_policy(handle), MODE_MODIFY },
+
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/port_record.c libsemanage-1.5.3/src/port_record.c
+--- nsalibsemanage/src/port_record.c 2005-12-14 14:16:47.000000000 -0500
++++ libsemanage-1.5.3/src/port_record.c 2005-12-27 10:56:29.000000000 -0500
+@@ -17,24 +17,6 @@
+ #include "handle.h"
+ #include "database.h"
+
+-/* FIXME: Remove when sepol port interface is stabilized and exported. */
+-#define sepol_port_compare(port, key) -1
+-#define sepol_port_key_create(handle, low, high, proto, key) -1
+-#define sepol_port_key_extract(handle, port, key) -1
+-#define sepol_port_key_free(key)
+-#define sepol_port_get_proto(port) -1
+-#define sepol_port_set_proto(port, proto)
+-#define sepol_port_get_proto_str(port) NULL
+-#define sepol_port_get_low(port) -1
+-#define sepol_port_get_high(port) -1
+-#define sepol_port_set_port(port, num)
+-#define sepol_port_set_range(port, low, high)
+-#define sepol_port_get_con(port) NULL
+-#define sepol_port_set_con(port, con)
+-#define sepol_port_create(handle, port) -1
+-#define sepol_port_clone(handle, port1, port2) -1
+-#define sepol_port_free(port)
+-
+ /* Key */
+ int semanage_port_compare(
+ semanage_port_t* port,
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/ports_policydb.c libsemanage-1.5.3/src/ports_policydb.c
+--- nsalibsemanage/src/ports_policydb.c 2005-12-14 14:16:47.000000000 -0500
++++ libsemanage-1.5.3/src/ports_policydb.c 2005-12-27 10:56:31.000000000 -0500
+@@ -16,13 +16,6 @@
+ #include "debug.h"
+ #include "database_policydb.h"
+
+-/* FIXME: Remove when sepol port interface is stabilized and exported. */
+-#define sepol_port_modify NULL
+-#define sepol_port_query NULL
+-#define sepol_port_count NULL
+-#define sepol_port_exists NULL
+-#define sepol_port_iterate NULL
+-
+ /* PORT RECORD (SEPOL): POLICYDB extension : method table */
+ record_policydb_table_t SEMANAGE_PORT_POLICYDB_RTABLE = {
+ .add = NULL,
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-1.5.3/src/semanage.py
+--- nsalibsemanage/src/semanage.py 2005-12-06 13:36:45.000000000 -0500
++++ libsemanage-1.5.3/src/semanage.py 2005-12-27 10:59:08.000000000 -0500
+@@ -44,28 +44,6 @@
+ semanage_port_by_idx = _semanage.semanage_port_by_idx
+
+ char_by_idx = _semanage.char_by_idx
+-
+-semanage_bool_key_create = _semanage.semanage_bool_key_create
+-
+-semanage_bool_key_extract = _semanage.semanage_bool_key_extract
+-
+-semanage_bool_key_free = _semanage.semanage_bool_key_free
+-
+-semanage_bool_compare = _semanage.semanage_bool_compare
+-
+-semanage_bool_get_name = _semanage.semanage_bool_get_name
+-
+-semanage_bool_set_name = _semanage.semanage_bool_set_name
+-
+-semanage_bool_get_value = _semanage.semanage_bool_get_value
+-
+-semanage_bool_set_value = _semanage.semanage_bool_set_value
+-
+-semanage_bool_create = _semanage.semanage_bool_create
+-
+-semanage_bool_clone = _semanage.semanage_bool_clone
+-
+-semanage_bool_free = _semanage.semanage_bool_free
+ SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR
+ SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN
+ SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO
+@@ -78,34 +56,6 @@
+
+ semanage_msg_set_callback = _semanage.semanage_msg_set_callback
+
+-semanage_iface_query = _semanage.semanage_iface_query
+-
+-semanage_iface_exists = _semanage.semanage_iface_exists
+-
+-semanage_iface_count = _semanage.semanage_iface_count
+-
+-semanage_iface_iterate = _semanage.semanage_iface_iterate
+-
+-semanage_iface_list = _semanage.semanage_iface_list
+-
+-semanage_bool_add_local = _semanage.semanage_bool_add_local
+-
+-semanage_bool_modify_local = _semanage.semanage_bool_modify_local
+-
+-semanage_bool_set_local = _semanage.semanage_bool_set_local
+-
+-semanage_bool_del_local = _semanage.semanage_bool_del_local
+-
+-semanage_bool_query_local = _semanage.semanage_bool_query_local
+-
+-semanage_bool_exists_local = _semanage.semanage_bool_exists_local
+-
+-semanage_bool_count_local = _semanage.semanage_bool_count_local
+-
+-semanage_bool_iterate_local = _semanage.semanage_bool_iterate_local
+-
+-semanage_bool_list_local = _semanage.semanage_bool_list_local
+-
+ semanage_handle_create = _semanage.semanage_handle_create
+
+ semanage_handle_destroy = _semanage.semanage_handle_destroy
+@@ -148,43 +98,53 @@
+
+ semanage_module_get_version = _semanage.semanage_module_get_version
+
+-semanage_user_key_create = _semanage.semanage_user_key_create
++semanage_context_get_user = _semanage.semanage_context_get_user
+
+-semanage_user_key_extract = _semanage.semanage_user_key_extract
++semanage_context_set_user = _semanage.semanage_context_set_user
+
+-semanage_user_key_free = _semanage.semanage_user_key_free
++semanage_context_get_role = _semanage.semanage_context_get_role
+
+-semanage_user_compare = _semanage.semanage_user_compare
++semanage_context_set_role = _semanage.semanage_context_set_role
+
+-semanage_user_get_name = _semanage.semanage_user_get_name
++semanage_context_get_type = _semanage.semanage_context_get_type
+
+-semanage_user_set_name = _semanage.semanage_user_set_name
[...6235 lines suppressed...]
++ { (char *)"semanage_user_list", _wrap_semanage_user_list, METH_VARARGS, NULL},
++ { (char *)"semanage_port_compare", _wrap_semanage_port_compare, METH_VARARGS, NULL},
++ { (char *)"semanage_port_key_create", _wrap_semanage_port_key_create, METH_VARARGS, NULL},
++ { (char *)"semanage_port_key_extract", _wrap_semanage_port_key_extract, METH_VARARGS, NULL},
++ { (char *)"semanage_port_key_free", _wrap_semanage_port_key_free, METH_VARARGS, NULL},
++ { (char *)"semanage_port_get_proto", _wrap_semanage_port_get_proto, METH_VARARGS, NULL},
++ { (char *)"semanage_port_set_proto", _wrap_semanage_port_set_proto, METH_VARARGS, NULL},
++ { (char *)"semanage_port_get_proto_str", _wrap_semanage_port_get_proto_str, METH_VARARGS, NULL},
++ { (char *)"semanage_port_get_low", _wrap_semanage_port_get_low, METH_VARARGS, NULL},
++ { (char *)"semanage_port_get_high", _wrap_semanage_port_get_high, METH_VARARGS, NULL},
++ { (char *)"semanage_port_set_port", _wrap_semanage_port_set_port, METH_VARARGS, NULL},
++ { (char *)"semanage_port_set_range", _wrap_semanage_port_set_range, METH_VARARGS, NULL},
++ { (char *)"semanage_port_get_con", _wrap_semanage_port_get_con, METH_VARARGS, NULL},
++ { (char *)"semanage_port_set_con", _wrap_semanage_port_set_con, METH_VARARGS, NULL},
++ { (char *)"semanage_port_create", _wrap_semanage_port_create, METH_VARARGS, NULL},
++ { (char *)"semanage_port_clone", _wrap_semanage_port_clone, METH_VARARGS, NULL},
++ { (char *)"semanage_port_free", _wrap_semanage_port_free, METH_VARARGS, NULL},
++ { (char *)"semanage_port_add_local", _wrap_semanage_port_add_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_modify_local", _wrap_semanage_port_modify_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_set_local", _wrap_semanage_port_set_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_del_local", _wrap_semanage_port_del_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_query_local", _wrap_semanage_port_query_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_exists_local", _wrap_semanage_port_exists_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_count_local", _wrap_semanage_port_count_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_iterate_local", _wrap_semanage_port_iterate_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_list_local", _wrap_semanage_port_list_local, METH_VARARGS, NULL},
++ { (char *)"semanage_port_query", _wrap_semanage_port_query, METH_VARARGS, NULL},
++ { (char *)"semanage_port_exists", _wrap_semanage_port_exists, METH_VARARGS, NULL},
++ { (char *)"semanage_port_count", _wrap_semanage_port_count, METH_VARARGS, NULL},
++ { (char *)"semanage_port_iterate", _wrap_semanage_port_iterate, METH_VARARGS, NULL},
++ { (char *)"semanage_port_list", _wrap_semanage_port_list, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_key_create", _wrap_semanage_seuser_key_create, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_key_extract", _wrap_semanage_seuser_key_extract, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_key_free", _wrap_semanage_seuser_key_free, METH_VARARGS, NULL},
+@@ -5626,37 +6524,6 @@
+ { (char *)"semanage_seuser_create", _wrap_semanage_seuser_create, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_clone", _wrap_semanage_seuser_clone, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_free", _wrap_semanage_seuser_free, METH_VARARGS, NULL},
+- { (char *)"semanage_user_add_local", _wrap_semanage_user_add_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_modify_local", _wrap_semanage_user_modify_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_set_local", _wrap_semanage_user_set_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_del_local", _wrap_semanage_user_del_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_query_local", _wrap_semanage_user_query_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_exists_local", _wrap_semanage_user_exists_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_count_local", _wrap_semanage_user_count_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_iterate_local", _wrap_semanage_user_iterate_local, METH_VARARGS, NULL},
+- { (char *)"semanage_user_list_local", _wrap_semanage_user_list_local, METH_VARARGS, NULL},
+- { (char *)"semanage_context_get_user", _wrap_semanage_context_get_user, METH_VARARGS, NULL},
+- { (char *)"semanage_context_set_user", _wrap_semanage_context_set_user, METH_VARARGS, NULL},
+- { (char *)"semanage_context_get_role", _wrap_semanage_context_get_role, METH_VARARGS, NULL},
+- { (char *)"semanage_context_set_role", _wrap_semanage_context_set_role, METH_VARARGS, NULL},
+- { (char *)"semanage_context_get_type", _wrap_semanage_context_get_type, METH_VARARGS, NULL},
+- { (char *)"semanage_context_set_type", _wrap_semanage_context_set_type, METH_VARARGS, NULL},
+- { (char *)"semanage_context_get_mls", _wrap_semanage_context_get_mls, METH_VARARGS, NULL},
+- { (char *)"semanage_context_set_mls", _wrap_semanage_context_set_mls, METH_VARARGS, NULL},
+- { (char *)"semanage_context_create", _wrap_semanage_context_create, METH_VARARGS, NULL},
+- { (char *)"semanage_context_clone", _wrap_semanage_context_clone, METH_VARARGS, NULL},
+- { (char *)"semanage_context_free", _wrap_semanage_context_free, METH_VARARGS, NULL},
+- { (char *)"semanage_context_from_string", _wrap_semanage_context_from_string, METH_VARARGS, NULL},
+- { (char *)"semanage_context_to_string", _wrap_semanage_context_to_string, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_add_local", _wrap_semanage_iface_add_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_modify_local", _wrap_semanage_iface_modify_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_set_local", _wrap_semanage_iface_set_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_del_local", _wrap_semanage_iface_del_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_query_local", _wrap_semanage_iface_query_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_exists_local", _wrap_semanage_iface_exists_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_count_local", _wrap_semanage_iface_count_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_iterate_local", _wrap_semanage_iface_iterate_local, METH_VARARGS, NULL},
+- { (char *)"semanage_iface_list_local", _wrap_semanage_iface_list_local, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_add", _wrap_semanage_seuser_add, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_modify", _wrap_semanage_seuser_modify, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_set", _wrap_semanage_seuser_set, METH_VARARGS, NULL},
+@@ -5666,26 +6533,22 @@
+ { (char *)"semanage_seuser_count", _wrap_semanage_seuser_count, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_iterate", _wrap_semanage_seuser_iterate, METH_VARARGS, NULL},
+ { (char *)"semanage_seuser_list", _wrap_semanage_seuser_list, METH_VARARGS, NULL},
+- { (char *)"semanage_user_query", _wrap_semanage_user_query, METH_VARARGS, NULL},
+- { (char *)"semanage_user_exists", _wrap_semanage_user_exists, METH_VARARGS, NULL},
+- { (char *)"semanage_user_count", _wrap_semanage_user_count, METH_VARARGS, NULL},
+- { (char *)"semanage_user_iterate", _wrap_semanage_user_iterate, METH_VARARGS, NULL},
+- { (char *)"semanage_user_list", _wrap_semanage_user_list, METH_VARARGS, NULL},
+ { NULL, NULL, 0, NULL }
+ };
+
+
+ /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+
+-static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_f_p_struct_semanage_iface_p_void__int[] = {{"_p_f_p_struct_semanage_iface_p_void__int", 0, "int (*)(struct semanage_iface *,void *)|int (*)(semanage_iface_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_iface_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_p_char[] = {{"_p_p_p_char", 0, "char ***", 0, 0, 0, 0},{"_p_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0, 0, 0, 0},{"_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_f_p_struct_semanage_user_p_void__int[] = {{"_p_f_p_struct_semanage_user_p_void__int", 0, "int (*)(struct semanage_user *,void *)|int (*)(semanage_user_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_user_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_port_key[] = {{"_p_semanage_port_key", 0, "struct semanage_port_key *|semanage_port_key_t *", 0, 0, 0, 0},{"_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_p_semanage_port_key[] = {{"_p_p_semanage_port_key", 0, "struct semanage_port_key **|semanage_port_key_t **", 0, 0, 0, 0},{"_p_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_f_p_struct_semanage_port_p_void__int[] = {{"_p_f_p_struct_semanage_port_p_void__int", 0, "int (*)(struct semanage_port *,void *)|int (*)(semanage_port_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_port_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_f_p_struct_semanage_seuser_p_void__int[] = {{"_p_f_p_struct_semanage_seuser_p_void__int", 0, "int (*)(struct semanage_seuser *,void *)|int (*)(semanage_seuser_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_seuser_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_p_semanage_port_t[] = {{"_p_p_semanage_port_t", 0, "semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_semanage_port_t[] = {{"_p_semanage_port_t", 0, "semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_seuser[] = {{"_p_p_semanage_seuser", 0, "struct semanage_seuser **|semanage_seuser_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_semanage_seuser[] = {{"_p_semanage_seuser", 0, "struct semanage_seuser *|semanage_seuser_t *", 0, 0, 0, 0},{"_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_p_semanage_seuser[] = {{"_p_p_p_semanage_seuser", 0, "struct semanage_seuser ***|semanage_seuser_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+@@ -5697,37 +6560,41 @@
+ static swig_type_info _swigt__p_size_t[] = {{"_p_size_t", 0, "size_t *", 0, 0, 0, 0},{"_p_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__size_t[] = {{"_size_t", 0, "size_t", 0, 0, 0, 0},{"_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_p_semanage_user[] = {{"_p_p_p_semanage_user", 0, "struct semanage_user ***|semanage_user_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_user", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_user_key[] = {{"_p_p_semanage_user_key", 0, "struct semanage_user_key **|semanage_user_key_t **", 0, 0, 0, 0},{"_p_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_semanage_user_key[] = {{"_p_semanage_user_key", 0, "struct semanage_user_key *|semanage_user_key_t *", 0, 0, 0, 0},{"_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_seuser_key[] = {{"_p_p_semanage_seuser_key", 0, "struct semanage_seuser_key **|semanage_seuser_key_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_p_semanage_iface[] = {{"_p_p_p_semanage_iface", 0, "struct semanage_iface ***|semanage_iface_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_iface[] = {{"_p_p_semanage_iface", 0, "struct semanage_iface **|semanage_iface_t **", 0, 0, 0, 0},{"_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_bool_key[] = {{"_p_p_semanage_bool_key", 0, "struct semanage_bool_key **|semanage_bool_key_t **", 0, 0, 0, 0},{"_p_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_context[] = {{"_p_p_semanage_context", 0, "struct semanage_context **|semanage_context_t **", 0, 0, 0, 0},{"_p_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+-static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_semanage_module_info[] = {{"_p_semanage_module_info", 0, "struct semanage_module_info *|semanage_module_info_t *", 0, 0, 0, 0},{"_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_p_semanage_iface_key[] = {{"_p_p_semanage_iface_key", 0, "struct semanage_iface_key **|semanage_iface_key_t **", 0, 0, 0, 0},{"_p_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_semanage_iface_key[] = {{"_p_semanage_iface_key", 0, "struct semanage_iface_key *|semanage_iface_key_t *", 0, 0, 0, 0},{"_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void[] = {{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, "void (*)(void *,struct semanage_handle *,char const *,...)|void (*)(void *,semanage_handle_t *,char const *,...)", 0, 0, 0, 0},{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_p_semanage_port[] = {{"_p_p_semanage_port", 0, "struct semanage_port **|semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_semanage_port[] = {{"_p_semanage_port", 0, "struct semanage_port *|semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
++static swig_type_info _swigt__p_p_p_semanage_port[] = {{"_p_p_p_semanage_port", 0, "struct semanage_port ***|semanage_port_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+ static swig_type_info _swigt__p_semanage_handle[] = {{"_p_semanage_handle", 0, "struct semanage_handle *|semanage_handle_t *", 0, 0, 0, 0},{"_p_semanage_handle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+
+ static swig_type_info *swig_types_initial[] = {
+-_swigt__p_f_p_struct_semanage_bool_p_void__int,
+ _swigt__p_f_p_struct_semanage_iface_p_void__int,
++_swigt__p_f_p_struct_semanage_bool_p_void__int,
+ _swigt__p_p_p_char,
+ _swigt__p_char,
+ _swigt__p_p_char,
+ _swigt__p_f_p_struct_semanage_user_p_void__int,
++_swigt__p_semanage_port_key,
++_swigt__p_p_semanage_port_key,
++_swigt__p_f_p_struct_semanage_port_p_void__int,
+ _swigt__p_f_p_struct_semanage_seuser_p_void__int,
+-_swigt__p_p_semanage_port_t,
+-_swigt__p_semanage_port_t,
+ _swigt__p_p_semanage_seuser,
+ _swigt__p_semanage_seuser,
+ _swigt__p_p_p_semanage_seuser,
+@@ -5739,24 +6606,27 @@
+ _swigt__p_size_t,
+ _swigt__size_t,
+ _swigt__p_p_p_semanage_user,
+-_swigt__p_semanage_seuser_key,
+ _swigt__p_p_semanage_user_key,
+ _swigt__p_semanage_user_key,
++_swigt__p_semanage_seuser_key,
+ _swigt__p_p_semanage_seuser_key,
+-_swigt__p_semanage_iface,
+ _swigt__p_p_p_semanage_iface,
+ _swigt__p_p_semanage_iface,
+-_swigt__p_semanage_bool_key,
++_swigt__p_semanage_iface,
+ _swigt__p_p_semanage_bool_key,
++_swigt__p_semanage_bool_key,
+ _swigt__p_unsigned_int,
+-_swigt__p_semanage_context,
+ _swigt__p_p_semanage_context,
+-_swigt__p_p_semanage_module_info,
++_swigt__p_semanage_context,
+ _swigt__p_semanage_module_info,
++_swigt__p_p_semanage_module_info,
+ _swigt__p_p_semanage_iface_key,
+ _swigt__p_semanage_iface_key,
+ _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void,
+ _swigt__ptrdiff_t,
++_swigt__p_p_semanage_port,
++_swigt__p_semanage_port,
++_swigt__p_p_p_semanage_port,
+ _swigt__p_int,
+ _swigt__p_semanage_handle,
+ 0
+@@ -6130,5 +7000,11 @@
+ {
+ PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_REMOTE", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE)));
+ }
++ {
++ PyDict_SetItemString(d,"SEMANAGE_PROTO_UDP", SWIG_From_int((int)(0)));
++ }
++ {
++ PyDict_SetItemString(d,"SEMANAGE_PROTO_TCP", SWIG_From_int((int)(1)));
++ }
+ }
- if (!sh->do_reload)
- goto skip_reload;
Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- libsemanage.spec 14 Dec 2005 21:32:33 -0000 1.54
+++ libsemanage.spec 2 Jan 2006 12:56:28 -0000 1.55
@@ -2,10 +2,12 @@
Summary: SELinux binary policy manipulation library
Name: libsemanage
Version: 1.5.3
-Release: 2
+Release: 3
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}
@@ -36,6 +38,7 @@
%prep
%setup -q
+%patch -p1 -b .rhat
%build
make clean
@@ -71,6 +74,9 @@
%{_includedir}/semanage/*.h
%changelog
+* Tue Dec 27 2005 Dan Walsh <dwalsh at redhat.com> 1.5.3-3
+- Add Ivans patch to turn on ports
+
* Wed Dec 14 2005 Dan Walsh <dwalsh at redhat.com> 1.5.3-2
- Remove patch since upstream does the right thing
More information about the fedora-cvs-commits
mailing list