rpms/libsemanage/devel .cvsignore, 1.100, 1.101 libsemanage-rhat.patch, 1.50, 1.51 libsemanage.spec, 1.177, 1.178 sources, 1.102, 1.103
Daniel J Walsh
dwalsh at fedoraproject.org
Tue Jul 7 21:09:45 UTC 2009
- Previous message (by thread): rpms/selinux-policy/devel policy-F12.patch, 1.24, 1.25 selinux-policy.spec, 1.877, 1.878
- Next message (by thread): rpms/spamassassin/devel .cvsignore, 1.44, 1.45 sources, 1.43, 1.44 spamassassin.spec, 1.113, 1.114
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20416
Modified Files:
.cvsignore libsemanage-rhat.patch libsemanage.spec sources
Log Message:
* Tue Jul 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
- Update to upstream
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- .cvsignore 8 Jun 2009 19:05:18 -0000 1.100
+++ .cvsignore 7 Jul 2009 21:09:14 -0000 1.101
@@ -106,3 +106,4 @@ libsemanage-2.0.29.tgz
libsemanage-2.0.30.tgz
libsemanage-2.0.31.tgz
libsemanage-2.0.32.tgz
+libsemanage-2.0.33.tgz
libsemanage-rhat.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -p -N -r 1.50 -r 1.51 libsemanage-rhat.patch
Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- libsemanage-rhat.patch 8 Jun 2009 19:05:19 -0000 1.50
+++ libsemanage-rhat.patch 7 Jul 2009 21:09:14 -0000 1.51
@@ -1,1195 +1,16 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.31/src/direct_api.c
---- nsalibsemanage/src/direct_api.c 2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.31/src/direct_api.c 2009-06-02 14:54:20.000000000 -0400
-@@ -991,7 +991,7 @@
-
- int retval = -1;
- char *data = NULL;
-- size_t data_len = 0;
-+ ssize_t data_len = 0;
- int compressed = 0;
- int in_fd = -1;
-
-@@ -999,7 +999,7 @@
- return -1;
- }
-
-- if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+ if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
- goto cleanup;
- }
-
-@@ -1117,7 +1117,7 @@
- {
- int retval = -1;
- char *data = NULL;
-- size_t data_len = 0;
-+ ssize_t data_len = 0;
- int compressed = 0;
- int in_fd = -1;
-
-@@ -1125,7 +1125,7 @@
- return -1;
- }
-
-- if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+ if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
- goto cleanup;
- }
-
-@@ -1187,7 +1187,7 @@
- {
- int retval = -1;
- char *data = NULL;
-- size_t data_len = 0;
-+ ssize_t data_len = 0;
- int compressed = 0;
- int in_fd;
-
-@@ -1195,7 +1195,7 @@
- return -1;
- }
-
-- if ((data_len = map_file(in_fd, &data, &compressed)) == 0) {
-+ if ((data_len = map_file(in_fd, &data, &compressed)) <= 0) {
- goto cleanup;
- }
-
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.31/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/genhomedircon.c 2009-06-02 14:54:20.000000000 -0400
-@@ -794,6 +794,12 @@
- * /root */
- continue;
- }
-+ if (strcmp(pwent->pw_dir, "/root") == 0) {
-+ /* don't relabel / genhomdircon checked to see if root
-+ * was the user and if so, set his home directory to
-+ * /root */
-+ continue;
-+ }
- if (push_user_entry(&head, name, seuname,
- prefix, pwent->pw_dir) != STATUS_SUCCESS) {
- *errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/handle.c libsemanage-2.0.31/src/handle.c
---- nsalibsemanage/src/handle.c 2008-11-14 17:10:15.000000000 -0500
-+++ libsemanage-2.0.31/src/handle.c 2009-06-02 14:54:20.000000000 -0400
-@@ -264,7 +264,7 @@
- assert(sh != NULL && sh->funcs != NULL && sh->funcs->commit != NULL);
- if (!sh->is_in_transaction) {
- ERR(sh,
-- "Will not commit because caller does not have a tranaction lock yet.");
-+ "Will not commit because caller does not have a transaction lock yet.");
- return -1;
- }
- retval = sh->funcs->commit(sh);
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.31/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.32/src/semanage.conf
--- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.31/src/semanage.conf 2009-06-02 14:54:20.000000000 -0400
++++ libsemanage-2.0.32/src/semanage.conf 2009-07-01 11:15:30.000000000 -0400
@@ -35,4 +35,4 @@
# given in <sepol/policydb.h>. Change this setting if a different
# version is necessary.
#policy-version = 19
-
+expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-2.0.31/src/semanage.py
---- nsalibsemanage/src/semanage.py 2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.31/src/semanage.py 2009-06-02 14:59:55.000000000 -0400
-@@ -1,12 +1,32 @@
- # This file was automatically generated by SWIG (http://www.swig.org).
--# Version 1.3.35
-+# Version 1.3.39
- #
--# Don't modify this file, modify the SWIG interface instead.
-+# Do not make changes to this file unless you know what you are doing--modify
-+# the SWIG interface file instead.
- # This file is compatible with both classic and new-style classes.
-
--import _semanage
--import new
--new_instancemethod = new.instancemethod
-+from sys import version_info
-+if version_info >= (2,6,0):
-+ def swig_import_helper():
-+ from os.path import dirname
-+ import imp
-+ fp = None
-+ try:
-+ fp, pathname, description = imp.find_module('_semanage', [dirname(__file__)])
-+ except ImportError:
-+ import _semanage
-+ return _semanage
-+ if fp is not None:
-+ try:
-+ _mod = imp.load_module('_semanage', fp, pathname, description)
-+ finally:
-+ fp.close()
-+ return _mod
-+ _semanage = swig_import_helper()
-+ del swig_import_helper
-+else:
-+ import _semanage
-+del version_info
- try:
- _swig_property = property
- except NameError:
-@@ -14,7 +34,7 @@
- def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
- if (name == "thisown"): return self.this.own(value)
- if (name == "this"):
-- if type(value).__name__ == 'PySwigObject':
-+ if type(value).__name__ == 'SwigPyObject':
- self.__dict__[name] = value
- return
- method = class_type.__swig_setmethods__.get(name,None)
-@@ -31,204 +51,715 @@
- if (name == "thisown"): return self.this.own()
- method = class_type.__swig_getmethods__.get(name,None)
- if method: return method(self)
-- raise AttributeError,name
-+ 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
-+ _object = object
- _newclass = 1
- except AttributeError:
- class _object : pass
- _newclass = 0
--del types
-
-
- SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR
- SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN
- SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO
-+
-+def semanage_msg_get_level(*args):
-+ return _semanage.semanage_msg_get_level(*args)
- semanage_msg_get_level = _semanage.semanage_msg_get_level
-+
-+def semanage_msg_get_channel(*args):
-+ return _semanage.semanage_msg_get_channel(*args)
- semanage_msg_get_channel = _semanage.semanage_msg_get_channel
-+
-+def semanage_msg_get_fname(*args):
-+ return _semanage.semanage_msg_get_fname(*args)
- semanage_msg_get_fname = _semanage.semanage_msg_get_fname
-+
-+def semanage_msg_set_callback(*args):
-+ return _semanage.semanage_msg_set_callback(*args)
- semanage_msg_set_callback = _semanage.semanage_msg_set_callback
-+
-+def semanage_handle_create():
-+ return _semanage.semanage_handle_create()
[...5743 lines suppressed...]
- int res3 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
-+ int result;
-
- if (!PyArg_ParseTuple(args,(char *)"OOO:semanage_node_iterate",&obj0,&obj1,&obj2)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_semanage_handle, 0 | 0 );
-@@ -11473,13 +11693,13 @@
- semanage_handle_t *arg1 = (semanage_handle_t *) 0 ;
- semanage_node_t ***arg2 = (semanage_node_t ***) 0 ;
- unsigned int *arg3 = (unsigned int *) 0 ;
-- int result;
- void *argp1 = 0 ;
- int res1 = 0 ;
- semanage_node_t **temp2 = NULL ;
- unsigned int temp3 ;
- int res3 = SWIG_TMPOBJ ;
- PyObject * obj0 = 0 ;
-+ int result;
-
- {
- arg2 = &temp2;
-@@ -11514,6 +11734,7 @@
-
-
- static PyMethodDef SwigMethods[] = {
-+ { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
- { (char *)"semanage_msg_get_level", _wrap_semanage_msg_get_level, METH_VARARGS, NULL},
- { (char *)"semanage_msg_get_channel", _wrap_semanage_msg_get_channel, METH_VARARGS, NULL},
- { (char *)"semanage_msg_get_fname", _wrap_semanage_msg_get_fname, METH_VARARGS, NULL},
-@@ -11794,6 +12015,7 @@
- static swig_type_info _swigt__p_p_semanage_context = {"_p_p_semanage_context", "struct semanage_context **|semanage_context_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_semanage_fcontext = {"_p_p_semanage_fcontext", "struct semanage_fcontext **|semanage_fcontext_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_semanage_fcontext_key = {"_p_p_semanage_fcontext_key", "semanage_fcontext_key_t **|struct semanage_fcontext_key **", 0, 0, (void*)0, 0};
-+static swig_type_info _swigt__p_p_semanage_handle_t = {"_p_p_semanage_handle_t", "struct semanage_handle_t **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_semanage_iface = {"_p_p_semanage_iface", "semanage_iface_t **|struct semanage_iface **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_semanage_iface_key = {"_p_p_semanage_iface_key", "semanage_iface_key_t **|struct semanage_iface_key **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_semanage_module_info = {"_p_p_semanage_module_info", "struct semanage_module_info **|semanage_module_info_t **", 0, 0, (void*)0, 0};
-@@ -11850,6 +12072,7 @@
- &_swigt__p_p_semanage_context,
- &_swigt__p_p_semanage_fcontext,
- &_swigt__p_p_semanage_fcontext_key,
-+ &_swigt__p_p_semanage_handle_t,
- &_swigt__p_p_semanage_iface,
- &_swigt__p_p_semanage_iface_key,
- &_swigt__p_p_semanage_module_info,
-@@ -11906,6 +12129,7 @@
- static swig_cast_info _swigc__p_p_semanage_context[] = { {&_swigt__p_p_semanage_context, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_semanage_fcontext[] = { {&_swigt__p_p_semanage_fcontext, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_semanage_fcontext_key[] = { {&_swigt__p_p_semanage_fcontext_key, 0, 0, 0},{0, 0, 0, 0}};
-+static swig_cast_info _swigc__p_p_semanage_handle_t[] = { {&_swigt__p_p_semanage_handle_t, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_semanage_iface[] = { {&_swigt__p_p_semanage_iface, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_semanage_iface_key[] = { {&_swigt__p_p_semanage_iface_key, 0, 0, 0},{0, 0, 0, 0}};
- static swig_cast_info _swigc__p_p_semanage_module_info[] = { {&_swigt__p_p_semanage_module_info, 0, 0, 0},{0, 0, 0, 0}};
-@@ -11962,6 +12186,7 @@
- _swigc__p_p_semanage_context,
- _swigc__p_p_semanage_fcontext,
- _swigc__p_p_semanage_fcontext_key,
-+ _swigc__p_p_semanage_handle_t,
- _swigc__p_p_semanage_iface,
- _swigc__p_p_semanage_iface_key,
- _swigc__p_p_semanage_module_info,
-@@ -12269,26 +12494,58 @@
-
- SWIGINTERN PyObject *
- swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
-+#if PY_VERSION_HEX >= 0x03000000
-+ return PyUnicode_InternFromString("<Swig global variables>");
-+#else
- return PyString_FromString("<Swig global variables>");
-+#endif
- }
-
- SWIGINTERN PyObject *
- swig_varlink_str(swig_varlinkobject *v) {
-+#if PY_VERSION_HEX >= 0x03000000
-+ PyObject *str = PyUnicode_InternFromString("(");
-+ PyObject *tail;
-+ PyObject *joined;
-+ swig_globalvar *var;
-+ for (var = v->vars; var; var=var->next) {
-+ tail = PyUnicode_FromString(var->name);
-+ joined = PyUnicode_Concat(str, tail);
-+ Py_DecRef(str);
-+ Py_DecRef(tail);
-+ str = joined;
-+ if (var->next) {
-+ tail = PyUnicode_InternFromString(", ");
-+ joined = PyUnicode_Concat(str, tail);
-+ Py_DecRef(str);
-+ Py_DecRef(tail);
-+ str = joined;
-+ }
-+ }
-+ tail = PyUnicode_InternFromString(")");
-+ joined = PyUnicode_Concat(str, tail);
-+ Py_DecRef(str);
-+ Py_DecRef(tail);
-+ str = joined;
-+#else
- PyObject *str = PyString_FromString("(");
-- swig_globalvar *var;
-+ swig_globalvar *var;
- for (var = v->vars; var; var=var->next) {
- PyString_ConcatAndDel(&str,PyString_FromString(var->name));
- if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
- }
- PyString_ConcatAndDel(&str,PyString_FromString(")"));
-+#endif
- return str;
- }
-
- SWIGINTERN int
- swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
-+ char *tmp;
- PyObject *str = swig_varlink_str(v);
- fprintf(fp,"Swig global variables ");
-- fprintf(fp,"%s\n", PyString_AsString(str));
-+ fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str));
-+ SWIG_Python_str_DelForPy3(tmp);
- Py_DECREF(str);
- return 0;
- }
-@@ -12346,8 +12603,13 @@
- if (!type_init) {
- const PyTypeObject tmp
- = {
-+ /* PyObject header changed in Python 3 */
-+#if PY_VERSION_HEX >= 0x03000000
-+ PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+#else
- PyObject_HEAD_INIT(NULL)
- 0, /* Number of items in variable part (ob_size) */
-+#endif
- (char *)"swigvarlink", /* Type name (tp_name) */
- sizeof(swig_varlinkobject), /* Basic size (tp_basicsize) */
- 0, /* Itemsize (tp_itemsize) */
-@@ -12383,7 +12645,10 @@
- #endif
- };
- varlink_type = tmp;
-+ /* for Python 3 we already assigned the ob_type in PyVarObject_HEAD_INIT() */
-+#if PY_VERSION_HEX < 0x03000000
- varlink_type.ob_type = &PyType_Type;
-+#endif
- type_init = 1;
- }
- return &varlink_type;
-@@ -12508,13 +12773,37 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--SWIGEXPORT void SWIG_init(void) {
-- PyObject *m, *d;
-+
-+SWIGEXPORT
-+#if PY_VERSION_HEX >= 0x03000000
-+PyObject*
-+#else
-+void
-+#endif
-+SWIG_init(void) {
-+ PyObject *m, *d;
-+#if PY_VERSION_HEX >= 0x03000000
-+ static struct PyModuleDef SWIG_module = {
-+ PyModuleDef_HEAD_INIT,
-+ (char *) SWIG_name,
-+ NULL,
-+ -1,
-+ SwigMethods,
-+ NULL,
-+ NULL,
-+ NULL,
-+ NULL
-+ };
-+#endif
-
- /* Fix SwigMethods to carry the callback ptrs when needed */
- SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
-
-+#if PY_VERSION_HEX >= 0x03000000
-+ m = PyModule_Create(&SWIG_module);
-+#else
- m = Py_InitModule((char *) SWIG_name, SwigMethods);
-+#endif
- d = PyModule_GetDict(m);
-
- SWIG_InitializeModule(0);
-@@ -12542,5 +12831,10 @@
- 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)));
-+#if PY_VERSION_HEX >= 0x03000000
-+ return m;
-+#else
-+ return;
-+#endif
- }
-
Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- libsemanage.spec 8 Jun 2009 19:05:19 -0000 1.177
+++ libsemanage.spec 7 Jul 2009 21:09:15 -0000 1.178
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.20-1
+%define libsepolver 2.0.37-1
%define libselinuxver 2.0.0-1
Summary: SELinux binary policy manipulation library
Name: libsemanage
-Version: 2.0.32
+Version: 2.0.33
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/python*/site-packages/*
%changelog
+* Tue Jul 7 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.33-1
+- Update to upstream
+
* Mon Jun 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.32-1
- Update to upstream
* Ruby bindings from David Quigley.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- sources 8 Jun 2009 19:05:19 -0000 1.102
+++ sources 7 Jul 2009 21:09:15 -0000 1.103
@@ -1 +1 @@
-4b9e3ec00959d29e972adb42c8edad8e libsemanage-2.0.32.tgz
+9e4c56068457e7ffa60df8d8b8095a8a libsemanage-2.0.33.tgz
- Previous message (by thread): rpms/selinux-policy/devel policy-F12.patch, 1.24, 1.25 selinux-policy.spec, 1.877, 1.878
- Next message (by thread): rpms/spamassassin/devel .cvsignore, 1.44, 1.45 sources, 1.43, 1.44 spamassassin.spec, 1.113, 1.114
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list