Source: trousers
Version: 0.3.15-0.2
I am NMUing trousers again because my last NMU introduced an error.
The debdiff for the new version 0.3.15-0.2 is attached.
diff -Nru trousers-0.3.15/debian/changelog trousers-0.3.15/debian/changelog
--- trousers-0.3.15/debian/changelog 2022-04-12 19:21:33.000000000 +0200
+++ trousers-0.3.15/debian/changelog 2022-04-13 16:42:37.000000000 +0200
@@ -1,3 +1,17 @@
+trousers (0.3.15-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Remove invalid lintian override
+ * Adjust trousers.postinst check for tcsd.conf mode (Closes: #1009630)
+ * Remove "extra" priority (inherits "optional")
+ * Revert the init script but use -e /dev/tpm0 over wildcard (Closes:
#1009635)
+ * d/rules: Remove useless override target
+ * debhelper: Update to v13, getting rid of unnecessary build dependencies
+ * 06-host_name_max.patch: Replace implementation-specific import with
unistd.h
+ * Consistently use $USER variable in init script (Closes: #808812)
+
+ -- Bastian Germann <b...@debian.org> Wed, 13 Apr 2022 16:42:37 +0200
+
trousers (0.3.15-0.1) unstable; urgency=medium
* Non-maintainer upload
diff -Nru trousers-0.3.15/debian/compat trousers-0.3.15/debian/compat
--- trousers-0.3.15/debian/compat 2016-11-20 16:10:31.000000000 +0100
+++ trousers-0.3.15/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -Nru trousers-0.3.15/debian/control trousers-0.3.15/debian/control
--- trousers-0.3.15/debian/control 2021-06-14 23:19:13.000000000 +0200
+++ trousers-0.3.15/debian/control 2022-04-13 16:42:37.000000000 +0200
@@ -2,9 +2,7 @@
Section: admin
Priority: optional
Maintainer: Pierre Chifflier <pol...@debian.org>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- autotools-dev (>= 20100122.1),
+Build-Depends: debhelper-compat (= 13),
libssl-dev,
libtool,
pkg-config
@@ -13,6 +11,7 @@
Package: trousers
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6), tpm-udev
Breaks: udev (<< 136-1)
Description: open-source TCG Software Stack (daemon)
@@ -29,7 +28,6 @@
Package: trousers-dbg
Architecture: any
Section: debug
-Priority: extra
Depends:
${misc:Depends}, trousers (= ${binary:Version}),
libtspi1 (= ${binary:Version}), libtspi-dev (= ${binary:Version})
diff -Nru trousers-0.3.15/debian/libtspi1.lintian-overrides
trousers-0.3.15/debian/libtspi1.lintian-overrides
--- trousers-0.3.15/debian/libtspi1.lintian-overrides 2016-11-20
16:10:31.000000000 +0100
+++ trousers-0.3.15/debian/libtspi1.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# trousers license is BSD
-libtspi1: possible-gpl-code-linked-with-openssl
diff -Nru trousers-0.3.15/debian/not-installed
trousers-0.3.15/debian/not-installed
--- trousers-0.3.15/debian/not-installed 1970-01-01 01:00:00.000000000
+0100
+++ trousers-0.3.15/debian/not-installed 2022-04-13 16:42:37.000000000
+0200
@@ -0,0 +1 @@
+usr/lib/*/libtspi.la
diff -Nru trousers-0.3.15/debian/patches/06-host_name_max.patch
trousers-0.3.15/debian/patches/06-host_name_max.patch
--- trousers-0.3.15/debian/patches/06-host_name_max.patch 2016-11-20
16:10:31.000000000 +0100
+++ trousers-0.3.15/debian/patches/06-host_name_max.patch 2022-04-13
16:42:37.000000000 +0200
@@ -6,7 +6,7 @@
#define HOST_NAME_MAX 64
#endif
-+#include <bits/posix1_lim.h>
++#include <unistd.h>
#include "trousers/tss.h"
#include "trousers/trousers.h"
#include "trousers_types.h"
diff -Nru trousers-0.3.15/debian/rules trousers-0.3.15/debian/rules
--- trousers-0.3.15/debian/rules 2021-06-14 23:15:06.000000000 +0200
+++ trousers-0.3.15/debian/rules 2022-04-13 16:42:37.000000000 +0200
@@ -3,16 +3,10 @@
export DH_VERBOSE = 1
%:
- dh ${@} --with autoreconf
+ dh ${@}
override_dh_auto_configure:
dh_auto_configure -- --with-gui=none
-override_dh_auto_install:
- dh_auto_install
-
-override_dh_install:
- dh_install -X.la --fail-missing --sourcedir=debian/tmp
-
override_dh_strip:
dh_strip --dbg-package=trousers-dbg
diff -Nru trousers-0.3.15/debian/trousers.init
trousers-0.3.15/debian/trousers.init
--- trousers-0.3.15/debian/trousers.init 2022-04-12 19:21:33.000000000
+0200
+++ trousers-0.3.15/debian/trousers.init 2022-04-13 16:42:37.000000000
+0200
@@ -29,7 +29,7 @@
start)
log_daemon_msg "Starting $DESC" "$NAME"
- if [ "$(echo /dev/tpm*)" != "/dev/tpm*" ]
+ if [ ! -e /dev/tpm0 ]
then
log_warning_msg "device driver not loaded, skipping."
exit 0
@@ -37,9 +37,9 @@
for tpm_dev in /dev/tpm*; do
TPM_OWNER=$(stat -c %U $tpm_dev)
- if [ "x$TPM_OWNER" != "xtss" ]
+ if [ "x$TPM_OWNER" != "x$USER" ]
then
- log_warning_msg "TPM device owner for $tpm_dev
is not 'tss', this can cause problems."
+ log_warning_msg "TPM device owner for $tpm_dev
is not $USER, this can cause problems."
fi
done
diff -Nru trousers-0.3.15/debian/trousers.lintian-overrides
trousers-0.3.15/debian/trousers.lintian-overrides
--- trousers-0.3.15/debian/trousers.lintian-overrides 2016-11-20
16:10:31.000000000 +0100
+++ trousers-0.3.15/debian/trousers.lintian-overrides 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# trousers license is BSD
-trousers: possible-gpl-code-linked-with-openssl
diff -Nru trousers-0.3.15/debian/trousers.postinst
trousers-0.3.15/debian/trousers.postinst
--- trousers-0.3.15/debian/trousers.postinst 2021-06-14 23:25:54.000000000
+0200
+++ trousers-0.3.15/debian/trousers.postinst 2022-04-13 16:42:37.000000000
+0200
@@ -5,10 +5,10 @@
case "${1}" in
configure)
# Setting owner
- chown tss:tss /etc/tcsd.conf
+ chown root:tss /etc/tcsd.conf
# Setting permissions
- chmod 0600 /etc/tcsd.conf
+ chmod 0640 /etc/tcsd.conf
;;
abort-upgrade|abort-remove|abort-deconfigure)
