diff options
| -rw-r--r-- | ChangeLog | 32 | ||||
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | bus/activation.c | 6 | ||||
| -rw-r--r-- | configure.in | 35 | ||||
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | dbus/dbus-keyring.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-message-factory.c | 4 | ||||
| -rw-r--r-- | gcj/org/freedesktop/dbus/Makefile.am | 6 | ||||
| -rw-r--r-- | glib/Makefile.am | 6 | ||||
| -rw-r--r-- | python/__init__.py | 2 | ||||
| -rw-r--r-- | qt/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
12 files changed, 83 insertions, 35 deletions
@@ -1,3 +1,35 @@ +2005-09-06 John (J5) Palmieri <johnp@redhat.com> + + * Released 0.50 + + * Patch from Steve Grubb: + - bus/activation.c (bus_activation_service_reload_test): clean up + some indentation + - dbus/dbus-keyring.c (_dbus_keyring_reload): fix conditional + - dbus/dbus-message-factory.c (generate_special): fix a couple of + buffer overflows in the test suite. This is non critical because + it can not be exploited and this code is only run when doing a + make check. + + * Patch from Yaakov Selkowitz: Build fixes for Cygwin + - configure.in: Don't check and link against kdecore, only qt headers + - dbus/Makefile.am: Add -no-undefined to libdbus_1_la_LDFLAGS + - gcj/org/freedesktop/dbus/Makefile.am: + add libdbus_gcj_1_la_LDFLAGS = -no-undefined + - glib/Makefile.am: Add -no-undefined to libdbus_glib_1_la_LDFLAGS + and $(DBUS_GLIB_LIBS) to dbus_binding_tool_LDADD + - qt/Makefile.am: Add -no-undefined to libdbus_qt_1_la_LDFLAGS + - tools/Makefile.am: Add platform extentions to binaries + (i.e. .exe on windows) + + * configure.in: + - Make it so if no suitable version of python is found we only + disable building python instead of exiting the configure script + - Require version 2.4 of glib for glib bindings + - Up version to 0.50 + + * python/__init__.py: Sync version with libdbus to (0,50,0) + 2005-09-05 Olivier Andrieu <oliv__a@users.sourceforge.net> * dbus/dbus-object-tree.c (find_subtree_recurse): @@ -1,3 +1,18 @@ +D-BUS 0.50 (06 September 2005) +=== +This is a minor release from 0.36.2. The series number has changed +not because of any technical reasons but as an indication that we +are moving closer to 1.0. It is hoped that this will be the last +series to see major changes, most of which will be isolated to the +GLib and Python bindings, as we transition to concentrate more on +bug busting and code auditing. + +- D-Bus builds on the Cygwin platform +- Makefile cleanups +- Various bug fixes +- Optimization of the dbus object tree +- Memleaks and GIL crasher bugs have been fixed in the Python bindings + D-BUS 0.36.2 (29 August 2005) === - Security: Restrict other users from connecting to another users diff --git a/bus/activation.c b/bus/activation.c index 2faa42b4..43a135fc 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1886,13 +1886,15 @@ bus_activation_service_reload_test (const DBusString *test_data_dir) if (!init_service_reload_test (&directory)) _dbus_assert_not_reached ("could not initiate service reload test"); - if (!do_service_reload_test (&directory, FALSE)); + if (!do_service_reload_test (&directory, FALSE)) + ; /* Do nothing? */ /* Do OOM tests */ if (!init_service_reload_test (&directory)) _dbus_assert_not_reached ("could not initiate service reload test"); - if (!do_service_reload_test (&directory, TRUE)); + if (!do_service_reload_test (&directory, TRUE)) + ; /* Do nothing? */ /* Cleanup test directory */ if (!cleanup_service_reload_test (&directory)) diff --git a/configure.in b/configure.in index d338f686..7215b6b1 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.52) AC_INIT(dbus/dbus.h) -AM_INIT_AUTOMAKE(dbus, 0.37) +AM_INIT_AUTOMAKE(dbus, 0.50) AM_CONFIG_HEADER(config.h) @@ -859,8 +859,8 @@ AC_SUBST(DBUS_TEST_CFLAGS) AC_SUBST(DBUS_TEST_LIBS) # Glib detection -PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0, have_glib=yes, have_glib=no) -PKG_CHECK_MODULES(DBUS_GLIB_THREADS, glib-2.0 gthread-2.0, have_glib_threads=yes, have_glib_threads=no) +PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.4, have_glib=yes, have_glib=no) +PKG_CHECK_MODULES(DBUS_GLIB_THREADS, gthread-2.0 >= 2.4, have_glib_threads=yes, have_glib_threads=no) if test x$have_glib = xno ; then AC_MSG_WARN([GLib development libraries not found]) @@ -940,6 +940,7 @@ else if test -f "$dir/qglobal.h"; then have_qt=yes DBUS_QT_CXXFLAGS="-I$dir" + DBUS_QT_LIBS="-L$QTDIR/lib -lqt-mt" fi done fi @@ -949,18 +950,6 @@ else AC_MSG_RESULT([not found]) fi -dnl linking to kdecore will give us a bit of help from libtool -if (! kde-config >& /dev/null); then - have_qt=no -else - kdelibs=`kde-config --install lib --expandvars 2>/dev/null` - if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then - have_qt=no - else - DBUS_QT_LIBS="$kdelibs/libkdecore.la" - fi -fi - if test x$have_qt = xno ; then AC_MSG_WARN([Qt development libraries not found]) fi @@ -1239,13 +1228,21 @@ AC_SUBST(DBUS_SESSION_SOCKET_DIR) if test x$enable_python = xno; then have_python=no else + have_python_version=2.4 AC_MSG_NOTICE([Checking to see if we can build Python bindings]) have_python=no - AM_PATH_PYTHON(2.4) + AM_PATH_PYTHON() if test -z "$PYTHON" ; then AC_MSG_WARN([Python not found]) else + AC_MSG_CHECKING([whether $PYTHON version >= $have_python_version]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$have_python_version], + [have_python_version="yes"], + [have_python_version="too old"]) + + AC_MSG_RESULT($have_python_version) + AC_CHECK_PROGS(PYREX, pyrexc) if test -z "$PYREX" ; then @@ -1256,16 +1253,16 @@ else AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no) - if test x$have_pyrex = xyes -a x$have_python_headers = xyes ; then + if test x$have_pyrex = xyes -a x$have_python_headers = xyes -a "x$have_python_version" = xyes ; then have_python=yes fi fi if test x$have_python = xno ; then if test x$enable_python = xyes ; then - AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings]) + AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings because either Pyrex, Python headers or a suitable Python version was not found]) else - AC_MSG_WARN([Couldn't find either Pyrex or the Python headers, not building Python bindings]) + AC_MSG_WARN([Couldn't find either Pyrex, the Python headers or a suitable version of Python, not building Python bindings]) fi fi fi diff --git a/dbus/Makefile.am b/dbus/Makefile.am index f4175c79..b6b50d70 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -167,7 +167,7 @@ noinst_LTLIBRARIES=libdbus-convenience.la libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) ## don't export symbols that start with "_" (we use this ## convention for internal symbols) -libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined ## note that TESTS has special meaning (stuff to use in make check) ## so if adding tests not to be run in make check, don't add them to diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index 11f4826c..ede14d9d 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -571,7 +571,7 @@ _dbus_keyring_reload (DBusKeyring *keyring, if (!add_new_key (&keys, &n_keys, error)) { _dbus_verbose ("Failed to generate new key: %s\n", - error ? "(unknown)" : error->message); + error ? error->message : "(unknown)"); goto out; } diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c index 984b69d9..6b194226 100644 --- a/dbus/dbus-message-factory.c +++ b/dbus/dbus-message-factory.c @@ -383,7 +383,7 @@ generate_special (DBusMessageDataIter *iter, _dbus_assert_not_reached ("oom"); i = 0; - while (i <= (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH + 1)) + while (i < (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH + 1)) { long_sig[i] = DBUS_TYPE_ARRAY; ++i; @@ -428,7 +428,7 @@ generate_special (DBusMessageDataIter *iter, long_sig[i] = DBUS_TYPE_INT32; ++i; - while (i <= (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH*2 + 3)) + while (i < (DBUS_MAXIMUM_TYPE_RECURSION_DEPTH*2 + 3)) { long_sig[i] = DBUS_STRUCT_END_CHAR; ++i; diff --git a/gcj/org/freedesktop/dbus/Makefile.am b/gcj/org/freedesktop/dbus/Makefile.am index 8d676284..a6aaf819 100644 --- a/gcj/org/freedesktop/dbus/Makefile.am +++ b/gcj/org/freedesktop/dbus/Makefile.am @@ -32,7 +32,7 @@ java_object_files = $(java_sources:.java=.lo) $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS) -c -o '$@' '$<' .java.lo: - $(LIBTOOL) --mode=compile $(GCJ) $(GCJ_FLAGS) -c -o '$@' '$<' + $(LIBTOOL) --mode=compile $(GCJ) $(INCLUDES) $(GCJ_FLAGS) -c -o '$@' '$<' libdbus_gcj_1_la_SOURCES = @@ -43,6 +43,8 @@ libdbus_gcj_1_la_DEPENDENCIES = \ $(java_class_files) +libdbus_gcj_1_la_LDFLAGS = -no-undefined + libdbus_gcj_1_la_LIBADD = \ $(native_object_files) \ $(java_object_files) @@ -51,5 +53,5 @@ EXTRA_libdbus_gcj_1_la_SOURCES = \ $(native_sources) \ $(java_sources) -libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +libdbus_gcj_1_la_LINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ diff --git a/glib/Makefile.am b/glib/Makefile.am index fd8cba50..6e5c78ee 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -42,10 +42,10 @@ libdbus_glib_HEADERS = \ libdbus_glibdir = $(includedir)/dbus-1.0/dbus -libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la +libdbus_glib_1_la_LIBADD= $(top_builddir)/dbus/libdbus-1.la $(DBUS_GLIB_LIBS) ## don't export symbols that start with "_" (we use this ## convention for internal symbols) -libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined # convenience lib used here and by dbus-viewer noinst_LTLIBRARIES=libdbus-gtool.la @@ -67,7 +67,7 @@ dbus_binding_tool_SOURCES = \ dbus-glib-tool.h \ dbus-glib-tool.c -dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la +dbus_binding_tool_LDADD= libdbus-gtool.la $(DBUS_GLIB_LIBS) -lexpat ## we just rebuilt these manually and check them into cvs; easier than ## convincing automake/make to do this properly diff --git a/python/__init__.py b/python/__init__.py index a1ff407a..4fdc0e9d 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -1,5 +1,5 @@ from _dbus import * from types import * -version = (0, 43, 0) +version = (0, 50, 0) _dbus_main_loop_setup_function = None diff --git a/qt/Makefile.am b/qt/Makefile.am index d4e9cdc8..d375bcf3 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -30,7 +30,7 @@ $(top_srcdir)/qt/server.h: server.moc CLEANFILES=connection.moc integrator.moc server.moc libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la -libdbus_qt_1_la_LDFLAGS= -version-info 1:0 +libdbus_qt_1_la_LDFLAGS= -version-info 1:0 -no-undefined %.moc: %.h $(QT_MOC) $< > $@ diff --git a/tools/Makefile.am b/tools/Makefile.am index 6a37198d..0fdc364d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,7 +6,7 @@ GLIB_TOOLS=dbus-monitor nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h libdbus_glibdir = $(includedir)/dbus-1.0/dbus -dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool +dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT) $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml @@ -22,7 +22,7 @@ GTK_TOOLS= endif if HAVE_GLIB -dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon dbus-launch dbus-send $(top_builddir)/bus/dbus-daemon Makefile +dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml endif @@ -54,7 +54,7 @@ dbus_viewer_SOURCES= \ dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la dbus_launch_LDADD= $(DBUS_X_LIBS) -dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) +dbus_viewer_LDADD= $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS) man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh |