--- Begin Message ---
Package: tpm2-abrmd
Version: 1.3.1-1
Severity: normal
Tags: patch pending
Control: tags 910340 + patch pending
Control: block 910340 by -1
Control: tags 910341 + patch pending
Control: block 910341 by -1
I've prepared an NMU for tpm2-abrmd (versioned as 1.3.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it or delay it longer.
Please see:
https://salsa.debian.org/debian/tpm2-abrmd/merge_requests/1
or the attached patches.
Regards,
smcv
diffstat for tpm2-abrmd-1.3.1 tpm2-abrmd-1.3.1
changelog | 18 ++++++
control | 1
patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch | 29 ++++++++++
patches/0002-remove-unit-test-needs-dbus-daemon.patch | 19 ------
patches/series | 2
rules | 5 +
6 files changed, 54 insertions(+), 20 deletions(-)
diff -Nru tpm2-abrmd-1.3.1/debian/changelog tpm2-abrmd-1.3.1/debian/changelog
--- tpm2-abrmd-1.3.1/debian/changelog 2018-05-01 08:15:34.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/changelog 2018-10-10 08:46:43.000000000 +0100
@@ -1,3 +1,21 @@
+tpm2-abrmd (1.3.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * d/p/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch:
+ Apply patch from upstream to make the build system compatible with
+ recent GLib versions. In older GLib versions,
+ `$PKG_CONFIG --variable=gdbus_codegen gio-2.0` always returned
+ "gdbus-codegen", but in newer versions or when GLib was built with
+ Meson it returns the absolute path to gdbus-codegen, which is not a
+ valid input to AC_PATH_PROG. (Closes: #910340)
+ * d/rules: Use dbus-run-session to give unit tests a temporary
+ session bus. This means that tss2-tcti-tabrmd_unit does not have to
+ be skipped. (Closes: #910341)
+ - d/p/0002-remove-unit-test-needs-dbus-daemon.patch:
+ Remove, no longer needed
+
+ -- Simon McVittie <[email protected]> Wed, 10 Oct 2018 08:46:43 +0100
+
tpm2-abrmd (1.3.1-1) unstable; urgency=low
* Initial release (Closes: #885774)
diff -Nru tpm2-abrmd-1.3.1/debian/control tpm2-abrmd-1.3.1/debian/control
--- tpm2-abrmd-1.3.1/debian/control 2018-05-01 08:15:34.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/control 2018-10-10 08:46:43.000000000 +0100
@@ -6,6 +6,7 @@
Build-Depends: autoconf,
autoconf-archive,
automake,
+ dbus <!nocheck>,
debhelper (>= 11),
libcmocka-dev,
libdbus-1-dev,
diff -Nru tpm2-abrmd-1.3.1/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch tpm2-abrmd-1.3.1/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
--- tpm2-abrmd-1.3.1/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch 1970-01-01 01:00:00.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch 2018-10-10 08:46:43.000000000 +0100
@@ -0,0 +1,29 @@
+From: Jonas Witschel <[email protected]>
+Date: Tue, 11 Sep 2018 13:14:36 +0200
+Subject: Fix gdbus-codegen lookup for recent versions of GLib
+
+If GLib is built using Meson, the gdbus_codegen variable contains the
+whole path to the binary instead of just the binary name. This cannot be
+parsed by AC_PATH_PROG and leads to an error in the configure script.
+According to https://gitlab.gnome.org/GNOME/glib/issues/1521#note_313402,
+the recommended way to solve this is to look up gdbus-codegen directly
+without using the pkg-config variable.
+
+Origin: upstream, 2.0.3, commit:b4036908dd067f8eadc9d53b1a2a39032aed109d
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe278e3..d1ea91b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ PKG_CHECK_MODULES([GOBJECT], [gobject-2.0])
+ PKG_CHECK_MODULES([SAPI],[sapi < 2.0.0])
+ AC_ARG_VAR([GDBUS_CODEGEN],[The gdbus-codegen executable.])
+-AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`])
++AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen])
+ if test -z "$GDBUS_CODEGEN"; then
+ AC_MSG_ERROR([*** gdbus-codegen is required to build tpm2-abrmd])
+ fi
diff -Nru tpm2-abrmd-1.3.1/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch tpm2-abrmd-1.3.1/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch
--- tpm2-abrmd-1.3.1/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch 2018-05-01 08:15:34.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Description: Remove some unit test requires dbus to be run.
- On build servers there's no dbus running. We shouldn't start the service
- and connected to dbus. Thus we remove unit tests that requires dbus.
-Author: Ying-Chun Liu (PaulLiu) <[email protected]>
-Forwarded: not-needed
-Last-Update: 2018-05-02
-
-Index: tpm2-abrmd/Makefile.am
-===================================================================
---- tpm2-abrmd.orig/Makefile.am
-+++ tpm2-abrmd/Makefile.am
-@@ -38,7 +38,6 @@ TESTS_UNIT = \
- test/thread_unit \
- test/tpm2-command_unit \
- test/tpm2-response_unit \
-- test/tss2-tcti-tabrmd_unit \
- test/tss2-tcti-echo_unit \
- test/util_unit
- if TCTI_DEVICE
diff -Nru tpm2-abrmd-1.3.1/debian/patches/series tpm2-abrmd-1.3.1/debian/patches/series
--- tpm2-abrmd-1.3.1/debian/patches/series 2018-05-01 08:15:34.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/patches/series 2018-10-10 08:46:43.000000000 +0100
@@ -1,2 +1,2 @@
0001-Since-Debian-source-package-did-not-contain-.git-fil.patch
-0002-remove-unit-test-needs-dbus-daemon.patch
+0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
diff -Nru tpm2-abrmd-1.3.1/debian/rules tpm2-abrmd-1.3.1/debian/rules
--- tpm2-abrmd-1.3.1/debian/rules 2018-05-01 08:15:34.000000000 +0100
+++ tpm2-abrmd-1.3.1/debian/rules 2018-10-10 08:46:43.000000000 +0100
@@ -17,5 +17,10 @@
override_dh_auto_configure:
dh_auto_configure -- --enable-unit
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dbus-run-session -- dh_auto_test
+endif
+
override_dh_missing:
dh_missing --fail-missing
>From 6a8c52b2f71f737f565976ddb0c40b7c6740cc5e Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Thu, 4 Oct 2018 23:12:59 +0100
Subject: [PATCH 1/3] Use dbus-run-session to give unit tests a temporary
session bus
This means that tss2-tcti-tabrmd_unit does not have to be skipped.
Closes: #910341
---
debian/control | 1 +
...2-remove-unit-test-needs-dbus-daemon.patch | 19 -------------------
debian/patches/series | 1 -
debian/rules | 5 +++++
4 files changed, 6 insertions(+), 20 deletions(-)
delete mode 100644 debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch
diff --git a/debian/control b/debian/control
index 19b15d2..50afa23 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Ying-Chun Liu (PaulLiu) <[email protected]>
Build-Depends: autoconf,
autoconf-archive,
automake,
+ dbus <!nocheck>,
debhelper (>= 11),
libcmocka-dev,
libdbus-1-dev,
diff --git a/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch b/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch
deleted file mode 100644
index 8f2837e..0000000
--- a/debian/patches/0002-remove-unit-test-needs-dbus-daemon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove some unit test requires dbus to be run.
- On build servers there's no dbus running. We shouldn't start the service
- and connected to dbus. Thus we remove unit tests that requires dbus.
-Author: Ying-Chun Liu (PaulLiu) <[email protected]>
-Forwarded: not-needed
-Last-Update: 2018-05-02
-
-Index: tpm2-abrmd/Makefile.am
-===================================================================
---- tpm2-abrmd.orig/Makefile.am
-+++ tpm2-abrmd/Makefile.am
-@@ -38,7 +38,6 @@ TESTS_UNIT = \
- test/thread_unit \
- test/tpm2-command_unit \
- test/tpm2-response_unit \
-- test/tss2-tcti-tabrmd_unit \
- test/tss2-tcti-echo_unit \
- test/util_unit
- if TCTI_DEVICE
diff --git a/debian/patches/series b/debian/patches/series
index 763fea8..5151d6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Since-Debian-source-package-did-not-contain-.git-fil.patch
-0002-remove-unit-test-needs-dbus-daemon.patch
diff --git a/debian/rules b/debian/rules
index 3a6df7a..cb64ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,5 +17,10 @@ override_dh_autoreconf:
override_dh_auto_configure:
dh_auto_configure -- --enable-unit
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dbus-run-session -- dh_auto_test
+endif
+
override_dh_missing:
dh_missing --fail-missing
--
2.19.1
>From 2b5150d88a604668f40e1b399d2c8130d42070a2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Wed, 10 Oct 2018 08:46:22 +0100
Subject: [PATCH 2/3] Fix gdbus-codegen lookup for recent versions of GLib
Apply patch from upstream to make the build system compatible with
recent GLib versions. In older GLib versions,
`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` always returned
"gdbus-codegen", but in newer versions or when GLib was built with
Meson it returns the absolute path to gdbus-codegen, which is not a
valid input to AC_PATH_PROG.
Closes: #910340
---
...n-lookup-for-recent-versions-of-GLib.patch | 29 +++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 30 insertions(+)
create mode 100644 debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
diff --git a/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch b/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
new file mode 100644
index 0000000..cd95d98
--- /dev/null
+++ b/debian/patches/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
@@ -0,0 +1,29 @@
+From: Jonas Witschel <[email protected]>
+Date: Tue, 11 Sep 2018 13:14:36 +0200
+Subject: Fix gdbus-codegen lookup for recent versions of GLib
+
+If GLib is built using Meson, the gdbus_codegen variable contains the
+whole path to the binary instead of just the binary name. This cannot be
+parsed by AC_PATH_PROG and leads to an error in the configure script.
+According to https://gitlab.gnome.org/GNOME/glib/issues/1521#note_313402,
+the recommended way to solve this is to look up gdbus-codegen directly
+without using the pkg-config variable.
+
+Origin: upstream, 2.0.3, commit:b4036908dd067f8eadc9d53b1a2a39032aed109d
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe278e3..d1ea91b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ PKG_CHECK_MODULES([GOBJECT], [gobject-2.0])
+ PKG_CHECK_MODULES([SAPI],[sapi < 2.0.0])
+ AC_ARG_VAR([GDBUS_CODEGEN],[The gdbus-codegen executable.])
+-AC_PATH_PROG([GDBUS_CODEGEN], [`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`])
++AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen])
+ if test -z "$GDBUS_CODEGEN"; then
+ AC_MSG_ERROR([*** gdbus-codegen is required to build tpm2-abrmd])
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 5151d6c..ca59e55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Since-Debian-source-package-did-not-contain-.git-fil.patch
+0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch
--
2.19.1
>From 7ab18976f5ba2576625fb15c0856a386c018e77a Mon Sep 17 00:00:00 2001
From: Simon McVittie <[email protected]>
Date: Wed, 10 Oct 2018 09:03:25 +0100
Subject: [PATCH 3/3] Non-maintainer upload
---
debian/changelog | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 3a0ab22..612e3c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+tpm2-abrmd (1.3.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * d/p/0002-Fix-gdbus-codegen-lookup-for-recent-versions-of-GLib.patch:
+ Apply patch from upstream to make the build system compatible with
+ recent GLib versions. In older GLib versions,
+ `$PKG_CONFIG --variable=gdbus_codegen gio-2.0` always returned
+ "gdbus-codegen", but in newer versions or when GLib was built with
+ Meson it returns the absolute path to gdbus-codegen, which is not a
+ valid input to AC_PATH_PROG. (Closes: #910340)
+ * d/rules: Use dbus-run-session to give unit tests a temporary
+ session bus. This means that tss2-tcti-tabrmd_unit does not have to
+ be skipped. (Closes: #910341)
+ - d/p/0002-remove-unit-test-needs-dbus-daemon.patch:
+ Remove, no longer needed
+
+ -- Simon McVittie <[email protected]> Wed, 10 Oct 2018 08:46:43 +0100
+
tpm2-abrmd (1.3.1-1) unstable; urgency=low
* Initial release (Closes: #885774)
--
2.19.1
--- End Message ---
