Hello community, here is the log from the commit of package python-orbit checked in at Fri Aug 3 22:32:18 CEST 2007. -------- --- GNOME/python-orbit/python-orbit.changes 2006-12-19 16:22:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/python-orbit/python-orbit.changes 2007-08-03 13:29:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 3 13:29:04 CEST 2007 - jmatejek@suse.cz + +- update to 2.14.3 + * fixing a couple of bug discovered by Coverity tests + * compatibility with non-ORBit2 based servants + +------------------------------------------------------------------- Old: ---- pyorbit-2.14.1.tar.bz2 New: ---- pyorbit-2.14.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-orbit.spec ++++++ --- /var/tmp/diff_new_pack.FA7389/_old 2007-08-03 22:30:04.000000000 +0200 +++ /var/tmp/diff_new_pack.FA7389/_new 2007-08-03 22:30:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-orbit (Version 2.14.1) +# spec file for package python-orbit (Version 2.14.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ BuildRequires: gtk2-devel indent libidl-devel orbit2-devel python-devel python-numeric update-desktop-files URL: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/ Summary: Python bindings for ORBit -Version: 2.14.1 -Release: 23 -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Version: 2.14.3 +Release: 1 +License: LGPL v2 or later Group: Development/Libraries/Python Source: %{_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,7 +74,11 @@ %{_includedir}/pyorbit-2 %{_libdir}/pkgconfig/pyorbit-2.pc -%changelog -n python-orbit +%changelog +* Fri Aug 03 2007 - jmatejek@suse.cz +- update to 2.14.3 + * fixing a couple of bug discovered by Coverity tests + * compatibility with non-ORBit2 based servants * Tue Dec 19 2006 - sbrabec@suse.cz - Spec file cleanup. * Fri Oct 20 2006 - jpr@suse.de ++++++ pyorbit-2.14.1.tar.bz2 -> pyorbit-2.14.3.tar.bz2 ++++++ ++++ 12115 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/ChangeLog new/pyorbit-2.14.3/ChangeLog --- old/pyorbit-2.14.1/ChangeLog 2006-06-12 00:53:12.000000000 +0200 +++ new/pyorbit-2.14.3/ChangeLog 2007-05-26 15:17:08.000000000 +0200 @@ -1,3 +1,60 @@ +== PyORBit 2.14.3 == +2007-05-26 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * NEWS: Update. + + * configure.in: Bump version to 2.14.3. + +2007-05-06 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * src/pycorba-object.c (pycorba_object_repr): Get the type_id from + __typecode__ instead of using an ORBit API that only works for + ORBit servers. + Fixes Bug #435891: pycorba_object_repr fails with non-ORBit objects. + +2007-05-06 Peter Parente <parente@cs.unc.edu> + + reviewed by: Gustavo J. A. M. Carneiro + + * src/pycorba-marshal.c (demarshal_value), + * src/pycorba-object.c (pycorba_object_new_with_type), + (pycorba_object_new), + * src/pyorbit-private.h: When unmarshalling a CORBA object, + fallback to the typecoded provided in the IIOP stream when ORBit + introspection fails. + Closes #Bug 435825: Non-ORBit object typecodes ignored when + instantiating stubs. + +2007-03-28 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * m4/python-module.m4: Don't link python modules with libpython on + Darwin. Fixes #422624. + +== PyORBit 2.14.2 == +2007-02-25 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * configure.in: Version 2.14.2. + + * NEWS: Update. + + * configure.in: Make $CC = $PYTHON_CC (for the -pthread flag). + + * m4/python-module.m4: Update the AM_CHECK_PYTHON_HEADERS macro to + the one in gnome-python in order to fix build problems in Gentoo. + Fixes #404943. + +2006-12-14 Kjartan Maraas <kmaraas@gnome.org> + + * autogen.sh: Make it work with automake 1.10 + +2006-07-05 Gustavo J. A. M. Carneiro <gjc@gnome.org> + + * src/pycorba-method.c (pycorba_bound_method_async_call): Fix + coverity error. + + * src/pyorbit-utils.c (_pyorbit_get_container): Idem. + Thanks paolo borelli; Fixes #343597. + == PyORBit 2.14.1 == 2006-06-11 Gustavo J. A. M. Carneiro <gjc@gnome.org> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/configure.in new/pyorbit-2.14.3/configure.in --- old/pyorbit-2.14.1/configure.in 2006-06-12 00:52:53.000000000 +0200 +++ new/pyorbit-2.14.3/configure.in 2007-05-26 15:15:05.000000000 +0200 @@ -3,7 +3,7 @@ m4_define(pyorbit_major_version, 2) m4_define(pyorbit_minor_version, 14) -m4_define(pyorbit_micro_version, 1) +m4_define(pyorbit_micro_version, 3) m4_define(pyorbit_version, pyorbit_major_version.pyorbit_minor_version.pyorbit_micro_version) m4_define(orbit2_required_version, 2.12) @@ -36,6 +36,7 @@ AM_PATH_PYTHON([2.4]) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) +CC="$PYTHON_CC" PKG_CHECK_MODULES([PYORBIT], [ORBit-2.0 >= orbit2_required_version]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/examples/echo/echo-client.py new/pyorbit-2.14.3/examples/echo/echo-client.py --- old/pyorbit-2.14.1/examples/echo/echo-client.py 2005-12-11 01:48:19.000000000 +0100 +++ new/pyorbit-2.14.3/examples/echo/echo-client.py 2007-05-06 13:28:36.000000000 +0200 @@ -18,6 +18,7 @@ ior = file('iorfile').read() echo = orb.string_to_object(ior)#._narrow(Test.Echo) # _narrow not needed with ORBit2 servers +print repr(echo) if sys.argv[1] == 'quit': echo.quit() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/m4/python-module.m4 new/pyorbit-2.14.3/m4/python-module.m4 --- old/pyorbit-2.14.1/m4/python-module.m4 2006-05-01 13:52:47.000000000 +0200 +++ new/pyorbit-2.14.3/m4/python-module.m4 2007-03-28 18:33:31.000000000 +0200 @@ -36,6 +36,7 @@ fi ]) + dnl a macro to check for ability to create python extensions dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) dnl function also defines PYTHON_INCLUDES @@ -44,7 +45,9 @@ AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_EMBED_LIBS) AC_SUBST(PYTHON_LDFLAGS) +AC_SUBST(PYTHON_CC) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES @@ -60,29 +63,56 @@ AC_TRY_CPP([#include <Python.h>],dnl [AC_MSG_RESULT(found) -AC_MSG_CHECKING(for libraries required to compile python extensions) +AC_MSG_CHECKING(for python libraries) + dnl Check whether python was compiled as shared library +link_pymodules_libpython=false; if egrep "^#define Py_ENABLE_SHARED" "${py_exec_prefix}/include/python${PYTHON_VERSION}/pyconfig.h" > /dev/null ; then - PYTHON_LDFLAGS="-no-undefined" - save_LIBS="$LIBS" + if test x`uname -s` != xDarwin; then + PYTHON_LDFLAGS="-no-undefined" + link_pymodules_libpython=true; + fi +fi - PYTHON_LIBS="-L${py_prefix}/lib/ -lpython${PYTHON_VERSION}" - LIBS="$LIBS $PYTHON_LIBS" - AC_TRY_LINK_FUNC(Py_Initialize, dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT([$PYTHON_LIBS]); $1], dnl +dnl use distutils to get some python configuration variables.. +PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"` +PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS')"` +PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"` +PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"` + +save_CC="$CC" +save_LIBS="$LIBS" + +PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" + +CC="$PYTHON_CC" +LIBS="$LIBS $PYTHON_EMBED_LIBS" +AC_TRY_LINK_FUNC(Py_Initialize, dnl + [ + LIBS="$save_LIBS"; + if $link_pymodules_libpython; then + PYTHON_LIBS="$PYTHON_EMBED_LIBS"; + fi + AC_MSG_RESULT([$PYTHON_EMBED_LIBS]); + $1], dnl [ - PYTHON_LIBS="-L${py_prefix}/lib/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}" - LIBS="$save_LIBS $PYTHON_LIBS"; + + PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}" + + LIBS="$save_LIBS $PYTHON_EMBED_LIBS"; AC_TRY_LINK_FUNC(Py_Initialize, dnl - [LIBS="$save_LIBS"; AC_MSG_RESULT([$PYTHON_LIBS]); $1], dnl + [ + LIBS="$save_LIBS"; + if $link_pymodules_libpython; then + PYTHON_LIBS="$PYTHON_EMBED_LIBS"; + fi + AC_MSG_RESULT([$PYTHON_EMBED_LIBS]); + $1], dnl AC_MSG_RESULT(not found); $2) ]) +CC="$save_CC" -else - AC_MSG_RESULT(none needed) - $1 -fi $1],dnl [AC_MSG_RESULT(not found) $2]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/NEWS new/pyorbit-2.14.3/NEWS --- old/pyorbit-2.14.1/NEWS 2006-06-12 00:52:27.000000000 +0200 +++ new/pyorbit-2.14.3/NEWS 2007-05-26 15:16:46.000000000 +0200 @@ -1,4 +1,12 @@ -pyorbit-2.14.1: 11-Jnue-2006 +pyorbit-2.14.3: 26-May-2007 + - Fix build problem on Mac OS X + - Fix compatibility with non-ORBit2 based servants + +pyorbit-2.14.2: 15-February-2007 + - Fix build problem on gentoo + - Fix a couple of bugs uncovered by Coverity + +pyorbit-2.14.1: 11-June-2006 - Fix build problem on cygwin - Fix segmentation fault on orb.shutdown() - Make it work on Python 2.5 and 64-bit platforms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/PKG-INFO new/pyorbit-2.14.3/PKG-INFO --- old/pyorbit-2.14.1/PKG-INFO 2006-06-12 00:53:49.000000000 +0200 +++ new/pyorbit-2.14.3/PKG-INFO 2007-05-26 15:17:28.000000000 +0200 @@ -1,12 +1,12 @@ Metadata-Version: 1.0 Name: PyORBit -Version: 2.14.1 +Version: 2.14.3 Summary: Python bindings for the ORBit2 CORBA ORB Home-page: http://www.daa.com.au/~james/software/pygtk/ Author: James Henstridge Author-email: james@daa.com.au License: GNU LGPL -Download-url: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/pyorbit-2.14.1.tar.gz +Download-url: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.0/pyorbit-2.14.3.tar.gz Description: PyORBit is a binding for the ORBit2 CORBA ORB. It aims to be compatible with the Python language mapping standard (http://www.omg.org/cgi-bin/doc?formal/02-09-07), implementing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/pyorbit.spec new/pyorbit-2.14.3/pyorbit.spec --- old/pyorbit-2.14.1/pyorbit.spec 2006-06-12 00:53:49.000000000 +0200 +++ new/pyorbit-2.14.3/pyorbit.spec 2007-05-26 15:17:28.000000000 +0200 @@ -3,7 +3,7 @@ Summary: Python bindings for ORBit2. Name: pyorbit -Version: 2.14.1 +Version: 2.14.3 Release: 1 Copyright: LGPL Group: Development/Languages diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/src/pycorba-marshal.c new/pyorbit-2.14.3/src/pycorba-marshal.c --- old/pyorbit-2.14.1/src/pycorba-marshal.c 2006-05-20 18:01:59.000000000 +0200 +++ new/pyorbit-2.14.3/src/pycorba-marshal.c 2007-05-06 13:06:22.000000000 +0200 @@ -448,7 +448,7 @@ break; case CORBA_tk_objref: alignval(val, ORBIT_ALIGNOF_CORBA_POINTER); - ret = pycorba_object_new(getval(val, CORBA_Object)); + ret = pycorba_object_new_with_type(getval(val, CORBA_Object), tc); advanceptr(val, sizeof(CORBA_Object)); break; case CORBA_tk_struct: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/src/pycorba-method.c new/pyorbit-2.14.3/src/pycorba-method.c --- old/pyorbit-2.14.1/src/pycorba-method.c 2006-05-20 18:01:59.000000000 +0200 +++ new/pyorbit-2.14.3/src/pycorba-method.c 2007-01-03 23:51:18.000000000 +0100 @@ -616,8 +616,10 @@ Py_INCREF(self->meth_self); PyList_SET_ITEM(selfarg, 0, self->meth_self); tmp = PySequence_Concat(selfarg, py_args); - if (!tmp) + if (!tmp) { PyErr_Print(); + goto error; + } Py_DECREF(selfarg); args = PySequence_Tuple(tmp); Py_DECREF(tmp); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/src/pycorba-object.c new/pyorbit-2.14.3/src/pycorba-object.c --- old/pyorbit-2.14.1/src/pycorba-object.c 2006-05-20 17:46:50.000000000 +0200 +++ new/pyorbit-2.14.3/src/pycorba-object.c 2007-05-06 13:36:53.000000000 +0200 @@ -57,20 +57,20 @@ static PyObject * pycorba_object_repr(PyCORBA_Object *self) { - CORBA_Environment ev; CORBA_char *repo_id; PyObject *ret; - - /* try and get the objref */ - CORBA_exception_init(&ev); - repo_id = ORBit_small_get_type_id(self->objref, &ev); - if (ev._major != CORBA_NO_EXCEPTION) - repo_id = NULL; - CORBA_exception_free(&ev); + PyCORBA_TypeCode *pytc; + pytc = (PyCORBA_TypeCode *) PyObject_GetAttrString((PyObject *)self, "__typecode__"); + if (!pytc || !PyObject_IsInstance((PyObject *) pytc, (PyObject *) &PyCORBA_TypeCode_Type)) { + PyErr_SetString(PyExc_TypeError, "__typecode__ of object is missing or of wrong type"); + Py_XDECREF(pytc); + return NULL; + } + repo_id = pytc->tc->repo_id ? pytc->tc->repo_id : "(null)"; + Py_DECREF(pytc); ret = PyString_FromFormat("<CORBA.Object '%s' at %p>", repo_id ? repo_id : "(null)", self->objref); - if (repo_id) CORBA_free(repo_id); return ret; } @@ -317,7 +317,7 @@ }; PyObject * -pycorba_object_new(CORBA_Object objref) +pycorba_object_new_with_type(CORBA_Object objref, CORBA_TypeCode tc) { PyTypeObject *stub = NULL; PyCORBA_Object *self; @@ -327,7 +327,12 @@ Py_INCREF(Py_None); return Py_None; } + // get stub for ORBit object stub = (PyTypeObject *)pyorbit_get_stub_from_objref(objref); + if (!stub && tc != TC_null) { + // get stub from typecode + stub = (PyTypeObject *)pyorbit_get_stub(tc); + } if (!stub) stub = &PyCORBA_Object_Type; /* fall back */ args = PyTuple_New(0); @@ -341,3 +346,8 @@ return (PyObject *)self; } +PyObject * +pycorba_object_new(CORBA_Object objref) +{ + return pycorba_object_new_with_type(objref, TC_null); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/src/pyorbit-private.h new/pyorbit-2.14.3/src/pyorbit-private.h --- old/pyorbit-2.14.1/src/pyorbit-private.h 2006-06-04 14:49:02.000000000 +0200 +++ new/pyorbit-2.14.3/src/pyorbit-private.h 2007-05-06 13:02:50.000000000 +0200 @@ -43,6 +43,7 @@ extern PyTypeObject PyCORBA_Any_Type; PyObject *pycorba_object_new(CORBA_Object objref); +PyObject *pycorba_object_new_with_type(CORBA_Object objref, CORBA_TypeCode tc); PyObject *pycorba_orb_new(CORBA_ORB orb); PyObject *pycorba_typecode_new(CORBA_TypeCode tc); PyObject *pycorba_any_new(CORBA_any *any); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pyorbit-2.14.1/src/pyorbit-utils.c new/pyorbit-2.14.3/src/pyorbit-utils.c --- old/pyorbit-2.14.1/src/pyorbit-utils.c 2004-03-30 15:32:47.000000000 +0200 +++ new/pyorbit-2.14.3/src/pyorbit-utils.c 2007-01-03 23:51:18.000000000 +0100 @@ -159,8 +159,8 @@ parent = Py_InitModule("_GlobalIDL", fake_module_methods); if (!parent) { g_warning("could not create _GlobalIDL module"); - } - Py_INCREF(parent); /* you don't own the return of Py_InitModule */ + } else + Py_INCREF(parent); /* you don't own the return of Py_InitModule */ } } return parent; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org