--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: usermode: reproducible build (usrmerge): Embeds full path to fdformat in usermount binary
- From: Andreas Henriksson <andreas@fatal.se>
- Date: Wed, 28 Nov 2018 21:55:19 +0100
- Message-id: <20181128205519.iqivdoglzxg2p7jd@fatal.se>
Package: usermode
Version: 1.109-1
Severity: normal
Tags: patch
User: md@linux.it
Usertags: usrmerge
Dear Maintainer,
The reproducible build spotted a difference in your package when
built on a usrmerged system vs a non-merged system:
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/usermode.html
It seems usermount contains the full path of 'fdformat' (et.al.) found via
AC_PROG_PATH during build.
Unlike other similar cases, the usermode configure.ac specifies its
own PATHs to search (rather than relyin on $PATH from environment).
While explicitly passing in paths to search as an argument it orders
/bin and /sbin before /usr/bin and /usr/sbin respectively (opposite
to how PATH is normally configured).
This makes tools always be found via /bin or /sbin (which are symlinks
to /usr/bin and /usr/sbin or merged-usr systems), thus the fdformat
path ends up as /sbin/fdformat on a merged-usr system. As the tool
really lives at /usr/sbin/fdformat, the result thus differs on a
merged-usr system vs a non-merged one.
Another possible way to fix this is to change the directory ordering
for fdformat in configure.ac, but that makes several assumptions:
- other distributions places things the same way we do (or don't
care because they've already made usrmerge mandatory).
- no tool will be moved in the future
I thus don't think this is a good idea and it's probably a better
idea to just explicitly specifying the paths we want and expect
explicitly at configure time.
The attached patch fixes the problem by explicitly specifying
the default path via MOUNT, UMOUNT, MKFS, FDFORMAT variables
passed to configure as documented in AC_PROG_PATH documentation.
Regards,
Andreas Henriksson
diff -Nru usermode-1.109/debian/changelog usermode-1.109/debian/changelog
--- usermode-1.109/debian/changelog 2012-03-08 02:01:51.000000000 +0100
+++ usermode-1.109/debian/changelog 2018-11-28 21:41:25.000000000 +0100
@@ -1,3 +1,12 @@
+usermode (1.109-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Explicitly set paths for fdformat, et.al. to avoid relying
+ on automatically finding them through path. This fixes
+ reproducible builds on merged-usr vs non-merged systems.
+
+ -- Andreas Henriksson <andreas@fatal.se> Wed, 28 Nov 2018 21:41:25 +0100
+
usermode (1.109-1) unstable; urgency=low
* New maintainer (Closes: #583242).
diff -Nru usermode-1.109/debian/rules usermode-1.109/debian/rules
--- usermode-1.109/debian/rules 2012-03-08 02:01:51.000000000 +0100
+++ usermode-1.109/debian/rules 2018-11-28 21:40:43.000000000 +0100
@@ -6,6 +6,13 @@
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ MOUNT=/bin/mount \
+ UMOUNT=/bin/umount \
+ MKFS=/sbin/mkfs \
+ FDFORMAT=/usr/bin/fdformat
+
override_dh_install: user_icon.xpm password.xpm disks.xpm
dh_install
# this functionality doesn't appear to be supported in Debian
--- End Message ---
--- Begin Message ---
Source: usermode
Source-Version: 1.109-3
We believe that the bug you reported is fixed in the latest version of
usermode, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 914933@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Andreas Henriksson <andreas@fatal.se> (supplier of updated usermode package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 05 Jan 2019 19:13:42 +0100
Source: usermode
Binary: usermode
Architecture: source
Version: 1.109-3
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Andreas Henriksson <andreas@fatal.se>
Description:
usermode - Graphical tools for certain user account management tasks
Closes: 914933
Changes:
usermode (1.109-3) unstable; urgency=medium
.
* QA upload.
* Explicitly set paths to fdformat, et.al. instead of looking them
up on the build system. (Closes: #914933)
* Fix lintian command-in-menu-file-and-desktop-file by dropping
the debian/menu file.
* Fix lintian dep5-copyright-license-name-not-unique by making
a single licence entry in debian/copyright.
Checksums-Sha1:
d2dbc9bb9fb811495bc1ad4ae8b2579045596f88 2043 usermode_1.109-3.dsc
735bf4b5b2f918be45c447647bd8cfa17e1b8ed0 5464 usermode_1.109-3.debian.tar.xz
38f2a6f00f625b833d653cf02cf3c0c09f778c3a 12183 usermode_1.109-3_amd64.buildinfo
Checksums-Sha256:
e6e70f84cd96daed1ee5215f26a6d8f01bc216d64acdd1e95f8f5874ff11fbd7 2043 usermode_1.109-3.dsc
36d792800d8f4d3fc290d90d4bf5febc2e58ee2dc24dabc67e2de5bbd0a07c4c 5464 usermode_1.109-3.debian.tar.xz
d5455095210bf1387f7aff3421c3070e6422aad9bbc226b3913149da41d6c161 12183 usermode_1.109-3_amd64.buildinfo
Files:
2eecf151db7816af55a62e68ac8a5cd9 2043 x11 optional usermode_1.109-3.dsc
e24a15e7e1766f3edb1e2e8435e3bebd 5464 x11 optional usermode_1.109-3.debian.tar.xz
3569e1e0b0c544b57aebf9dbbd18bf0d 12183 x11 optional usermode_1.109-3_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCgAvFiEE+uHltkZSvnmOJ4zCC8R9xk0TUwYFAlww97oRHGFuZHJlYXNA
ZmF0YWwuc2UACgkQC8R9xk0TUwZZSw/+NCVVo0iiLLaZLrb4Fdy0oyBHv3h3k6xM
N+xwdRLzCNx/APjR4wPtv6gF68LCNZU2Fw0022sM0+fMAjUbzdG6NLIxTPhbCAQW
3K5A0bvMK4YmAqJmaoNI99aG/Ymbab/d/A9EMvdqFCuMg0aU0KLD8hn6qLF+fRfp
XJ4wFprwZnoG144pkxCcMQZJsNkJjVt+q5sry67Kid54QaquML2WGA7vLdmghf5o
2EqIl138HhuvYS3tVMw0c7iNcBnGYEQsO2yhzQ/JFzGVNPfnAvaR1Ndo3hGikuY4
kHWDIK/RtlKiQ7entglfdZnlaiBFpk52USwmbN9MEq6QPk8eKDVrwxjFax0VgBop
0kqbppiAykSBiFir24VYoArQWgWz8Dui6Q9IJUwzgtLXnYGzjlpbGhQQg9dhkSJ2
FgIb36LE5AntYxDwpbLTqJXLGtuqj5bdWecbLF6BV3L+HCukhdDae5rXaJy7967g
hvwgL0XNE/dyie7iiOhPXTaN91Pd2pYXnMbAEGLE6HoqmpdiKsdU5OlOu7i1IL+H
fHleE8fxzyD5RukJAIWHc6/3yl9+kO+XKVb1Z1sFjfRekqaOOSbPxPor204NCV2W
xC8dC8795izaJTRirm2Elx0xWwjbITAUpfKGlcH3Hzuk+It8qpgpAT2i/DQcJVoc
nhKJpANaqr4=
=Rvtb
-----END PGP SIGNATURE-----
--- End Message ---