rpms/libsemanage/devel .cvsignore, 1.56, 1.57 libsemanage-rhat.patch, 1.12, 1.13 libsemanage.spec, 1.85, 1.86 sources, 1.58, 1.59
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 14 11:38:00 UTC 2006
- Previous message (by thread): rpms/libselinux/devel .cvsignore, 1.103, 1.104 libselinux.spec, 1.185, 1.186 sources, 1.105, 1.106
- Next message (by thread): rpms/policycoreutils/devel .cvsignore, 1.106, 1.107 policycoreutils-rhat.patch, 1.180, 1.181 policycoreutils.spec, 1.257, 1.258 sources, 1.110, 1.111
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22290
Modified Files:
.cvsignore libsemanage-rhat.patch libsemanage.spec sources
Log Message:
* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.5-1
- Upgrade to latest from NSA
* Merged file context sorting code from Christopher Ashworth
(Tresys Technology), based on fc_sort.c code in refpolicy.
* Merged python binding t_output_helper removal patch from Dan Walsh.
* Regenerated swig files.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 21 Mar 2006 15:45:45 -0000 1.56
+++ .cvsignore 14 Apr 2006 11:37:56 -0000 1.57
@@ -61,3 +61,5 @@
libsemanage-1.5.31.tgz
libsemanage-1.6.tgz
libsemanage-1.6.2.tgz
+libsemanage-1.6.3.tgz
+libsemanage-1.6.5.tgz
libsemanage-rhat.patch:
VERSION | 2
src/semanage.py | 266
src/semanageswig_python.i | 74
src/semanageswig_wrap.c |18275 ++++++++++++++++++++++++++--------------------
4 files changed, 10620 insertions(+), 7997 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 libsemanage-rhat.patch
Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libsemanage-rhat.patch 3 Apr 2006 20:49:58 -0000 1.12
+++ libsemanage-rhat.patch 14 Apr 2006 11:37:56 -0000 1.13
@@ -1,12 +1,20422 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.6.2/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c 2006-03-10 09:48:01.000000000 -0500
-+++ libsemanage-1.6.2/src/semanage_store.c 2006-03-29 14:20:16.000000000 -0500
-@@ -1159,6 +1159,8 @@
- ERR(sh, "Could not open direct %s at %s.", lock_name, lock_file);
- return -1;
- }
-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
-+
- if (sh->timeout == 0) {
- /* return immediately */
- origtime.tv_sec = 0;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-1.6.2/src/semanage.py
+--- nsalibsemanage/src/semanage.py 2006-02-16 13:35:22.000000000 -0500
++++ libsemanage-1.6.2/src/semanage.py 2006-04-03 19:12:41.000000000 -0400
+@@ -1,19 +1,19 @@
+-# This file was created automatically by SWIG.
++# This file was created automatically by SWIG 1.3.29.
+ # Don't modify this file, modify the SWIG interface instead.
+ # This file is compatible with both classic and new-style classes.
+
+ import _semanage
+-
++import new
++new_instancemethod = new.instancemethod
+ def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
++ if (name == "thisown"): return self.this.own(value)
+ if (name == "this"):
+- if isinstance(value, class_type):
+- self.__dict__[name] = value.this
+- if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
+- del value.thisown
++ if type(value).__name__ == 'PySwigObject':
++ self.__dict__[name] = value
+ return
+ method = class_type.__swig_setmethods__.get(name,None)
+ if method: return method(self,value)
+- if (not static) or hasattr(self,name) or (name == "thisown"):
++ if (not static) or hasattr(self,name):
+ self.__dict__[name] = value
+ else:
+ raise AttributeError("You cannot add attributes to %s" % self)
+@@ -22,10 +22,16 @@
+ return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+ def _swig_getattr(self,class_type,name):
++ if (name == "thisown"): return self.this.own()
+ method = class_type.__swig_getmethods__.get(name,None)
+ if method: return method(self)
+ raise AttributeError,name
+
++def _swig_repr(self):
++ try: strthis = "proxy of " + self.this.__repr__()
++ except: strthis = ""
++ return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
++
+ import types
+ try:
+ _object = types.ObjectType
+@@ -39,345 +45,179 @@
+ SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR
+ SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN
+ SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO
+-
+ semanage_msg_get_level = _semanage.semanage_msg_get_level
+-
+ semanage_msg_get_channel = _semanage.semanage_msg_get_channel
+-
+ semanage_msg_get_fname = _semanage.semanage_msg_get_fname
+-
+ semanage_msg_set_callback = _semanage.semanage_msg_set_callback
+-
+ semanage_handle_create = _semanage.semanage_handle_create
+-
+ semanage_handle_destroy = _semanage.semanage_handle_destroy
+ SEMANAGE_CON_INVALID = _semanage.SEMANAGE_CON_INVALID
+ SEMANAGE_CON_DIRECT = _semanage.SEMANAGE_CON_DIRECT
+ SEMANAGE_CON_POLSERV_LOCAL = _semanage.SEMANAGE_CON_POLSERV_LOCAL
+ SEMANAGE_CON_POLSERV_REMOTE = _semanage.SEMANAGE_CON_POLSERV_REMOTE
+-
+ semanage_select_store = _semanage.semanage_select_store
+-
+ semanage_reload_policy = _semanage.semanage_reload_policy
+-
+ semanage_set_reload = _semanage.semanage_set_reload
+-
+ semanage_set_rebuild = _semanage.semanage_set_rebuild
+-
+ semanage_set_create_store = _semanage.semanage_set_create_store
+-
+ semanage_is_managed = _semanage.semanage_is_managed
+-
+ semanage_connect = _semanage.semanage_connect
+-
+ semanage_disconnect = _semanage.semanage_disconnect
+-
+ semanage_begin_transaction = _semanage.semanage_begin_transaction
+-
+ semanage_commit = _semanage.semanage_commit
+ SEMANAGE_CAN_READ = _semanage.SEMANAGE_CAN_READ
+ SEMANAGE_CAN_WRITE = _semanage.SEMANAGE_CAN_WRITE
+-
+ semanage_access_check = _semanage.semanage_access_check
+-
+ semanage_is_connected = _semanage.semanage_is_connected
+-
+ semanage_module_install = _semanage.semanage_module_install
+-
+ semanage_module_upgrade = _semanage.semanage_module_upgrade
+-
+ semanage_module_install_base = _semanage.semanage_module_install_base
+-
+ semanage_module_remove = _semanage.semanage_module_remove
+-
+ semanage_module_list = _semanage.semanage_module_list
+-
+ semanage_module_info_datum_destroy = _semanage.semanage_module_info_datum_destroy
+-
+ semanage_module_list_nth = _semanage.semanage_module_list_nth
+-
+ semanage_module_get_name = _semanage.semanage_module_get_name
+-
+ semanage_module_get_version = _semanage.semanage_module_get_version
+-
+ semanage_context_get_user = _semanage.semanage_context_get_user
+-
+ semanage_context_set_user = _semanage.semanage_context_set_user
+-
+ semanage_context_get_role = _semanage.semanage_context_get_role
+-
+ semanage_context_set_role = _semanage.semanage_context_set_role
+-
+ semanage_context_get_type = _semanage.semanage_context_get_type
+-
+ semanage_context_set_type = _semanage.semanage_context_set_type
+-
+ semanage_context_get_mls = _semanage.semanage_context_get_mls
+-
+ semanage_context_set_mls = _semanage.semanage_context_set_mls
+-
+ semanage_context_create = _semanage.semanage_context_create
+-
+ semanage_context_clone = _semanage.semanage_context_clone
+-
+ semanage_context_free = _semanage.semanage_context_free
+-
+ semanage_context_from_string = _semanage.semanage_context_from_string
+-
+ semanage_context_to_string = _semanage.semanage_context_to_string
+-
+ 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_compare2 = _semanage.semanage_bool_compare2
+-
+ 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_bool_query = _semanage.semanage_bool_query
+-
+ semanage_bool_exists = _semanage.semanage_bool_exists
+-
+ semanage_bool_count = _semanage.semanage_bool_count
+-
+ semanage_bool_iterate = _semanage.semanage_bool_iterate
+-
+ semanage_bool_list = _semanage.semanage_bool_list
+-
+ semanage_bool_modify_local = _semanage.semanage_bool_modify_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
[...20043 lines suppressed...]
+- return -1;
+- }
+-
+- dict = PyModule_GetDict(m);
+- if (dict == NULL) {
+- /* Internal error -- modules must have a dict! */
+- PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+- PyModule_GetName(m));
+- return -1;
+- }
+- if (PyDict_SetItemString(dict, name, o))
+- return -1;
+- Py_DECREF(o);
+- return 0;
+- }
+-#endif
+-
+- static swig_type_info **
+- SWIG_Python_SetTypeListHandle(swig_type_info **type_list_handle) {
+- static PyMethodDef swig_empty_runtime_method_table[] = {
+- {
+- NULL, NULL, 0, NULL
+- }
+- };/* Sentinel */
+-
+- PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+- swig_empty_runtime_method_table);
+- PyObject *pointer = PyCObject_FromVoidPtr((void *) type_list_handle, NULL);
+- if (pointer && module) {
+- PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+- }
+- return type_list_handle;
+- }
+-
+- static swig_type_info **
+- SWIG_Python_LookupTypePointer(swig_type_info **type_list_handle) {
+- swig_type_info **type_pointer;
+-
+- /* first check if module already created */
+- type_pointer = SWIG_Python_GetTypeListHandle();
+- if (type_pointer) {
+- return type_pointer;
+- } else {
+- /* create a new module and variable */
+- return SWIG_Python_SetTypeListHandle(type_list_handle);
+- }
+- }
+-
++ }
++
+ #ifdef __cplusplus
+ }
+ #endif
+@@ -9372,106 +12289,42 @@
+ * Partial Init method
+ * -----------------------------------------------------------------------------*/
+
+-#ifdef SWIG_LINK_RUNTIME
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-SWIGEXPORT(void *) SWIG_ReturnGlobalTypeList(void *);
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-SWIGEXPORT(void) SWIG_init(void) {
+- static PyObject *SWIG_globals = 0;
+- static int typeinit = 0;
+- PyObject *m, *d;
+- int i;
+- if (!SWIG_globals) SWIG_globals = SWIG_newvarlink();
+-
+- /* Fix SwigMethods to carry the callback ptrs when needed */
+- SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_types_initial);
+-
+- m = Py_InitModule((char *) SWIG_name, SwigMethods);
+- d = PyModule_GetDict(m);
+-
+- if (!typeinit) {
+-#ifdef SWIG_LINK_RUNTIME
+- swig_type_list_handle = (swig_type_info **) SWIG_ReturnGlobalTypeList(swig_type_list_handle);
+-#else
+-# ifndef SWIG_STATIC_RUNTIME
+- swig_type_list_handle = SWIG_Python_LookupTypePointer(swig_type_list_handle);
+-# endif
+-#endif
+- for (i = 0; swig_types_initial[i]; i++) {
+- swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
+- }
+- typeinit = 1;
+- }
+- SWIG_InstallConstants(d,swig_const_table);
+-
+- {
+- PyDict_SetItemString(d,"SEMANAGE_MSG_ERR", SWIG_From_int((int)(1)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_MSG_WARN", SWIG_From_int((int)(2)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_MSG_INFO", SWIG_From_int((int)(3)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CON_INVALID", SWIG_From_int((int)(SEMANAGE_CON_INVALID)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CON_DIRECT", SWIG_From_int((int)(SEMANAGE_CON_DIRECT)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_LOCAL", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_LOCAL)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_REMOTE", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CAN_READ", SWIG_From_int((int)(1)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_CAN_WRITE", SWIG_From_int((int)(2)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_PROTO_UDP", SWIG_From_int((int)(0)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_PROTO_TCP", SWIG_From_int((int)(1)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_ALL", SWIG_From_int((int)(0)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_REG", SWIG_From_int((int)(1)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_DIR", SWIG_From_int((int)(2)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_CHAR", SWIG_From_int((int)(3)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_BLOCK", SWIG_From_int((int)(4)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_SOCK", SWIG_From_int((int)(5)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_LINK", SWIG_From_int((int)(6)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_FCONTEXT_PIPE", SWIG_From_int((int)(7)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_PROTO_IP4", SWIG_From_int((int)(0)));
+- }
+- {
+- PyDict_SetItemString(d,"SEMANAGE_PROTO_IP6", SWIG_From_int((int)(1)));
+- }
++SWIGEXPORT void SWIG_init(void) {
++ PyObject *m, *d;
++
++ /* Fix SwigMethods to carry the callback ptrs when needed */
++ SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
++
++ m = Py_InitModule((char *) SWIG_name, SwigMethods);
++ d = PyModule_GetDict(m);
++
++ SWIG_InitializeModule(0);
++ SWIG_InstallConstants(d,swig_const_table);
++
++
++ SWIG_Python_SetConstant(d, "SEMANAGE_MSG_ERR",SWIG_From_int((int)(1)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_MSG_WARN",SWIG_From_int((int)(2)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_MSG_INFO",SWIG_From_int((int)(3)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CON_INVALID",SWIG_From_int((int)(SEMANAGE_CON_INVALID)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CON_DIRECT",SWIG_From_int((int)(SEMANAGE_CON_DIRECT)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CON_POLSERV_LOCAL",SWIG_From_int((int)(SEMANAGE_CON_POLSERV_LOCAL)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CON_POLSERV_REMOTE",SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CAN_READ",SWIG_From_int((int)(1)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_CAN_WRITE",SWIG_From_int((int)(2)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_UDP",SWIG_From_int((int)(0)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_TCP",SWIG_From_int((int)(1)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_ALL",SWIG_From_int((int)(0)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_REG",SWIG_From_int((int)(1)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_DIR",SWIG_From_int((int)(2)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_CHAR",SWIG_From_int((int)(3)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_BLOCK",SWIG_From_int((int)(4)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_SOCK",SWIG_From_int((int)(5)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_LINK",SWIG_From_int((int)(6)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_FCONTEXT_PIPE",SWIG_From_int((int)(7)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_IP4",SWIG_From_int((int)(0)));
++ SWIG_Python_SetConstant(d, "SEMANAGE_PROTO_IP6",SWIG_From_int((int)(1)));
+ }
+
+diff --exclude-from=exclude -N -u -r nsalibsemanage/VERSION libsemanage-1.6.2/VERSION
+--- nsalibsemanage/VERSION 2006-04-05 13:33:50.000000000 -0400
++++ libsemanage-1.6.2/VERSION 2006-03-21 09:19:55.000000000 -0500
+@@ -1 +1 @@
+-1.6.3
++1.6.2
Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- libsemanage.spec 3 Apr 2006 22:19:54 -0000 1.85
+++ libsemanage.spec 14 Apr 2006 11:37:57 -0000 1.86
@@ -1,13 +1,12 @@
-%define libsepolver 1.12-1
-%define libselinuxver 1.30-1
+%define libsepolver 1.12.5-1
+%define libselinuxver 1.30.3-1
Summary: SELinux binary policy manipulation library
Name: libsemanage
-Version: 1.6.2
-Release: 2
+Version: 1.6.5
+Release: 1
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}
@@ -40,7 +39,6 @@
%prep
%setup -q
-%patch -p1 -b .rhat
%build
make clean
@@ -74,6 +72,18 @@
%{_mandir}/man3/*
%changelog
+* Fri Apr 14 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.5-1
+- Upgrade to latest from NSA
+ * Merged file context sorting code from Christopher Ashworth
+ (Tresys Technology), based on fc_sort.c code in refpolicy.
+ * Merged python binding t_output_helper removal patch from Dan Walsh.
+ * Regenerated swig files.
+
+* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.3-1
+- Fix to work with new version of swig
+- Upgrade to latest from NSA
+ * Merged corrected fix for descriptor leak from Dan Walsh.
+
* Wed Mar 29 2006 Dan Walsh <dwalsh at redhat.com> - 1.6.2-2
- Fix leaky descriptor
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 21 Mar 2006 15:45:45 -0000 1.58
+++ sources 14 Apr 2006 11:37:57 -0000 1.59
@@ -1 +1 @@
-187deb14a3577967b5ddac2013cd641c libsemanage-1.6.2.tgz
+e82f27ce38a2e02efecd00ca434545c5 libsemanage-1.6.5.tgz
- Previous message (by thread): rpms/libselinux/devel .cvsignore, 1.103, 1.104 libselinux.spec, 1.185, 1.186 sources, 1.105, 1.106
- Next message (by thread): rpms/policycoreutils/devel .cvsignore, 1.106, 1.107 policycoreutils-rhat.patch, 1.180, 1.181 policycoreutils.spec, 1.257, 1.258 sources, 1.110, 1.111
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list