Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xdg-dbus-proxy for openSUSE:Factory checked in at 2022-07-21 11:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-dbus-proxy (Old) and /work/SRC/openSUSE:Factory/.xdg-dbus-proxy.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-dbus-proxy" Thu Jul 21 11:32:40 2022 rev:4 rq:990255 version:0.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-dbus-proxy/xdg-dbus-proxy.changes 2022-02-14 22:36:01.669391277 +0100 +++ /work/SRC/openSUSE:Factory/.xdg-dbus-proxy.new.1523/xdg-dbus-proxy.changes 2022-07-21 11:32:54.910923374 +0200 @@ -1,0 +2,19 @@ +Fri Jul 15 16:58:26 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 0.1.4: + + Add a Meson build system, with support for being used as a + subproject. The original Autotools build system remains + available for now, but might be removed in future. + + Fix movement through multiline auth messages. + + Fix an unintended fallthrough if the message bus replies to + Hello() with a non-REPLY such as an ERROR. + + Fix compiler warnings. + + Update AX_CODE_COVERAGE from autoconf-archive. + + Bundle a copy of AX_CHECK_GNU_MAKE from autoconf-archive, + required by AX_CODE_COVERAGE. +- Switch to meson buildsystem, add meson BuildRequires and replace + autotools macros with meson ones. +- Add dbus-1-daemon BuildRequires and check section: Run meson_test + macro during build. + +------------------------------------------------------------------- Old: ---- xdg-dbus-proxy-0.1.3.tar.xz New: ---- xdg-dbus-proxy-0.1.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-dbus-proxy.spec ++++++ --- /var/tmp/diff_new_pack.tIp9zn/_old 2022-07-21 11:32:55.494923875 +0200 +++ /var/tmp/diff_new_pack.tIp9zn/_new 2022-07-21 11:32:55.498923880 +0200 @@ -18,7 +18,7 @@ Name: xdg-dbus-proxy -Version: 0.1.3 +Version: 0.1.4 Release: 0 Summary: Filtering proxy for D-Bus connections License: LGPL-2.1-or-later @@ -26,8 +26,10 @@ URL: https://github.com/flatpak/xdg-dbus-proxy Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz +BuildRequires: dbus-1-daemon BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt-tools +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) @@ -42,12 +44,15 @@ %autosetup -p1 %build -%configure \ +%meson \ %{nil} -%make_build +%meson_build %install -%make_install +%meson_install + +%check +%meson_test %files %license COPYING ++++++ xdg-dbus-proxy-0.1.3.tar.xz -> xdg-dbus-proxy-0.1.4.tar.xz ++++++ ++++ 10334 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/xdg-dbus-proxy-0.1.3/Makefile.am new/xdg-dbus-proxy-0.1.4/Makefile.am --- old/xdg-dbus-proxy-0.1.3/Makefile.am 2019-09-18 18:48:16.000000000 +0200 +++ new/xdg-dbus-proxy-0.1.4/Makefile.am 2022-04-23 18:47:31.000000000 +0200 @@ -27,6 +27,8 @@ EXTRA_DIST += build-aux/glib-tap.mk EXTRA_DIST += build-aux/tap-test +EXTRA_DIST += meson.build +EXTRA_DIST += meson_options.txt # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE include $(top_srcdir)/aminclude_static.am 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/xdg-dbus-proxy-0.1.3/NEWS new/xdg-dbus-proxy-0.1.4/NEWS --- old/xdg-dbus-proxy-0.1.3/NEWS 2022-02-11 12:53:37.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/NEWS 2022-05-11 11:12:03.000000000 +0200 @@ -1,8 +1,27 @@ +Changes in 0.1.4 +================ + +Released 2022-05-11 + + * Add a Meson build system, with support for being used as a subproject. + The original Autotools build system remains available for now, but + might be removed in future. + * Fix movement through multiline auth messages + * Fix an unintended fallthrough if the message bus replies to Hello() + with a non-REPLY such as an ERROR + * Fix compiler warnings + * Update AX_CODE_COVERAGE from autoconf-archive + * Bundle a copy of AX_CHECK_GNU_MAKE from autoconf-archive, required + by AX_CODE_COVERAGE + Changes in 0.1.3 ================ +Released 2022-02-11 + * Silence compiler warnings * Fix build with musl + * Fix UTF-8 characters being converted to ? when printing messages Changes in 0.1.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/xdg-dbus-proxy-0.1.3/README.md new/xdg-dbus-proxy-0.1.4/README.md --- old/xdg-dbus-proxy-0.1.3/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/README.md 2018-12-11 19:03:40.000000000 +0100 @@ -0,0 +1,6 @@ +xdg-dbus-proxy +============== + +xdg-dbus-proxy is a filtering proxy for D-Bus connections. It was originally +part of the flatpak project, but it has been broken out as a standalone module +to facilitate using it in other contexts. 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/xdg-dbus-proxy-0.1.3/aminclude_static.am new/xdg-dbus-proxy-0.1.4/aminclude_static.am --- old/xdg-dbus-proxy-0.1.3/aminclude_static.am 2022-02-11 12:54:13.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/aminclude_static.am 2022-05-11 11:15:06.000000000 +0200 @@ -1,6 +1,6 @@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Fri Feb 11 12:54:13 CET 2022 +# from AX_AM_MACROS_STATIC on Wed May 11 10:15:06 BST 2022 # Code coverage @@ -60,7 +60,7 @@ CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) CODE_COVERAGE_IGNORE_PATTERN ?= -GITIGNOREFILES = $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) +GITIGNOREFILES := $(GITIGNOREFILES) $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) code_coverage_v_lcov_cap_0 = @echo " LCOV --capture" $(CODE_COVERAGE_OUTPUT_FILE); @@ -97,7 +97,7 @@ code-coverage-dist-clean: -AM_DISTCHECK_CONFIGURE_FLAGS = $(AM_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage +AM_DISTCHECK_CONFIGURE_FLAGS := $(AM_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage else # ifneq ($(abs_builddir), $(abs_top_builddir)) check-code-coverage: 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/xdg-dbus-proxy-0.1.3/build-aux/compile new/xdg-dbus-proxy-0.1.4/build-aux/compile --- old/xdg-dbus-proxy-0.1.3/build-aux/compile 2022-02-11 11:33:55.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/build-aux/compile 2022-05-11 11:15:06.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify 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/xdg-dbus-proxy-0.1.3/build-aux/missing new/xdg-dbus-proxy-0.1.4/build-aux/missing --- old/xdg-dbus-proxy-0.1.3/build-aux/missing 2022-02-11 11:33:55.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/build-aux/missing 2022-05-11 11:15:06.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify 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/xdg-dbus-proxy-0.1.3/build-aux/tap-driver.sh new/xdg-dbus-proxy-0.1.4/build-aux/tap-driver.sh --- old/xdg-dbus-proxy-0.1.3/build-aux/tap-driver.sh 2022-02-11 11:33:55.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/build-aux/tap-driver.sh 2022-05-11 11:15:06.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -369,7 +369,7 @@ sub("^(not )?ok[ \t]*", "", line) # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. + # automatically assign the next test number to it. if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) { match(line, "^[0-9]+") 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/xdg-dbus-proxy-0.1.3/build-aux/test-driver new/xdg-dbus-proxy-0.1.4/build-aux/test-driver --- old/xdg-dbus-proxy-0.1.3/build-aux/test-driver 2022-02-11 11:33:55.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/build-aux/test-driver 2022-05-11 11:15:06.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -42,11 +42,13 @@ { 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-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. +See the GNU Automake documentation for information. END } @@ -103,8 +105,11 @@ trap "st=141; $do_exit" 13 trap "st=143; $do_exit" 15 -# Test script is run here. -"$@" >$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ # 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 +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" 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/xdg-dbus-proxy-0.1.3/compile new/xdg-dbus-proxy-0.1.4/compile --- old/xdg-dbus-proxy-0.1.3/compile 2018-09-13 09:02:05.000000000 +0200 +++ new/xdg-dbus-proxy-0.1.4/compile 1970-01-01 01:00:00.000000000 +0100 @@ -1,348 +0,0 @@ -#!/bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2016-01-11.22; # UTC - -# Copyright (C) 1999-2017 Free Software Foundation, Inc. -# Written by Tom Tromey <tro...@cygnus.com>. -# -# 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 <bug-autom...@gnu.org> or send patches to -# <automake-patc...@gnu.org>. - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to <bug-autom...@gnu.org>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# 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: "UTC0" -# time-stamp-end: "; # UTC" -# End: 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/xdg-dbus-proxy-0.1.3/config.h.in new/xdg-dbus-proxy-0.1.4/config.h.in --- old/xdg-dbus-proxy-0.1.3/config.h.in 2022-02-11 12:54:15.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/config.h.in 2022-05-11 11:15:06.000000000 +0200 @@ -3,12 +3,15 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -27,6 +30,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -45,48 +51,101 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE 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/xdg-dbus-proxy-0.1.3/configure.ac new/xdg-dbus-proxy-0.1.4/configure.ac --- old/xdg-dbus-proxy-0.1.3/configure.ac 2022-02-11 12:52:33.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/configure.ac 2022-05-11 11:12:57.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) -AC_INIT([xdg-dbus-proxy],[0.1.3]) +AC_INIT([xdg-dbus-proxy],[0.1.4]) AC_CONFIG_AUX_DIR([build-aux]) m4_pattern_forbid([^AX_CODE_COVERAGE$], 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/xdg-dbus-proxy-0.1.3/dbus-proxy.c new/xdg-dbus-proxy-0.1.4/dbus-proxy.c --- old/xdg-dbus-proxy-0.1.3/dbus-proxy.c 2022-02-11 12:52:24.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/dbus-proxy.c 2022-04-23 18:50:29.000000000 +0200 @@ -158,7 +158,7 @@ static gboolean -parse_generic_args (GPtrArray *args, int *args_i) +parse_generic_args (GPtrArray *args, guint *args_i) { const char *arg = g_ptr_array_index (args, *args_i); @@ -226,7 +226,7 @@ } static gboolean -start_proxy (GPtrArray *args, int *args_i) +start_proxy (GPtrArray *args, guint *args_i) { g_autoptr(FlatpakProxy) proxy = NULL; g_autoptr(GError) error = NULL; @@ -374,7 +374,8 @@ { g_autoptr(GPtrArray) args = NULL; GMainLoop *service_loop; - int i, args_i; + int i; + guint args_i; setlocale (LC_ALL, ""); 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/xdg-dbus-proxy-0.1.3/flatpak-proxy.c new/xdg-dbus-proxy-0.1.4/flatpak-proxy.c --- old/xdg-dbus-proxy-0.1.3/flatpak-proxy.c 2022-02-11 11:44:23.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/flatpak-proxy.c 2022-04-23 18:50:29.000000000 +0200 @@ -29,6 +29,10 @@ #include <gio/gunixconnection.h> #include <gio/gunixfdmessage.h> +#if !GLIB_CHECK_VERSION(2, 58, 0) +# define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f)) +#endif + /** * The proxy listens to a unix domain socket, and for each new * connection it opens up a new connection to a specified dbus bus @@ -827,7 +831,7 @@ Buffer *buffer, GSocket *socket) { - gssize res; + gsize received; GInputVector v; GError *error = NULL; GSocketControlMessage **messages; @@ -838,14 +842,15 @@ gsize extra_size; const guchar *extra_bytes = g_bytes_get_data (side->extra_input_data, &extra_size); - res = MIN (extra_size, buffer->size - buffer->pos); - memcpy (&buffer->data[buffer->pos], extra_bytes, res); + g_assert (buffer->size >= buffer->pos); + received = MIN (extra_size, buffer->size - buffer->pos); + memcpy (&buffer->data[buffer->pos], extra_bytes, received); - if (res < extra_size) + if (received < extra_size) { side->extra_input_data = - g_bytes_new_with_free_func (extra_bytes + res, - extra_size - res, + g_bytes_new_with_free_func (extra_bytes + received, + extra_size - received, (GDestroyNotify) g_bytes_unref, side->extra_input_data); } @@ -856,6 +861,7 @@ } else { + gssize res; int flags = 0; v.buffer = &buffer->data[buffer->pos]; v.size = buffer->size - buffer->pos; @@ -882,13 +888,16 @@ return FALSE; } + /* We now know res is strictly positive */ + received = (gsize) res; + for (i = 0; i < num_messages; i++) buffer->control_messages = g_list_append (buffer->control_messages, messages[i]); g_free (messages); } - buffer->pos += res; + buffer->pos += received; return TRUE; } @@ -1041,7 +1050,7 @@ socket = g_socket_connection_get_socket (side->connection); side->out_source = g_socket_create_source (socket, G_IO_OUT, NULL); - g_source_set_callback (side->out_source, (GSourceFunc) side_out_cb, side, NULL); + g_source_set_callback (side->out_source, G_SOURCE_FUNC (side_out_cb), side, NULL); g_source_attach (side->out_source, NULL); g_source_unref (side->out_source); } @@ -1776,6 +1785,13 @@ case HANDLE_VALIDATE_SEE: return FLATPAK_POLICY_SEE; + case HANDLE_DENY: + case HANDLE_FILTER_GET_OWNER_REPLY: + case HANDLE_FILTER_HAS_OWNER_REPLY: + case HANDLE_FILTER_NAME_LIST_REPLY: + case HANDLE_HIDE: + case HANDLE_PASS: + case HANDLE_VALIDATE_MATCH: default: return FLATPAK_POLICY_NONE; } @@ -2340,17 +2356,15 @@ { expected_reply = steal_expected_reply (get_other_side (side), header->reply_serial); - /* We only allow replies we expect */ - if (expected_reply == EXPECTED_REPLY_NONE) + switch (expected_reply) { + case EXPECTED_REPLY_NONE: + /* We only allow replies we expect */ if (client->proxy->log_messages) g_print ("*Unexpected reply*\n"); buffer_unref (buffer); return; - } - switch (expected_reply) - { case EXPECTED_REPLY_HELLO: /* When we get the initial reply to Hello, allow all further communications to our own unique id. */ @@ -2358,8 +2372,10 @@ { g_autofree char *my_id = get_arg0_string (buffer); flatpak_proxy_client_update_unique_id_policy (client, my_id, FLATPAK_POLICY_TALK); - break; } + /* ... else it's an ERROR or something. Either way, pass it + * through to the client unedited. */ + break; case EXPECTED_REPLY_REWRITE: /* Replace a roundtrip ping with the rewritten message */ @@ -2574,7 +2590,7 @@ AUTH_LINE_SENTINEL, strlen (AUTH_LINE_SENTINEL)); if (line_end) /* Found end of line */ { - offset = (line_end + strlen (AUTH_LINE_SENTINEL) - line_start); + offset = (line_end + strlen (AUTH_LINE_SENTINEL) - client->auth_buffer->data); if (!auth_line_is_valid (line_start, line_end)) return FIND_AUTH_END_ABORT; @@ -2718,7 +2734,7 @@ socket = g_socket_connection_get_socket (side->connection); side->in_source = g_socket_create_source (socket, G_IO_IN, NULL); - g_source_set_callback (side->in_source, (GSourceFunc) side_in_cb, side, NULL); + g_source_set_callback (side->in_source, G_SOURCE_FUNC (side_in_cb), side, NULL); g_source_attach (side->in_source, NULL); g_source_unref (side->in_source); } 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/xdg-dbus-proxy-0.1.3/m4/ax_check_gnu_make.m4 new/xdg-dbus-proxy-0.1.4/m4/ax_check_gnu_make.m4 --- old/xdg-dbus-proxy-0.1.3/m4/ax_check_gnu_make.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/m4/ax_check_gnu_make.m4 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1,95 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_gnu_make.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GNU_MAKE([run-if-true],[run-if-false]) +# +# DESCRIPTION +# +# This macro searches for a GNU version of make. If a match is found: +# +# * The makefile variable `ifGNUmake' is set to the empty string, otherwise +# it is set to "#". This is useful for including a special features in a +# Makefile, which cannot be handled by other versions of make. +# * The makefile variable `ifnGNUmake' is set to #, otherwise +# it is set to the empty string. This is useful for including a special +# features in a Makefile, which can be handled +# by other versions of make or to specify else like clause. +# * The variable `_cv_gnu_make_command` is set to the command to invoke +# GNU make if it exists, the empty string otherwise. +# * The variable `ax_cv_gnu_make_command` is set to the command to invoke +# GNU make by copying `_cv_gnu_make_command`, otherwise it is unset. +# * If GNU Make is found, its version is extracted from the output of +# `make --version` as the last field of a record of space-separated +# columns and saved into the variable `ax_check_gnu_make_version`. +# * Additionally if GNU Make is found, run shell code run-if-true +# else run shell code run-if-false. +# +# Here is an example of its use: +# +# Makefile.in might contain: +# +# # A failsafe way of putting a dependency rule into a makefile +# $(DEPEND): +# $(CC) -MM $(srcdir)/*.c > $(DEPEND) +# +# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) +# @ifGNUmake@ include $(DEPEND) +# @ifGNUmake@ else +# fallback code +# @ifGNUmake@ endif +# +# Then configure.in would normally contain: +# +# AX_CHECK_GNU_MAKE() +# AC_OUTPUT(Makefile) +# +# Then perhaps to cause gnu make to override any other make, we could do +# something like this (note that GNU make always looks for GNUmakefile +# first): +# +# if ! test x$_cv_gnu_make_command = x ; then +# mv Makefile GNUmakefile +# echo .DEFAULT: > Makefile ; +# echo \ $_cv_gnu_make_command \$@ >> Makefile; +# fi +# +# Then, if any (well almost any) other make is called, and GNU make also +# exists, then the other make wraps the GNU make. +# +# LICENSE +# +# Copyright (c) 2008 John Darrington <j.darring...@elvis.murdoch.edu.au> +# Copyright (c) 2015 Enrico M. Crisostomo <enrico.m.crisost...@gmail.com> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_CHECK_GNU_MAKE],dnl + [AC_PROG_AWK + AC_CACHE_CHECK([for GNU make],[_cv_gnu_make_command],[dnl + _cv_gnu_make_command="" ; +dnl Search all the common names for GNU make + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if "$a" --version 2> /dev/null | grep GNU 2>&1 > /dev/null ; then + _cv_gnu_make_command=$a ; + AX_CHECK_GNU_MAKE_HEADLINE=$("$a" --version 2> /dev/null | grep "GNU Make") + ax_check_gnu_make_version=$(echo ${AX_CHECK_GNU_MAKE_HEADLINE} | ${AWK} -F " " '{ print $(NF); }') + break ; + fi + done ;]) +dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_VAR_SET([ifGNUmake], ["#"])], [AS_VAR_SET([ifGNUmake], [""])]) + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_VAR_SET([ifnGNUmake], [""])], [AS_VAR_SET([ifnGNUmake], ["#"])]) + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_UNSET(ax_cv_gnu_make_command)], [AS_VAR_SET([ax_cv_gnu_make_command], [${_cv_gnu_make_command}])]) + AS_VAR_IF([_cv_gnu_make_command], [""],[$2],[$1]) + AC_SUBST([ifGNUmake]) + AC_SUBST([ifnGNUmake]) +]) 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/xdg-dbus-proxy-0.1.3/m4/ax_code_coverage.m4 new/xdg-dbus-proxy-0.1.4/m4/ax_code_coverage.m4 --- old/xdg-dbus-proxy-0.1.3/m4/ax_code_coverage.m4 2019-09-18 18:51:13.000000000 +0200 +++ new/xdg-dbus-proxy-0.1.4/m4/ax_code_coverage.m4 2022-04-23 18:47:31.000000000 +0200 @@ -74,7 +74,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -#serial 32 +#serial 34 m4_define(_AX_CODE_COVERAGE_RULES,[ AX_ADD_AM_MACRO_STATIC([ @@ -138,7 +138,7 @@ CODE_COVERAGE_GENHTML_OPTIONS ?= \$(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) CODE_COVERAGE_IGNORE_PATTERN ?= -GITIGNOREFILES = \$(GITIGNOREFILES) \$(CODE_COVERAGE_OUTPUT_FILE) \$(CODE_COVERAGE_OUTPUT_DIRECTORY) +GITIGNOREFILES := \$(GITIGNOREFILES) \$(CODE_COVERAGE_OUTPUT_FILE) \$(CODE_COVERAGE_OUTPUT_DIRECTORY) code_coverage_v_lcov_cap = \$(code_coverage_v_lcov_cap_\$(V)) code_coverage_v_lcov_cap_ = \$(code_coverage_v_lcov_cap_\$(AM_DEFAULT_VERBOSITY)) code_coverage_v_lcov_cap_0 = @echo \" LCOV --capture\" \$(CODE_COVERAGE_OUTPUT_FILE); @@ -175,7 +175,7 @@ code-coverage-dist-clean: -A][M_DISTCHECK_CONFIGURE_FLAGS = \$(A][M_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage +A][M_DISTCHECK_CONFIGURE_FLAGS := \$(A][M_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage else # ifneq (\$(abs_builddir), \$(abs_top_builddir)) check-code-coverage: 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/xdg-dbus-proxy-0.1.3/meson.build new/xdg-dbus-proxy-0.1.4/meson.build --- old/xdg-dbus-proxy-0.1.3/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/meson.build 2022-05-11 11:13:17.000000000 +0200 @@ -0,0 +1,111 @@ +project( + 'xdg-dbus-proxy', + 'c', + version : '0.1.4', + meson_version : '>=0.49.0', + default_options : [ + 'warning_level=2', + ], +) + +cc = meson.get_compiler('c') +add_project_arguments('-D_GNU_SOURCE', language : 'c') +common_include_directories = include_directories('.') + +add_project_arguments( + cc.get_supported_arguments([ + '-Werror=aggregate-return', + '-Werror=empty-body', + '-Werror=implicit-function-declaration', + '-Werror=incompatible-pointer-types', + '-Werror=init-self', + '-Werror=int-conversion', + '-Werror=misleading-indentation', + '-Werror=missing-declarations', + '-Werror=missing-include-dirs', + '-Werror=missing-prototypes', + '-Werror=overflow', + '-Werror=parenthesis', + '-Werror=pointer-arith', + '-Werror=return-type', + '-Werror=shadow', + '-Werror=strict-prototypes', + '-Werror=switch-default', + '-Wswitch-enum', + + # Deliberately not warning about this, ability to zero-initialize + # a struct is a feature + '-Wno-missing-field-initializers', + '-Wno-error=missing-field-initializers', + + # Deliberately not warning about this, unused parameters to a callback + # are not a bug + '-Wno-unused-parameter', + '-Wno-error=unused-parameter', + ]), + language : 'c', +) + +glib_dep = dependency('glib-2.0', version : '>=2.40') +gio_dep = dependency('gio-2.0', version : '>=2.40') +gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.40') +common_deps = [glib_dep, gio_dep, gio_unix_dep] + +if meson.is_subproject() + bindir = get_option('libexecdir') + + if get_option('program_prefix') == '' + error('program_prefix option must be set when xdg-dbus-proxy is a subproject') + endif + + exe_name = get_option('program_prefix') + 'dbus-proxy' +else + bindir = get_option('bindir') + exe_name = 'xdg-dbus-proxy' +endif + +conf_data = configuration_data() +conf_data.set_quoted('BINDIR', get_option('prefix') / bindir) +conf_data.set_quoted('PACKAGE_NAME', meson.project_name()) +conf_data.set_quoted('PACKAGE_VERSION', meson.project_version()) +configure_file(output : 'config.h', + configuration : conf_data) + +dbus_proxy = executable( + exe_name, + [ + 'dbus-proxy.c', + 'flatpak-proxy.c', + ], + install : true, + install_dir : bindir, + dependencies : common_deps, +) + +xsltproc = find_program('xsltproc', required : get_option('man')) + +if xsltproc.found() and not meson.is_subproject() + custom_target( + 'xdg-dbus-proxy.1', + output : 'xdg-dbus-proxy.1', + input : 'xdg-dbus-proxy.xml', + command : [ + xsltproc, + '--nonet', + '--stringparam', 'man.output.quietly', '1', + '--stringparam', 'funcsynopsis.style', 'ansi', + '--stringparam', 'man.th.extra1.suppress', '1', + '--stringparam', 'man.authors.section.enabled', '0', + '--stringparam', 'man.copyright.section.enabled', '0', + '-o', '@OUTPUT@', + 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', + '@INPUT@', + ], + install : true, + install_dir : get_option('mandir') / 'man1', + ) +endif + +if get_option('tests') + subdir('tests') +endif 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/xdg-dbus-proxy-0.1.3/meson_options.txt new/xdg-dbus-proxy-0.1.4/meson_options.txt --- old/xdg-dbus-proxy-0.1.3/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/meson_options.txt 2022-04-23 18:50:29.000000000 +0200 @@ -0,0 +1,18 @@ +option( + 'man', + type : 'feature', + description : 'generate man pages', + value : 'auto', +) +option( + 'program_prefix', + type : 'string', + description : 'Prepend string to executable name, for use with subprojects', + value : '', +) +option( + 'tests', + type : 'boolean', + description : 'Build and run automated tests', + value : 'true', +) 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/xdg-dbus-proxy-0.1.3/missing new/xdg-dbus-proxy-0.1.4/missing --- old/xdg-dbus-proxy-0.1.3/missing 2018-09-13 09:02:05.000000000 +0200 +++ new/xdg-dbus-proxy-0.1.4/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,215 +0,0 @@ -#!/bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2016-01-11.22; # UTC - -# Copyright (C) 1996-2017 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. - -# 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. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to <bug-autom...@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: 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/xdg-dbus-proxy-0.1.3/tests/Makefile.am.inc new/xdg-dbus-proxy-0.1.4/tests/Makefile.am.inc --- old/xdg-dbus-proxy-0.1.3/tests/Makefile.am.inc 2019-01-15 19:02:01.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/Makefile.am.inc 2022-04-23 18:47:31.000000000 +0200 @@ -11,3 +11,9 @@ test_proxy_CPPFLAGS = -DBINDIR=\"$(bindir)\" test_proxy_SOURCES = tests/test-proxy.c test_proxy_LDADD = $(COMMON_LIBS) + +EXTRA_DIST += tests/meson.build +EXTRA_DIST += tests/use-as-subproject/README +EXTRA_DIST += tests/use-as-subproject/config.h +EXTRA_DIST += tests/use-as-subproject/dummy-config.h.in +EXTRA_DIST += tests/use-as-subproject/meson.build 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/xdg-dbus-proxy-0.1.3/tests/meson.build new/xdg-dbus-proxy-0.1.4/tests/meson.build --- old/xdg-dbus-proxy-0.1.3/tests/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/meson.build 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1,35 @@ +test_programs = [ + [ + 'test-proxy', + executable( + 'test-proxy', + 'test-proxy.c', + dependencies : common_deps, + include_directories : common_include_directories, + ), + ], +] + +test_env = environment() +test_env.set('DBUS_PROXY', dbus_proxy.full_path()) +test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) + +foreach pair : test_programs + name = pair[0] + test_program = pair[1] + if meson.version().version_compare('>=0.50.0') + test( + name, + test_program, + env : test_env, + protocol : 'tap', + ) + else + test( + name, + test_program, + env : test_env, + ) + endif +endforeach 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/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/README new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/README --- old/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/README 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1,3 @@ +This is a simple example of a project that uses xdg-dbus-proxy as a +subproject. The intention is that if this project can successfully build +xdg-dbus-proxy as a subproject, then so could Flatpak. 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/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/config.h new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/config.h --- old/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/config.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/config.h 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1 @@ +#error Should not use superproject config.h to compile xdg-dbus-proxy 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/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/dummy-config.h.in new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/dummy-config.h.in --- old/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/dummy-config.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/dummy-config.h.in 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1 @@ +#error Should not use superproject generated config.h to compile xdg-dbus-proxy 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/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/meson.build new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/meson.build --- old/xdg-dbus-proxy-0.1.3/tests/use-as-subproject/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-dbus-proxy-0.1.4/tests/use-as-subproject/meson.build 2022-04-23 18:47:31.000000000 +0200 @@ -0,0 +1,19 @@ +project( + 'use-xdg-dbus-proxy-as-subproject', + 'c', + version : '0', + meson_version : '>=0.49.0', +) + +configure_file( + output : 'config.h', + input : 'dummy-config.h.in', + configuration : configuration_data(), +) + +subproject( + 'dbus-proxy', + default_options : [ + 'program_prefix=notflatpak-', + ], +)
