Your message dated Thu, 25 May 2023 19:03:29 +0000
with message-id <e1q2gff-00f3zc...@respighi.debian.org>
and subject line unblock swtpm
has caused the Debian Bug report #1036772,
regarding unblock: swtpm/0.7.1-1.3
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1036772: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036772
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Control: affects -1 + src:swtpm
X-Debbugs-Cc: sw...@packages.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package swtpm.
[ Reason ]
Fix for RC bugs #1035460 and #1036101.
[ Impact ]
FTBFS and missing dependency.
[ Tests ]
Added autopkgtest to the package.
The FTBFS was only on mipsel, supposedly because the autobuilder machines are
not fast enough for upstream's timeout.
They built it successfully after doubling it.
[ Risks ]
None.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock swtpm/0.7.1-1.3
diff -Nru swtpm-0.7.1/debian/changelog swtpm-0.7.1/debian/changelog
--- swtpm-0.7.1/debian/changelog 2022-02-22 08:50:30.000000000 +0100
+++ swtpm-0.7.1/debian/changelog 2023-05-18 19:52:09.000000000 +0200
@@ -1,3 +1,26 @@
+swtpm (0.7.1-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Revert "Remove essential Depends: adduser"
+
+ -- Bastian Germann <b...@debian.org> Thu, 18 May 2023 19:52:09 +0200
+
+swtpm (0.7.1-1.2) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Patch: Increase poll timeout (Closes: #1036101)
+ * Add autopkgtest
+ * Remove essential Depends: adduser
+
+ -- Bastian Germann <b...@debian.org> Thu, 18 May 2023 19:16:12 +0200
+
+swtpm (0.7.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * swtpm-dev: Add missing Depends: swtpm-libs (#1035460)
+
+ -- Bastian Germann <b...@debian.org> Fri, 12 May 2023 19:06:09 +0200
+
swtpm (0.7.1-1) unstable; urgency=medium
* New upstream version 0.7.1
diff -Nru swtpm-0.7.1/debian/control swtpm-0.7.1/debian/control
--- swtpm-0.7.1/debian/control 2022-02-22 08:50:30.000000000 +0100
+++ swtpm-0.7.1/debian/control 2023-05-18 19:30:13.000000000 +0200
@@ -39,7 +39,8 @@
Package: swtpm-dev
Architecture: any
-Depends: ${misc:Depends}
+Depends: swtpm-libs (= ${binary:Version}),
+ ${misc:Depends}
Description: Include files for the TPM emulator's CUSE interface
The swtpm-dev package provides include files for developing clients
controlling the CUSE TPM through ioctls.
diff -Nru swtpm-0.7.1/debian/patches/increase-poll-timeout.patch
swtpm-0.7.1/debian/patches/increase-poll-timeout.patch
--- swtpm-0.7.1/debian/patches/increase-poll-timeout.patch 1970-01-01
01:00:00.000000000 +0100
+++ swtpm-0.7.1/debian/patches/increase-poll-timeout.patch 2023-05-18
17:57:46.000000000 +0200
@@ -0,0 +1,22 @@
+From e056a48128fe26af6e45675a13bee32700917c0f Mon Sep 17 00:00:00 2001
+From: Bastian Germann <b...@debian.org>
+Date: Thu, 18 May 2023 17:57:13 +0200
+Subject: Increase poll timeout
+
+---
+ src/swtpm_ioctl/tpm_ioctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/swtpm_ioctl/tpm_ioctl.c b/src/swtpm_ioctl/tpm_ioctl.c
+index 1ac1335..38c05bc 100644
+--- a/src/swtpm_ioctl/tpm_ioctl.c
++++ b/src/swtpm_ioctl/tpm_ioctl.c
+@@ -93,7 +93,7 @@
+ #endif
+
+ /* poll timeout that takes into account a busy swtpm creating a key */
+-#define DEFAULT_POLL_TIMEOUT 10000 /* ms */
++#define DEFAULT_POLL_TIMEOUT 20000 /* ms */
+
+ static unsigned long ioctl_to_cmd(unsigned long ioctlnum)
+ {
diff -Nru swtpm-0.7.1/debian/patches/series swtpm-0.7.1/debian/patches/series
--- swtpm-0.7.1/debian/patches/series 2022-02-22 08:12:41.000000000 +0100
+++ swtpm-0.7.1/debian/patches/series 2023-05-18 17:58:28.000000000 +0200
@@ -1,2 +1,3 @@
fix-typos.patch
+increase-poll-timeout.patch
move-conf-and-options-files-to-man5.patch
diff -Nru swtpm-0.7.1/debian/tests/commandline
swtpm-0.7.1/debian/tests/commandline
--- swtpm-0.7.1/debian/tests/commandline 1970-01-01 01:00:00.000000000
+0100
+++ swtpm-0.7.1/debian/tests/commandline 2023-05-18 19:03:02.000000000
+0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+export SWTPM_EXE=swtpm
+export SWTPM_IOCTL=swtpm_ioctl
+export SWTPM_BIOS=swtpm_bios
+export SWTPM_SETUP=swtpm_setup
+export SWTPM_CERT=swtpm_cert
+
+for t in tests/test_commandline
+do
+ $t
+done
diff -Nru swtpm-0.7.1/debian/tests/control swtpm-0.7.1/debian/tests/control
--- swtpm-0.7.1/debian/tests/control 1970-01-01 01:00:00.000000000 +0100
+++ swtpm-0.7.1/debian/tests/control 2023-05-18 19:01:58.000000000 +0200
@@ -0,0 +1,2 @@
+Tests: commandline
+Depends: @
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---