Debian Bug report logs - #1006860
pcp: reproducible-builds: binary paths are embedded differently on usrmerge vs. non-usrmerge systems

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Vagrant Cascadian <vagrant@reproducible-builds.org>

To: submit@bugs.debian.org

Subject: pcp: reproducible-builds: binary paths are embedded differently on usrmerge vs. non-usrmerge systems

Date: Sun, 06 Mar 2022 16:01:55 -0800

[Message part 1 (text/plain, inline)]

Source: pcp
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: usrmerge
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The paths to various binaries are embedded with different paths when
built on a usrmerge system vs. a non-usrmerge system:

  https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/pcp.html

  ./usr/include/pcp/builddefs

  SED»    =·/bin/sed
  vs.
  SED»    =·/usr/bin/sed


The attached patch fixes this by passing configuration options and
variables to specify the paths to various binaries, using their
non-usrmerge locations, as compatibility symlinks generally exist for
one way, but not for the other.


This patch does not address all reproducibility issues, but should
reduce the size of the diff, making it easier to identify remaining
issues.


Thanks for maintaining pcp!


live well,
  vagrant

[0002-debian-rules-Pass-binary-paths-to-configure-to-make-.patch (text/x-diff, inline)]

From 59b60433afc99f39a272732def01e36bd8251173 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 6 Mar 2022 18:52:55 +0000
Subject: [PATCH 2/3] debian/rules: Pass binary paths to configure to make the
 package build reproducibly regardless of usrmerge.

The binary paths for gzip, tar, sed, echo, qmake, true and bzip2
should all point to their non-usrmerge locations.

https://tests.reproducible-builds.org/debian/issues/paths_vary_due_to_usrmerge_issue.html
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 587e11c..2f99e21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,7 +141,7 @@ configure_tools = export DEBUG=-DNDEBUG QT_SELECT=5;
 #       ... Makepkgs uses the latter mechanism to refine the configure
 #       options
 #
-configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default
+configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default --with-zip=/bin/gzip --with-tar=/bin/tar SED=/bin/sed ECHO=/bin/echo QMAKE=/usr/bin/qmake MAKEDEPEND=/bin/true BZIP2=/bin/bzip2
 
 checkdir = test -f debian/rules
 uninstall = cat debian/*.install | sed -e "s,^,$(dirpcp)/," | xargs rm -f
-- 
2.30.2

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 1006860-close@bugs.debian.org (full text, mbox, reply):

From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>

To: 1006860-close@bugs.debian.org

Subject: Bug#1006860: fixed in pcp 5.3.7-1

Date: Tue, 05 Apr 2022 01:34:59 +0000

Source: pcp
Source-Version: 5.3.7-1
Done: Nathan Scott <nathans@debian.org>

We believe that the bug you reported is fixed in the latest version of
pcp, 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 1006860@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Nathan Scott <nathans@debian.org> (supplier of updated pcp 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: Tue, 05 Apr 2022 09:12:16 +1000
Source: pcp
Architecture: source
Version: 5.3.7-1
Distribution: unstable
Urgency: low
Maintainer: PCP Development Team <pcp@groups.io>
Changed-By: Nathan Scott <nathans@debian.org>
Closes: 1006860 1006861 1006864
Changes:
 pcp (5.3.7-1) unstable; urgency=low
 .
   * New release (full details in CHANGELOG).
   * Updates for reproducible-builds (closes: #1006860, #1006861, #1006864)
Checksums-Sha1:
 fc20ed998bd1a45572e82c9fd90a6d9c5e67ed58 5045 pcp_5.3.7-1.dsc
 cf1a7e856a803d04fb1f0dec8cad2f429f06178c 43551206 pcp_5.3.7.orig.tar.gz
 1193c58f249e21cb573dfde3913bb23daa8d0c0b 25696 pcp_5.3.7-1.debian.tar.xz
 f0a8ca479acb4ae4c1c8a415055f0d09321ad69b 14257 pcp_5.3.7-1_source.buildinfo
Checksums-Sha256:
 86a33b8a90a8e3403e9dbc55459ed3335ae94d1b5f62e980271ad23496152829 5045 pcp_5.3.7-1.dsc
 1b508320082ab422a9b654d1ba4777248d85cf0344e16e6c29f84d174a0d9dc1 43551206 pcp_5.3.7.orig.tar.gz
 5758e47a00aefa8afc237637ac6daff21112feb812440c3a7e9e430e7fbb2a73 25696 pcp_5.3.7-1.debian.tar.xz
 58e835e405e6c228a8361c5ddc98584e3b913101fd43965d5bf2ea98d10b5e74 14257 pcp_5.3.7-1_source.buildinfo
Files:
 4d0c51fe5152bb388cfd01c1938444e8 5045 utils extra pcp_5.3.7-1.dsc
 e9216f9f7825b7ad47c365c62c550711 43551206 utils extra pcp_5.3.7.orig.tar.gz
 04ce857fb09f52d456ccff7fd4445886 25696 utils extra pcp_5.3.7-1.debian.tar.xz
 f1343edf44b91b17781ef956aa4550de 14257 utils extra pcp_5.3.7-1_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE96vodh5v5oY45ig6/ghC7jbdjAwFAmJLlmgACgkQ/ghC7jbd
jAzNHBAAyUjTjfcYXiMsprJobXuT2MxRdZDAYbBIlgtcZeOXw9gOlm5CJuLc+/U5
lmfkhxbu5G4o3T3FunM9Wj4eoPVVBYteSmFLH0Gflj62JrRBYfNbNB/QR3c0mI9W
eKCUx1huhuTqA3QnTVVmjwVBEyToPaQnSMhliby8A6fnP2RFh90wto8k3EJ0FVmD
K6QSic5caT5Lq8DKlmXmyE/7m+QPgeyyeDIK4fnm4pcqdqDmIHIuYLhktSDcIPt/
ViWUgH3zqBNsZPkt4E2qI1mPK6cSsO5aycpvBHIf3rtxi6EA+GZQhBfe04Zicyeu
PUqdBMhM1Aa0RdvptOFTGLE5Rvd9ViOmmjUwHeDE3TfkLi6sCc9BjNpAjPAw4jnX
GAQdTZCLLvi0yhvtoug4qc2ircE0oVvv7vFt8QhIsB9TDJfLgc26eD5JukwniQZz
AxSLRba0oagIenlYeicJnTGOBMGhgeTSi6K9c7CsQg8z6ggECgGTkJ12AJj1hZeS
5dTIeUBIdc2T4MmeSCBlccAuVvJRv6aGBJLGqB2Bs9cb+0iQEVnJ0Rfibyjtj3Lb
htG8NLL2a/CDc8AIieSU74Irx7SX+wcKkQi94xo1N2Hqeazn5F9499DGVOCsEwN6
DIwtglhMaVR6KRW3/bQTJffc0Sq6nndfj5/YAKcD4vlI1Ziw644=
=vFmb
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.