Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2017-07-04 11:54:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Tue Jul 4 11:54:20 2017 rev:147 rq:507223 version:1.10.20 Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2017-06-21 13:51:55.607929496 +0200 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2017-07-04 11:54:22.503306475 +0200 @@ -1,0 +2,18 @@ +Fri Jun 30 02:27:21 UTC 2017 - [email protected] + +- Update to 1.10.20 + * Fixes: + + Fix a reference leak when blocking on a pending call on a + connection that has been disconnected (fdo#101481, Shin-ichi + MORITA) + + Don't put timestamps in the Doxygen-generated documentation, + for closer-to-reproducible builds (fdo#100692, Simon + McVittie) + + Avoid an assertion failure when connecting to a + semicolon-separated series of addresses, one of which fails + (fdo#101257, Simon McVittie) + * Documentation: + + Update git URIs in HACKING document to sync up with + cgit.freedesktop.org (fdo#100715, Simon McVittie) + +------------------------------------------------------------------- dbus-1.changes: same change Old: ---- dbus-1.10.18.tar.gz New: ---- dbus-1.10.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.kSYGcH/_old 2017-07-04 11:54:25.258918680 +0200 +++ /var/tmp/diff_new_pack.kSYGcH/_new 2017-07-04 11:54:25.258918680 +0200 @@ -23,7 +23,7 @@ %endif %bcond_without selinux Name: dbus-1-x11 -Version: 1.10.18 +Version: 1.10.20 Release: 0 Summary: D-Bus Message Bus System License: GPL-2.0+ or AFL-2.1 dbus-1.spec: same change ++++++ dbus-1.10.18.tar.gz -> dbus-1.10.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/Doxyfile.in new/dbus-1.10.20/Doxyfile.in --- old/dbus-1.10.18/Doxyfile.in 2015-09-30 16:48:40.000000000 +0200 +++ new/dbus-1.10.20/Doxyfile.in 2017-06-29 19:47:05.000000000 +0200 @@ -102,6 +102,7 @@ ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 +HTML_TIMESTAMP = NO #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/HACKING new/dbus-1.10.20/HACKING --- old/dbus-1.10.18/HACKING 2015-09-30 16:48:40.000000000 +0200 +++ new/dbus-1.10.20/HACKING 2017-06-08 08:25:34.000000000 +0200 @@ -68,15 +68,15 @@ === D-Bus uses Git as its version control system. The main repository is -hosted at git.freedesktop.org/dbus/dbus. To clone D-Bus, execute the -following command: +hosted on freedesktop.org. To clone D-Bus, execute one of the +following commands: - git clone git://git.freedesktop.org/dbus/dbus -OR - git clone git.freedesktop.org:dbus/dbus + git clone https://anongit.freedesktop.org/git/dbus/dbus.git + git clone git://anongit.freedesktop.org/dbus/dbus + git clone ssh://git.freedesktop.org/git/dbus/dbus -The latter form is the one that allows pushing, but it also requires -an SSH account on the server. The former form allows anonymous +The last form is the one that allows pushing, but it also requires +an SSH account on the server. The other forms allow anonymous checkouts. D-Bus development happens in two branches in parallel: the current diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/Makefile.in new/dbus-1.10.20/Makefile.in --- old/dbus-1.10.18/Makefile.in 2017-04-05 17:25:13.000000000 +0200 +++ new/dbus-1.10.20/Makefile.in 2017-06-29 19:47:46.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -234,7 +234,7 @@ $(top_srcdir)/bus/systemd-user/dbus.service.in \ $(top_srcdir)/bus/systemd-user/dbus.socket.in AUTHORS COPYING \ ChangeLog INSTALL NEWS README build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/config.guess build-aux/config.sub \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -792,7 +792,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -818,7 +818,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -836,7 +836,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -846,7 +846,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/NEWS new/dbus-1.10.20/NEWS --- old/dbus-1.10.18/NEWS 2017-04-05 17:24:03.000000000 +0200 +++ new/dbus-1.10.20/NEWS 2017-06-29 19:47:05.000000000 +0200 @@ -1,3 +1,24 @@ +D-Bus 1.10.20 (2017-06-29) +== + +The “suggesting a delivery gone horribly wrong” release. + +Fixes: + +• Fix a reference leak when blocking on a pending call on a connection + that has been disconnected (fd.o #101481, Shin-ichi MORITA) + +• Don't put timestamps in the Doxygen-generated documentation, for + closer-to-reproducible builds (fd.o #100692, Simon McVittie) + +• Avoid an assertion failure when connecting to a semicolon-separated + series of addresses, one of which fails (fd.o #101257, Simon McVittie) + +Documentation: + +• Update git URIs in HACKING document to sync up with cgit.freedesktop.org + (fd.o #100715, Simon McVittie) + D-Bus 1.10.18 (2017-04-05) == diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/aclocal.m4 new/dbus-1.10.20/aclocal.m4 --- old/dbus-1.10.18/aclocal.m4 2017-04-05 17:25:12.000000000 +0200 +++ new/dbus-1.10.20/aclocal.m4 2017-06-29 19:47:44.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ [am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -605,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -648,7 +648,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +683,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,7 +733,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -772,7 +772,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -801,7 +801,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -848,7 +848,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -881,8 +881,9 @@ [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1083,7 +1084,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1102,7 +1103,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1183,7 +1184,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1243,7 +1244,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1271,7 +1272,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1290,7 +1291,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/build-aux/depcomp new/dbus-1.10.20/build-aux/depcomp --- old/dbus-1.10.18/build-aux/depcomp 2017-01-25 19:15:10.000000000 +0100 +++ new/dbus-1.10.20/build-aux/depcomp 2017-06-24 08:07:50.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/build-aux/tap-driver.sh new/dbus-1.10.20/build-aux/tap-driver.sh --- old/dbus-1.10.18/build-aux/tap-driver.sh 2017-01-25 19:15:10.000000000 +0100 +++ new/dbus-1.10.20/build-aux/tap-driver.sh 2017-06-24 08:07:50.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -646,6 +646,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/build-aux/test-driver new/dbus-1.10.20/build-aux/test-driver --- old/dbus-1.10.18/build-aux/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/dbus-1.10.20/build-aux/test-driver 2017-06-24 08:07:50.000000000 +0200 @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + *) break;; + esac + shift +done + +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/bus/Makefile.in new/dbus-1.10.20/bus/Makefile.in --- old/dbus-1.10.18/bus/Makefile.in 2017-04-05 17:25:14.000000000 +0200 +++ new/dbus-1.10.20/bus/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/configure new/dbus-1.10.20/configure --- old/dbus-1.10.18/configure 2017-04-05 17:25:13.000000000 +0200 +++ new/dbus-1.10.20/configure 2017-06-29 19:47:48.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dbus 1.10.18. +# Generated by GNU Autoconf 2.69 for dbus 1.10.20. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='dbus' PACKAGE_TARNAME='dbus' -PACKAGE_VERSION='1.10.18' -PACKAGE_STRING='dbus 1.10.18' +PACKAGE_VERSION='1.10.20' +PACKAGE_STRING='dbus 1.10.20' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus' PACKAGE_URL='' @@ -1553,7 +1553,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dbus 1.10.18 to adapt to many kinds of systems. +\`configure' configures dbus 1.10.20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1628,7 +1628,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dbus 1.10.18:";; + short | recursive ) echo "Configuration of dbus 1.10.20:";; esac cat <<\_ACEOF @@ -1841,7 +1841,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dbus configure 1.10.18 +dbus configure 1.10.20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2617,7 +2617,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dbus $as_me 1.10.18, which was +It was created by dbus $as_me 1.10.20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3560,7 +3560,7 @@ # Define the identity of the package. PACKAGE='dbus' - VERSION='1.10.18' + VERSION='1.10.20' cat >>confdefs.h <<_ACEOF @@ -3860,7 +3860,7 @@ ## increment any time the source changes; set to ## 0 if you increment CURRENT -LT_REVISION=11 +LT_REVISION=12 ## increment if any interfaces have been added; set to 0 ## if any interfaces have been changed or removed. removal has @@ -3875,8 +3875,8 @@ DBUS_MAJOR_VERSION=1 DBUS_MINOR_VERSION=10 -DBUS_MICRO_VERSION=18 -DBUS_VERSION=1.10.18 +DBUS_MICRO_VERSION=20 +DBUS_VERSION=1.10.20 @@ -18201,7 +18201,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -18474,7 +18474,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -24925,7 +24925,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dbus $as_me 1.10.18, which was +This file was extended by dbus $as_me 1.10.20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24991,7 +24991,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dbus config.status 1.10.18 +dbus config.status 1.10.20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/configure.ac new/dbus-1.10.20/configure.ac --- old/dbus-1.10.18/configure.ac 2017-04-05 17:23:18.000000000 +0200 +++ new/dbus-1.10.20/configure.ac 2017-06-29 19:47:05.000000000 +0200 @@ -3,7 +3,7 @@ m4_define([dbus_major_version], [1]) m4_define([dbus_minor_version], [10]) -m4_define([dbus_micro_version], [18]) +m4_define([dbus_micro_version], [20]) m4_define([dbus_version], [dbus_major_version.dbus_minor_version.dbus_micro_version]) AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus]) @@ -38,7 +38,7 @@ ## increment any time the source changes; set to ## 0 if you increment CURRENT -LT_REVISION=11 +LT_REVISION=12 ## increment if any interfaces have been added; set to 0 ## if any interfaces have been changed or removed. removal has diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/dbus/Makefile.in new/dbus-1.10.20/dbus/Makefile.in --- old/dbus-1.10.18/dbus/Makefile.in 2017-04-05 17:25:14.000000000 +0200 +++ new/dbus-1.10.20/dbus/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/dbus/dbus-connection.c new/dbus-1.10.20/dbus/dbus-connection.c --- old/dbus-1.10.18/dbus/dbus-connection.c 2015-09-30 16:48:40.000000000 +0200 +++ new/dbus-1.10.20/dbus/dbus-connection.c 2017-06-29 19:31:50.000000000 +0200 @@ -2476,6 +2476,8 @@ /* on OOM error_msg is set to NULL */ complete_pending_call_and_unlock (connection, pending, error_msg); + if (error_msg != NULL) + dbus_message_unref (error_msg); dbus_pending_call_unref (pending); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/dbus/dbus-transport.c new/dbus-1.10.20/dbus/dbus-transport.c --- old/dbus-1.10.18/dbus/dbus-transport.c 2015-09-30 16:48:40.000000000 +0200 +++ new/dbus-1.10.20/dbus/dbus-transport.c 2017-06-29 19:47:05.000000000 +0200 @@ -254,13 +254,16 @@ int len, i; _dbus_assert (address != NULL); + _DBUS_ASSERT_ERROR_IS_CLEAR (error); if (!dbus_parse_address (address, &entries, &len, error)) return NULL; /* not a valid address */ for (i = 0; i < len; i++) { + dbus_error_free (error); transport = _dbus_transport_open (entries[i], error); + if (transport != NULL) break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/doc/Makefile.in new/dbus-1.10.20/doc/Makefile.in --- old/dbus-1.10.18/doc/Makefile.in 2017-04-05 17:25:14.000000000 +0200 +++ new/dbus-1.10.20/doc/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -723,8 +723,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@install-data-local: @DBUS_DOXYGEN_DOCS_ENABLED_FALSE@uninstall-local: +@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@install-data-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/test/Makefile.in new/dbus-1.10.20/test/Makefile.in --- old/dbus-1.10.18/test/Makefile.in 2017-04-05 17:25:14.000000000 +0200 +++ new/dbus-1.10.20/test/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/test/name-test/Makefile.am new/dbus-1.10.20/test/name-test/Makefile.am --- old/dbus-1.10.18/test/name-test/Makefile.am 2015-11-23 22:47:51.000000000 +0100 +++ new/dbus-1.10.20/test/name-test/Makefile.am 2017-06-29 19:31:50.000000000 +0200 @@ -31,6 +31,7 @@ TESTS += \ run-test.sh \ run-test-systemserver.sh \ + test-pending-call-disconnected \ $(NULL) endif endif @@ -41,10 +42,11 @@ ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" -noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch +noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-pending-call-disconnected test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-1.la +test_pending_call_disconnected_LDADD=$(top_builddir)/dbus/libdbus-1.la test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la test_ids_LDADD=$(top_builddir)/dbus/libdbus-1.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/test/name-test/Makefile.in new/dbus-1.10.20/test/name-test/Makefile.in --- old/dbus-1.10.18/test/name-test/Makefile.in 2017-04-05 17:25:14.000000000 +0200 +++ new/dbus-1.10.20/test/name-test/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -92,10 +92,12 @@ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@am__append_1 = \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ run-test.sh \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ run-test-systemserver.sh \ +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ test-pending-call-disconnected \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ $(NULL) @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@noinst_PROGRAMS = test-pending-call-dispatch$(EXEEXT) \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@ test-pending-call-timeout$(EXEEXT) \ +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@ test-pending-call-disconnected$(EXEEXT) \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@ test-threads-init$(EXEEXT) \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@ test-ids$(EXEEXT) \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@ test-shutdown$(EXEEXT) \ @@ -132,6 +134,11 @@ test_ids_SOURCES = test-ids.c test_ids_OBJECTS = test-ids.$(OBJEXT) @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_ids_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la +test_pending_call_disconnected_SOURCES = \ + test-pending-call-disconnected.c +test_pending_call_disconnected_OBJECTS = \ + test-pending-call-disconnected.$(OBJEXT) +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_pending_call_disconnected_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la test_pending_call_dispatch_SOURCES = test-pending-call-dispatch.c test_pending_call_dispatch_OBJECTS = \ test-pending-call-dispatch.$(OBJEXT) @@ -189,13 +196,14 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = test-autolaunch.c test-ids.c test-pending-call-dispatch.c \ +SOURCES = test-autolaunch.c test-ids.c \ + test-pending-call-disconnected.c test-pending-call-dispatch.c \ test-pending-call-timeout.c test-privserver.c \ test-privserver-client.c test-shutdown.c test-threads-init.c DIST_SOURCES = test-autolaunch.c test-ids.c \ - test-pending-call-dispatch.c test-pending-call-timeout.c \ - test-privserver.c test-privserver-client.c test-shutdown.c \ - test-threads-init.c + test-pending-call-disconnected.c test-pending-call-dispatch.c \ + test-pending-call-timeout.c test-privserver.c \ + test-privserver-client.c test-shutdown.c test-threads-init.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -406,12 +414,11 @@ AM_RECURSIVE_TARGETS = check recheck @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@am__EXEEXT_1 = \ @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ run-test.sh \ -@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ run-test-systemserver.sh +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ run-test-systemserver.sh \ +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@@DBUS_UNIX_TRUE@ test-pending-call-disconnected$(EXEEXT) TEST_SUITE_LOG = test-suite.log -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@[email protected]=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) -SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) am__set_b = \ case '$@' in \ */*) \ @@ -422,8 +429,13 @@ *) \ b='$*';; \ esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@[email protected]=.log) +TEST_LOGS = $(am__test_logs2:.sh.log=.log) +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/build-aux/depcomp + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADT_LIBS = @ADT_LIBS@ @@ -667,6 +679,7 @@ EXTRA_DIST = run-test.sh run-test-systemserver.sh test-wait-for-echo.py test-activation-forking.py @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_pending_call_dispatch_LDADD = $(top_builddir)/dbus/libdbus-1.la @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_pending_call_timeout_LDADD = $(top_builddir)/dbus/libdbus-1.la +@DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_pending_call_disconnected_LDADD = $(top_builddir)/dbus/libdbus-1.la @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_threads_init_LDADD = $(top_builddir)/dbus/libdbus-1.la @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_ids_LDADD = $(top_builddir)/dbus/libdbus-1.la @DBUS_ENABLE_EMBEDDED_TESTS_TRUE@test_shutdown_LDADD = ../libdbus-testutils.la @@ -724,6 +737,10 @@ @rm -f test-ids$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ids_OBJECTS) $(test_ids_LDADD) $(LIBS) +test-pending-call-disconnected$(EXEEXT): $(test_pending_call_disconnected_OBJECTS) $(test_pending_call_disconnected_DEPENDENCIES) $(EXTRA_test_pending_call_disconnected_DEPENDENCIES) + @rm -f test-pending-call-disconnected$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_pending_call_disconnected_OBJECTS) $(test_pending_call_disconnected_LDADD) $(LIBS) + test-pending-call-dispatch$(EXEEXT): $(test_pending_call_dispatch_OBJECTS) $(test_pending_call_dispatch_DEPENDENCIES) $(EXTRA_test_pending_call_dispatch_DEPENDENCIES) @rm -f test-pending-call-dispatch$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_pending_call_dispatch_OBJECTS) $(test_pending_call_dispatch_LDADD) $(LIBS) @@ -756,6 +773,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-autolaunch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ids.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pending-call-disconnected.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pending-call-dispatch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-pending-call-timeout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-privserver-client.Po@am__quote@ @@ -986,6 +1004,13 @@ am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? +test-pending-call-disconnected.log: test-pending-call-disconnected$(EXEEXT) + @p='test-pending-call-disconnected$(EXEEXT)'; \ + b='test-pending-call-disconnected'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .sh.log: @p='$<'; \ $(am__set_b); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/test/name-test/test-pending-call-disconnected.c new/dbus-1.10.20/test/name-test/test-pending-call-disconnected.c --- old/dbus-1.10.18/test/name-test/test-pending-call-disconnected.c 1970-01-01 01:00:00.000000000 +0100 +++ new/dbus-1.10.20/test/name-test/test-pending-call-disconnected.c 2017-06-29 19:31:50.000000000 +0200 @@ -0,0 +1,117 @@ +/* + * Copyright © 2006 Red Hat Inc. + * Copyright © 2017 Shin-ichi MORITA <[email protected]> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +/** +* Test to make sure that pending calls unref error messages +* when blocked after disconnected. +**/ + +#include <config.h> +#include <dbus/dbus.h> +#include <dbus/dbus-sysdeps.h> +#include <stdio.h> +#include <stdlib.h> + +static size_t count = 0; + +static void +free_data (void *data) +{ + --count; + printf ("# Freed: %s\n", (const char*)data); +} + +/* This test outputs TAP syntax: http://testanything.org/ */ +int +main (int argc, char *argv[]) +{ + dbus_int32_t slot_connection = -1; + dbus_int32_t slot_message = -1; + dbus_int32_t slot_pending = -1; + DBusError error; + DBusConnection *conn; + DBusMessage *method; + DBusPendingCall *pending; + DBusMessage *reply; + + printf ("# Testing pending call error\n"); + + dbus_connection_allocate_data_slot (&slot_connection); + dbus_message_allocate_data_slot (&slot_message); + dbus_pending_call_allocate_data_slot (&slot_pending); + + dbus_error_init (&error); + conn = dbus_bus_get_private (DBUS_BUS_SESSION, &error); + dbus_connection_set_data (conn, slot_connection, (void*)"connection", free_data); + ++count; + dbus_connection_set_exit_on_disconnect (conn, FALSE); + + method = dbus_message_new_method_call ("org.freedesktop.TestSuiteEchoService", + "/org/freedesktop/TestSuite", + "org.freedesktop.TestSuite", + "Exit"); + dbus_message_set_data (method, slot_message, (void*)"method", free_data); + ++count; + + dbus_connection_send_with_reply (conn, method, &pending, -1); + dbus_message_unref (method); + dbus_pending_call_set_data (pending, slot_pending, (void*)"pending", free_data); + ++count; + + dbus_connection_close (conn); + + dbus_pending_call_block (pending); + reply = dbus_pending_call_steal_reply (pending); + dbus_pending_call_unref (pending); + if (reply == NULL) + { + printf ("Bail out! Reply is NULL ***\n"); + exit (1); + } + dbus_message_set_data (reply, slot_message, (void*)"reply", free_data); + ++count; + if (dbus_message_get_type (reply) != DBUS_MESSAGE_TYPE_ERROR) + { + printf ("Bail out! Reply is not error ***\n"); + exit (1); + } + dbus_message_unref (reply); + + dbus_connection_unref (conn); + + dbus_connection_free_data_slot (&slot_connection); + dbus_message_free_data_slot (&slot_message); + dbus_pending_call_free_data_slot (&slot_pending); + + if (count != 0) + { + printf ("not ok # Not all refs were unrefed ***\n"); + exit (1); + } + else + { + printf ("ok\n# Testing completed\n1..1\n"); + exit (0); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.10.18/tools/Makefile.in new/dbus-1.10.20/tools/Makefile.in --- old/dbus-1.10.18/tools/Makefile.in 2017-04-05 17:25:15.000000000 +0200 +++ new/dbus-1.10.20/tools/Makefile.in 2017-06-29 19:47:47.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it,
