Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tpm2.0-abrmd for openSUSE:Factory checked in at 2022-07-09 16:59:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tpm2.0-abrmd (Old) and /work/SRC/openSUSE:Factory/.tpm2.0-abrmd.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tpm2.0-abrmd" Sat Jul 9 16:59:04 2022 rev:23 rq:987872 version:2.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/tpm2.0-abrmd/tpm2.0-abrmd.changes 2022-04-05 19:55:15.470364428 +0200 +++ /work/SRC/openSUSE:Factory/.tpm2.0-abrmd.new.1523/tpm2.0-abrmd.changes 2022-07-09 16:59:05.536441049 +0200 @@ -1,0 +2,20 @@ +Fri Jul 8 08:43:16 UTC 2022 - Alberto Planas Dominguez <apla...@suse.com> + +- Version 2.4.1 + + Added + Contributor Covenant Code of Conduct. + + Fixed + * superflous warning messages about tcti status. + WARNING **: 11:00:56.205: tcti_conf before: "(null)" + WARNING **: 11:00:56.205: tcti_conf after: "mssim" + * GCC 11 build error: error: argument 2 of __atomic_load??? discards + 'volatile' qualifier + * Initialize gerror pointer variable to NULL to fix use of + unitialized memory and segfault. + * Updated missing defaults in manpage. + * Port CI to composite actions in tpm2-software/ci. + + Removed + Dependency on 'which' utility in configure.ac. + ubuntu-16.04 from CI. + +------------------------------------------------------------------- @@ -14 +34 @@ - + contains reload fix (bsc#1166936~ + + contains reload fix (bsc#1166936) Old: ---- tpm2-abrmd-2.4.0.tar.gz New: ---- tpm2-abrmd-2.4.1.tar.gz tpm2-abrmd-2.4.1.tar.gz.asc tpm2-abrmd.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpm2.0-abrmd.spec ++++++ --- /var/tmp/diff_new_pack.F9Wqmu/_old 2022-07-09 16:59:06.020441776 +0200 +++ /var/tmp/diff_new_pack.F9Wqmu/_new 2022-07-09 16:59:06.024441783 +0200 @@ -29,15 +29,18 @@ %bcond_with selinux %endif Name: tpm2.0-abrmd -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: Intel's TCG Software Stack Access Broker & Resource Manager for TPM 2.0 chips License: BSD-2-Clause Group: Productivity/Security URL: https://github.com/tpm2-software/tpm2-abrmd Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/tpm2-abrmd-%{version}.tar.gz -Source1: tpm2.0-abrmd.rpmlintrc -Source2: README.SUSE +Source1: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/tpm2-abrmd-%{version}.tar.gz.asc +# curl https://github.com/flihp.gpg > tpm2-abrmd.keyring +Source2: tpm2-abrmd.keyring +Source3: tpm2.0-abrmd.rpmlintrc +Source4: README.SUSE Patch0: harden_tpm2-abrmd.service.patch Patch1: dbus-access.patch BuildRequires: autoconf-archive @@ -122,7 +125,7 @@ # don't install the systemd preset, our presets are handled by # systemd-presets-* packages rm %{buildroot}%{_prefix}/lib*/systemd/system-preset/tpm2-abrmd.preset -cp %{SOURCE2} . +cp %{SOURCE4} . %if ! 0%{?install_dbus_files} rm %{buildroot}/%{_sysconfdir}/dbus-1/system.d/tpm2-abrmd.conf rm %{buildroot}/%{_datadir}/dbus-1/system-services/com.intel.tss2.Tabrmd.service ++++++ tpm2-abrmd-2.4.0.tar.gz -> tpm2-abrmd-2.4.1.tar.gz ++++++ ++++ 1798 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/tpm2-abrmd-2.4.0/AUTHORS new/tpm2-abrmd-2.4.1/AUTHORS --- old/tpm2-abrmd-2.4.0/AUTHORS 2021-02-08 19:32:58.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/AUTHORS 2022-03-05 23:52:30.000000000 +0100 @@ -1,14 +1,15 @@ Philip Tricca <philip.b.tri...@intel.com> Philip Tricca <fl...@twobit.us> William Roberts <william.c.robe...@intel.com> -Jonas Witschel <diabo...@gmx.de> Philip Tricca <fl...@twobit.org> +Jonas Witschel <diabo...@gmx.de> Javier Martinez Canillas <javi...@redhat.com> Matthias Gerstner <matthias.gerst...@suse.de> dantpm <daniel.ander...@intel.com> Tadeusz Struk <tst...@gmail.com> -?????????? ???????????????? <git-...@aegee.org> Tadeusz Struk <tadeusz.st...@intel.com> +?????????? ???????????????? <git-...@aegee.org> +malikabhi05 <abhishek.ma...@intel.com> Alex Lam <alex.c....@intel.com> Jia Zhang <qianyue...@alibaba-inc.com> danintel <daniel.ander...@intel.com> @@ -24,8 +25,11 @@ Trevor Vaughan <tvaug...@onyxpoint.com> Thomas Furtner <t.furt...@gmail.com> Steven Clark <davolf...@gmail.com> +Petr Gotthard <petr.gotth...@centrum.cz> +Nicolas Iooss <nicolas.io...@ledger.fr> Mantas Mikul??nas <graw...@gmail.com> Lu Gong <lu.g...@intel.com> +Jonas Witschel <g...@diabonas.de> Jerry Snitselaar <jsnit...@redhat.com> Jeffrey Ferreira <jeffpferre...@gmail.com> Imran Desai <imran.de...@intel.com> 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/tpm2-abrmd-2.4.0/CHANGELOG.md new/tpm2-abrmd-2.4.1/CHANGELOG.md --- old/tpm2-abrmd-2.4.0/CHANGELOG.md 2021-02-08 19:29:38.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/CHANGELOG.md 2022-03-05 00:34:04.000000000 +0100 @@ -3,6 +3,23 @@ The format is based on [Keep a CHANGELOG](http://keepachangelog.com/) +### 2.4.1 - 2022-03-04 +### Added + - Contributor Covenant Code of Conduct. + +### Fixed + - superflous warning messages about tcti status. + - `WARNING **: 11:00:56.205: tcti_conf before: "(null)"` + - `WARNING **: 11:00:56.205: tcti_conf after: "mssim"` + - GCC 11 build error: error: argument 2 of `__atomic_load??? discards ???volatile??? qualifier` + - Initialize gerror pointer variable to NULL to fix use of unitialized memory and segfault. + - Updated missing defaults in manpage. + - Port CI to composite actions in tpm2-software/ci. + +### Removed + - Dependency on 'which' utility in configure.ac. + - ubuntu-16.04 from CI. + ### 2.4.0 - 2021-02-08 ### Added - configure option --enable-asan which will cause the build to produce 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/tpm2-abrmd-2.4.0/INSTALL.md new/tpm2-abrmd-2.4.1/INSTALL.md --- old/tpm2-abrmd-2.4.0/INSTALL.md 2021-01-14 23:35:00.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/INSTALL.md 2022-01-31 06:29:46.000000000 +0100 @@ -12,6 +12,7 @@ * pkg-config * glib and gio 2.0 libraries and development files * libtss2-sys, libtss2-mu and TCTI libraries from https://github.com/tpm2-software/tpm2-tss +* dbus **NOTE**: Different GNU/Linux distros package glib-2.0 differently and so additional packages may be required. The tabrmd requires the GObject and 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/tpm2-abrmd-2.4.0/VERSION new/tpm2-abrmd-2.4.1/VERSION --- old/tpm2-abrmd-2.4.0/VERSION 2021-02-08 19:32:33.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/VERSION 2022-03-05 23:51:45.000000000 +0100 @@ -1 +1 @@ -2.4.0 +2.4.1 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/tpm2-abrmd-2.4.0/aminclude_static.am new/tpm2-abrmd-2.4.1/aminclude_static.am --- old/tpm2-abrmd-2.4.0/aminclude_static.am 2021-02-08 19:32:49.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/aminclude_static.am 2022-03-05 23:51:54.000000000 +0100 @@ -1,6 +1,6 @@ # aminclude_static.am generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on Mon Feb 8 12:32:49 CST 2021 +# from AX_AM_MACROS_STATIC on Sat Mar 5 14:51:54 PST 2022 # 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/tpm2-abrmd-2.4.0/compile new/tpm2-abrmd-2.4.1/compile --- old/tpm2-abrmd-2.4.0/compile 2020-02-05 15:31:03.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/compile 2021-01-04 06:32:20.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) 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/tpm2-abrmd-2.4.0/configure.ac new/tpm2-abrmd-2.4.1/configure.ac --- old/tpm2-abrmd-2.4.0/configure.ac 2021-01-15 17:51:29.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/configure.ac 2022-01-31 06:29:46.000000000 +0100 @@ -47,7 +47,7 @@ PKG_CHECK_MODULES([TSS2_RC],[tss2-rc]) AC_ARG_VAR([GDBUS_CODEGEN],[The gdbus-codegen executable.]) AC_CHECK_PROG([GDBUS_CODEGEN], [gdbus-codegen], [gdbus-codegen]) -AS_IF([test ! -x "$(which $GDBUS_CODEGEN)"], +AS_IF([test x"$GDBUS_CODEGEN" != x"gdbus-codegen"], [AC_MSG_ERROR([*** gdbus-codegen is required to build tpm2-abrmd])]) # Check OS and set library and compile flags accordingly @@ -175,7 +175,8 @@ [enable_integration=no]) AS_IF([test "x$enable_integration" = "xyes"], [AS_IF([test "x$enable_test_hwtpm" = "xno"], - [AC_CHECK_PROG([swtpm], [swtpm], [yes], [no]) + [PATH_PROG([DBUS_RUN_SESSION], [dbus-run-session]) + AC_CHECK_PROG([swtpm], [swtpm], [yes], [no]) AC_CHECK_PROG([tpm_server], [tpm_server], [yes], [no]) AS_IF([test "$swtpm" = yes], [TABRMD_TCTI=swtpm], [AS_IF([test "$tpm_server" = yes], [TABRMD_TCTI=mssim], 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/tpm2-abrmd-2.4.0/m4/libtool.m4 new/tpm2-abrmd-2.4.1/m4/libtool.m4 --- old/tpm2-abrmd-2.4.0/m4/libtool.m4 2021-02-08 19:32:39.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/m4/libtool.m4 2022-03-05 23:51:49.000000000 +0100 @@ -1071,11 +1071,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; 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/tpm2-abrmd-2.4.0/m4/pkg.m4 new/tpm2-abrmd-2.4.1/m4/pkg.m4 --- old/tpm2-abrmd-2.4.0/m4/pkg.m4 2021-02-08 19:32:39.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/m4/pkg.m4 2022-03-05 23:51:49.000000000 +0100 @@ -1,6 +1,6 @@ -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright ?? 2004 Scott James Remnant <sc...@netsplit.com>. dnl Copyright ?? 2012-2015 Dan Nicholson <dbn.li...@gmail.com> dnl @@ -41,7 +41,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -152,11 +152,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -173,7 +173,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full 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/tpm2-abrmd-2.4.0/man/tpm2-abrmd.8.in new/tpm2-abrmd-2.4.1/man/tpm2-abrmd.8.in --- old/tpm2-abrmd-2.4.0/man/tpm2-abrmd.8.in 2021-01-14 23:35:00.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/man/tpm2-abrmd.8.in 2022-01-31 06:29:46.000000000 +0100 @@ -46,7 +46,7 @@ \fB\-m,\ \-\-max-connections\fR Set an upper bound on the number of concurrent client connections allowed. Once this number of client connections is reached new connections will be -rejected with an error. +rejected with an error. If the option is not specified the default is \fB27\fR. .TP \fB\-f,\ \-\-flush-all\fR Flush all objects and sessions when daemon is started. @@ -58,12 +58,14 @@ .TP \fB\-e,\ \-\-max-sessions\fR Set and upper bound on the number of sessions that each client connection -is allowed to create (loaded or active) at any one time. +is allowed to create (loaded or active) at any one time. If the option is not +specified the default is \fB4\fR. .TP \fB\-r,\ \-\-max-transients\fR Set an upper bound on the number of transient objects that each client connection allowed to load. Once this number of objects is reached attempts -to load new transient objects will produce an error. +to load new transient objects will produce an error. If the option is not +specified the default is \fB27\fR. .TP \fB\-n,\ \-\-dbus-name\fR Claim the given name on dbus. This option overrides the default of @@ -73,8 +75,8 @@ Read seed for pseudo-random number generator from the provided file. .TP \fB\-s,\ \-\-session\fR -Connect daemon to the session dbus. This option overrides the default -behavior. +Connect daemon to the session dbus. If the option is not specified the daemon +connects to the system dbus. .TP \fB\-v,\ \-\-version\fR Display version string. 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/tpm2-abrmd-2.4.0/missing new/tpm2-abrmd-2.4.1/missing --- old/tpm2-abrmd-2.4.0/missing 2020-02-05 15:31:03.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/missing 2021-01-04 06:32:20.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 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/tpm2-abrmd-2.4.0/src/ipc-frontend-dbus.c new/tpm2-abrmd-2.4.1/src/ipc-frontend-dbus.c --- old/tpm2-abrmd-2.4.0/src/ipc-frontend-dbus.c 2020-03-24 01:02:12.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/ipc-frontend-dbus.c 2022-01-31 06:29:46.000000000 +0100 @@ -199,28 +199,6 @@ } /* TabrmdSkeleton signal handlers */ /* - * This is a utility function that builds an array of handles as a - * GVariant object. The handles that make up the array are passed in - * as a GUnixFDList. - */ -static GVariant* -handle_array_variant_from_fdlist (GUnixFDList *fdlist) -{ - GVariant *tuple; - GVariantBuilder *builder; - gint i = 0; - - /* build array of handles as GVariant */ - builder = g_variant_builder_new (G_VARIANT_TYPE ("ah")); - for (i = 0; i < g_unix_fd_list_get_length (fdlist); ++i) - g_variant_builder_add (builder, "h", i); - /* create tuple variant from builder */ - tuple = g_variant_new ("ah", builder); - g_variant_builder_unref (builder); - - return tuple; -} -/* * Give this function a dbus proxy and invocation object from a method * invocation and it will get the PID of the process associated with the * invocation. If an error occurs this function returns false. @@ -345,7 +323,7 @@ Connection *connection = NULL; gint client_fd = 0, ret = 0; GIOStream *iostream; - GVariant *response_variants[2], *response_tuple; + GVariant *response, *response_tuple; GUnixFDList *fd_list = NULL; guint64 id = 0, id_pid_mix = 0; gboolean id_ret = FALSE; @@ -392,10 +370,8 @@ client_fd, id_pid_mix); /* prepare tuple variant for response message */ fd_list = g_unix_fd_list_new_from_array (&client_fd, 1); - response_variants[0] = handle_array_variant_from_fdlist (fd_list); - /* return the random id to client, *not* xor'd with PID */ - response_variants[1] = g_variant_new_uint64 (id); - response_tuple = g_variant_new_tuple (response_variants, 2); + response = g_variant_new_uint64 (id); + response_tuple = g_variant_new_tuple (&response, 1); /* * Issue the callback to notify subscribers that a new connection has * been created. 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/tpm2-abrmd-2.4.0/src/session-entry-state-enum.c new/tpm2-abrmd-2.4.1/src/session-entry-state-enum.c --- old/tpm2-abrmd-2.4.0/src/session-entry-state-enum.c 2020-03-24 01:02:12.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/session-entry-state-enum.c 2022-01-31 06:29:46.000000000 +0100 @@ -25,9 +25,9 @@ GType session_entry_state_enum_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize g_define_type_id = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) { + if (g_once_init_enter (&g_define_type_id)) { static const GEnumValue my_enum_values[] = { { SESSION_ENTRY_LOADED, @@ -55,9 +55,9 @@ GType session_entry_state_enum_type = g_enum_register_static ("SessionEntryStateEnum", my_enum_values); - g_once_init_leave (&g_define_type_id__volatile, + g_once_init_leave (&g_define_type_id, session_entry_state_enum_type); } - return g_define_type_id__volatile; + return g_define_type_id; } 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/tpm2-abrmd-2.4.0/src/tabrmd-generated.c new/tpm2-abrmd-2.4.1/src/tabrmd-generated.c --- old/tpm2-abrmd-2.4.0/src/tabrmd-generated.c 2021-02-08 19:32:58.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/tabrmd-generated.c 2022-03-05 23:52:19.000000000 +0100 @@ -166,17 +166,6 @@ /* ---- Introspection data for com.intel.tss2.TctiTabrmd ---- */ -static const _ExtendedGDBusArgInfo _tcti_tabrmd_method_info_create_connection_OUT_ARG_fds = -{ - { - -1, - (gchar *) "fds", - (gchar *) "ah", - NULL - }, - FALSE -}; - static const _ExtendedGDBusArgInfo _tcti_tabrmd_method_info_create_connection_OUT_ARG_id = { { @@ -190,7 +179,6 @@ static const GDBusArgInfo * const _tcti_tabrmd_method_info_create_connection_OUT_ARG_pointers[] = { - &_tcti_tabrmd_method_info_create_connection_OUT_ARG_fds.parent_struct, &_tcti_tabrmd_method_info_create_connection_OUT_ARG_id.parent_struct, NULL }; @@ -494,19 +482,17 @@ /** * tcti_tabrmd_call_create_connection_finish: * @proxy: A #TctiTabrmdProxy. - * @out_fds: (out) (optional): Return location for return parameter or %NULL to ignore. * @out_id: (out) (optional): Return location for return parameter or %NULL to ignore. * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tcti_tabrmd_call_create_connection(). * @error: Return location for error or %NULL. * * Finishes an operation started with tcti_tabrmd_call_create_connection(). * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_create_connection_finish ( TctiTabrmd *proxy, - GVariant **out_fds, guint64 *out_id, GAsyncResult *res, GError **error) @@ -516,8 +502,7 @@ if (_ret == NULL) goto _out; g_variant_get (_ret, - "(@aht)", - out_fds, + "(t)", out_id); g_variant_unref (_ret); _out: @@ -527,7 +512,6 @@ /** * tcti_tabrmd_call_create_connection_sync: * @proxy: A #TctiTabrmdProxy. - * @out_fds: (out) (optional): Return location for return parameter or %NULL to ignore. * @out_id: (out) (optional): Return location for return parameter or %NULL to ignore. * @cancellable: (nullable): A #GCancellable or %NULL. * @error: Return location for error or %NULL. @@ -536,12 +520,11 @@ * * See tcti_tabrmd_call_create_connection() for the asynchronous version of this method. * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_create_connection_sync ( TctiTabrmd *proxy, - GVariant **out_fds, guint64 *out_id, GCancellable *cancellable, GError **error) @@ -557,8 +540,7 @@ if (_ret == NULL) goto _out; g_variant_get (_ret, - "(@aht)", - out_fds, + "(t)", out_id); g_variant_unref (_ret); _out: @@ -607,7 +589,7 @@ * * Finishes an operation started with tcti_tabrmd_call_cancel(). * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_cancel_finish ( @@ -640,7 +622,7 @@ * * See tcti_tabrmd_call_cancel() for the asynchronous version of this method. * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_cancel_sync ( @@ -714,7 +696,7 @@ * * Finishes an operation started with tcti_tabrmd_call_set_locality(). * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_set_locality_finish ( @@ -748,7 +730,7 @@ * * See tcti_tabrmd_call_set_locality() for the asynchronous version of this method. * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + * Returns: (skip): %TRUE if the call succeeded, %FALSE if @error is set. */ gboolean tcti_tabrmd_call_set_locality_sync ( @@ -783,7 +765,6 @@ * tcti_tabrmd_complete_create_connection: * @object: A #TctiTabrmd. * @invocation: (transfer full): A #GDBusMethodInvocation. - * @fds: Parameter to return. * @id: Parameter to return. * * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-com-intel-tss2-TctiTabrmd.CreateConnection">CreateConnection()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. @@ -794,12 +775,10 @@ tcti_tabrmd_complete_create_connection ( TctiTabrmd *object, GDBusMethodInvocation *invocation, - GVariant *fds, guint64 id) { g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(@aht)", - fds, + g_variant_new ("(t)", id)); } 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/tpm2-abrmd-2.4.0/src/tabrmd-generated.h new/tpm2-abrmd-2.4.1/src/tabrmd-generated.h --- old/tpm2-abrmd-2.4.0/src/tabrmd-generated.h 2021-02-08 19:32:58.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/tabrmd-generated.h 2022-03-05 23:52:19.000000000 +0100 @@ -57,7 +57,6 @@ void tcti_tabrmd_complete_create_connection ( TctiTabrmd *object, GDBusMethodInvocation *invocation, - GVariant *fds, guint64 id); void tcti_tabrmd_complete_cancel ( @@ -81,14 +80,12 @@ gboolean tcti_tabrmd_call_create_connection_finish ( TctiTabrmd *proxy, - GVariant **out_fds, guint64 *out_id, GAsyncResult *res, GError **error); gboolean tcti_tabrmd_call_create_connection_sync ( TctiTabrmd *proxy, - GVariant **out_fds, guint64 *out_id, GCancellable *cancellable, GError **error); 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/tpm2-abrmd-2.4.0/src/tabrmd-options.c new/tpm2-abrmd-2.4.1/src/tabrmd-options.c --- old/tpm2-abrmd-2.4.0/src/tabrmd-options.c 2021-01-14 23:35:00.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/tabrmd-options.c 2022-01-31 06:29:46.000000000 +0100 @@ -118,7 +118,7 @@ { NULL, '\0', 0, 0, NULL, NULL, NULL }, }; - g_warning ("tcti_conf before: \"%s\"", options->tcti_conf); + g_debug ("tcti_conf before: \"%s\"", options->tcti_conf); ctx = g_option_context_new (" - TPM2 software stack Access Broker Daemon (tabrmd)"); g_option_context_add_main_entries (ctx, entries, NULL); @@ -169,7 +169,7 @@ TABRMD_TRANSIENT_MAX); goto error; } - g_warning ("tcti_conf after: \"%s\"", options->tcti_conf); + g_debug ("tcti_conf after: \"%s\"", options->tcti_conf); return TRUE; error: 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/tpm2-abrmd-2.4.0/src/tabrmd.xml new/tpm2-abrmd-2.4.1/src/tabrmd.xml --- old/tpm2-abrmd-2.4.0/src/tabrmd.xml 2017-08-04 21:42:40.000000000 +0200 +++ new/tpm2-abrmd-2.4.1/src/tabrmd.xml 2022-01-31 06:29:46.000000000 +0100 @@ -3,7 +3,6 @@ <node> <interface name='com.intel.tss2.TctiTabrmd'> <method name='CreateConnection'> - <arg type='ah' name='fds' direction='out'/> <arg type='t' name='id' direction='out'/> </method> <method name='Cancel'> 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/tpm2-abrmd-2.4.0/src/tcti-tabrmd.c new/tpm2-abrmd-2.4.1/src/tcti-tabrmd.c --- old/tpm2-abrmd-2.4.0/src/tcti-tabrmd.c 2021-01-12 17:21:01.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/src/tcti-tabrmd.c 2022-01-31 06:29:46.000000000 +0100 @@ -187,7 +187,7 @@ size_t size, int32_t timeout) { - GError *error; + GError *error = NULL; ssize_t num_read; int ret; @@ -434,7 +434,6 @@ static gboolean tcti_tabrmd_call_create_connection_sync_fdlist (TctiTabrmd *proxy, - GVariant **out_fds, guint64 *out_id, GUnixFDList **out_fd_list, GCancellable *cancellable, @@ -443,7 +442,7 @@ GVariant *_ret; _ret = g_dbus_proxy_call_with_unix_fd_list_sync (G_DBUS_PROXY (proxy), "CreateConnection", - g_variant_new ("()"), + NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, @@ -453,7 +452,7 @@ if (_ret == NULL) { goto _out; } - g_variant_get (_ret, "(@aht)", out_fds, out_id); + g_variant_get (_ret, "(t)", out_id); g_variant_unref (_ret); _out: return _ret != NULL; @@ -533,14 +532,12 @@ GError *error = NULL; GSocket *sock = NULL; GUnixFDList *fd_list = NULL; - GVariant *fds_variant = NULL; gboolean call_ret; guint64 id; TSS2_RC rc = TSS2_RC_SUCCESS; call_ret = tcti_tabrmd_call_create_connection_sync_fdlist ( TSS2_TCTI_TABRMD_PROXY (context), - &fds_variant, &id, &fd_list, NULL, @@ -575,7 +572,6 @@ g_socket_connection_factory_create_connection (sock); TSS2_TCTI_TABRMD_ID (context) = id; out: - g_clear_pointer (&fds_variant, g_variant_unref); g_clear_error (&error); g_clear_object (&sock); g_clear_object (&fd_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/tpm2-abrmd-2.4.0/test/thread_unit.c new/tpm2-abrmd-2.4.1/test/thread_unit.c --- old/tpm2-abrmd-2.4.0/test/thread_unit.c 2020-03-24 01:02:12.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/test/thread_unit.c 2022-01-31 06:29:46.000000000 +0100 @@ -69,6 +69,8 @@ g_debug ("test_thread_run after sleep"); } pthread_cleanup_pop (0); + + return NULL; } /* * This function is invoked as part of canceling ('thread_cancel') the Thread. 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/tpm2-abrmd-2.4.0/test/tss2-tcti-tabrmd_unit.c new/tpm2-abrmd-2.4.1/test/tss2-tcti-tabrmd_unit.c --- old/tpm2-abrmd-2.4.0/test/tss2-tcti-tabrmd_unit.c 2020-03-24 01:02:12.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/test/tss2-tcti-tabrmd_unit.c 2022-01-31 06:29:46.000000000 +0100 @@ -382,7 +382,7 @@ GCancellable *cancellable, GError **error) { - GVariant *variant_array[2] = { 0 }, *variant_tuple; + GVariant *variant_array[1] = { 0 }, *variant_tuple; gint client_fd; guint64 id; UNUSED_PARAM(proxy); @@ -391,19 +391,15 @@ UNUSED_PARAM(flags); UNUSED_PARAM(timeout_msec); UNUSED_PARAM(fd_list); + UNUSED_PARAM(out_fd_list); UNUSED_PARAM(cancellable); UNUSED_PARAM(error); client_fd = mock_type (gint); id = mock_type (guint64); - *out_fd_list = g_unix_fd_list_new_from_array (&client_fd, 1); - variant_array[0] = g_variant_new_fixed_array (G_VARIANT_TYPE ("h"), - &client_fd, - 1, - sizeof (gint32)); - variant_array[1] = g_variant_new_uint64 (id); - variant_tuple = g_variant_new_tuple (variant_array, 2); + variant_array[0] = g_variant_new_uint64 (id); + variant_tuple = g_variant_new_tuple (variant_array, 1); return variant_tuple; } 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/tpm2-abrmd-2.4.0/test-driver new/tpm2-abrmd-2.4.1/test-driver --- old/tpm2-abrmd-2.4.0/test-driver 2020-02-05 15:31:03.000000000 +0100 +++ new/tpm2-abrmd-2.4.1/test-driver 2021-01-04 06:32:20.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 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 }
