Debian Bug report logs - #990912
perl-tk: reproducible-builds: incorrect path for X11 libraries when built on usrmerge system

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: perl-tk: reproducible-builds: incorrect path for X11 libraries when built on usrmerge system

Date: Sat, 10 Jul 2021 17:27:45 -0700

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

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

The path for X11 libraries is probed at build time, resulting in
different hard-coded values in the package:

  https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/amd64/diffoscope-results/perl-tk.html

  ./usr/lib/x86_64-linux-gnu/perl5/5.32/Tk/Config.pm

  $xlib·=·'-L/usr/lib/x86_64-linux-gnu·-lXft';
  vs.
  $xlib·=·'-L/lib/x86_64-linux-gnu·-lXft';


The attached patch passes X11LIB to Makefile.PL to always use the X11LIB
paths in /usr/lib, which are present on both usrmerge and non-usrmerge
systems.

Applying this patch should make perl-tk reproducible on
tests.reproducible-builds.org again.


Alternately, it might be better long-term to explore runtime detection,
though I'm not sure what other implications that might have.


Thanks for maintaining perl-tk!


live well,
  vagrant

[0001-debian-rules-Pass-X11LIB-to-Makefile.PL-to-ensure-co.patch (text/x-diff, inline)]

From 46ee46a258f8fda55e96d2dd602f0b29088e4915 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 11 Jul 2021 00:14:09 +0000
Subject: [PATCH] debian/rules: Pass X11LIB to Makefile.PL to ensure correct
 path.

On a usrmerge system with a /lib -> /usr/lib symlink, the path to X11
libraries gets hardcoded to the /lib path, but X11 libraries are
typically installed in /usr/lib.
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index ff16864..1ce2497 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
 
 PERL ?= /usr/bin/perl
 
@@ -22,7 +23,8 @@ endif
 config:	config-stamp
 config-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL XFT=1 INSTALLDIRS=vendor PERL=$(PERL)
+	# Pass X11LIB to ensure the correct path even on a usrmerge system
+	$(PERL) Makefile.PL XFT=1 INSTALLDIRS=vendor X11LIB=/usr/lib/$(DEB_HOST_MULTIARCH) PERL=$(PERL)
 	touch $@
 
 build-arch: build
-- 
2.32.0

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

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

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

To: 990912-close@bugs.debian.org

Subject: Bug#990912: fixed in perl-tk 1:804.035-1

Date: Sat, 22 Jan 2022 17:19:10 +0000

Source: perl-tk
Source-Version: 1:804.035-1
Done: Georges Khaznadar <georgesk@debian.org>

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

Debian distribution maintenance software
pp.
Georges Khaznadar <georgesk@debian.org> (supplier of updated perl-tk 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: SHA256

Format: 1.8
Date: Sat, 22 Jan 2022 16:45:08 +0100
Source: perl-tk
Architecture: source
Version: 1:804.035-1
Distribution: unstable
Urgency: medium
Maintainer: Georges Khaznadar <georgesk@debian.org>
Changed-By: Georges Khaznadar <georgesk@debian.org>
Closes: 990616 990912
Changes:
 perl-tk (1:804.035-1) unstable; urgency=medium
 .
   * adopted the package. Closes: #990616
     + declared myself as Maintainer
   * upgraded standards, debhelper-compat (=13), Standards-Version: 4.5.1
   * moved document list to debian/docs
   * modified debian/rules to use dh.
   * overrided dh_auto_test to use xvfb; added build-dependencies on xvfb,
     xauth
   * defined the path for X11 libs. Closes: #990912
Checksums-Sha1:
 08b4ff92647f1112b1c5f94c7d4fa9054f12fd20 1951 perl-tk_804.035-1.dsc
 aa50c99960cee7aa1d6079aed50311e807cf02a5 15260 perl-tk_804.035-1.debian.tar.xz
 f55728ecd1f0c6874026b056841b45bcb6ef53a9 8570 perl-tk_804.035-1_amd64.buildinfo
Checksums-Sha256:
 5d0d5decfb2757e4f6adad3cb12a20e6c1a3532ed47fc0c19cacc755ee93dcd3 1951 perl-tk_804.035-1.dsc
 cadea2c3b9f31d2bfad5f709123edf76fe0c4655af2a7540863024386b40d030 15260 perl-tk_804.035-1.debian.tar.xz
 796289a25a0247cad086187cc357ac04e9612ddae9e0bc76b566631afe9d8f6a 8570 perl-tk_804.035-1_amd64.buildinfo
Files:
 9ded75fce1be00eb9b3e9d0338ab92bf 1951 perl optional perl-tk_804.035-1.dsc
 4d53754b9a818322afa3e32b5973c550 15260 perl optional perl-tk_804.035-1.debian.tar.xz
 5097764613cf15120cd83c034fff0742 8570 perl optional perl-tk_804.035-1_amd64.buildinfo

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

iQIzBAEBCAAdFiEEM0CzZP9nFT+3zK6FHCgWkHE2rjkFAmHsOC8ACgkQHCgWkHE2
rjm0TQ/+J1XgrLOBDWfy1R3tU/NTdRF1RtcyZm/DyCSlMv8YN2Yeg3wYE4OG0weA
udTBfoc0tuVrVlJPLUi12mw8sA4nnixBZdIjKXJpu6ROLUEO/GAAMZa1dckC0YzF
2MNfkYmhWP69o39rHdtzovIIf5NZprCatoJpW771ko73pEjSmhLr8bn/OdyPWde4
Rk8n7T14bu7XN2oK8yp8On+ft4+1ZNc8+CY/5JR6+3L4QvNiR92zmGXRf5DYL7N3
Z/syITwGYA81QZKSaGeFZgAHMs8Yidp1QTPZLf6r0DAQprIU+QUXGxv7+wCsiuvj
2xmUeX0EDYEfyhghIyS1iAs1sbRPuWteHzyDqO2DVe/HrByvOpfASyfkTKM8TGrm
xzbmJWQx+/3hjXCFXEKtiGjZ6giuzzk4ZIUWWjzznvXKI146PQKPmANwtCzb/nEw
08Ouitc7GvEKpSAuqFMhXv8k0AkNHjzPFt/fQ6sZSBaCZ8Q2gIskQ1ccwP4Fdge4
u5ZF6cr9+TmHNAIYJz9NTJM/Po3vyue7CTNxBD184ZoRk/a0UGpFWFtKkQBt4zSH
5EqJ2vGIEZxLd9M2+hX6xcBDtq5JOZ92OpqytD1gQEDlH9IY8F6KQ7GdFM9LcLd+
Z5zYqAk1ZkecDy72qkd84cm9gGf1DnLzmBgiqW+M/jM9CzHfCNY=
=RE3n
-----END PGP SIGNATURE-----

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

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

To: 990912@bugs.debian.org

Subject: Re: Bug#990912: perl-tk: reproducible-builds: incorrect path for X11 libraries when built on usrmerge system

Date: Tue, 25 Jan 2022 22:21:44 -0800

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

Control: notfixed 990912 1:804.035-1
Control: tags 990912 +patch

The updates to debian/rules left the direct call to Makefile.PL with
arguments, followed by dh_auto_configure without arguments (which then
re-runs Makefile.PL without arguments, overwriting the effects of the
first call. Thus, the reproducible builds fix was ineffective, and the
other arguments passed are effectively ignored.

The attached patch fixes this by passing the arguments to
dh_auto_configure instead of Makefile.PL directly.


Applying this patch should make perl-tk reproducible on
tests.reproducible-builds.org again!


Thanks for maintaining perl-tk!


live well,
  vagrant

[0001-debian-rules-Pass-arguments-to-dh_auto_configure-ins.patch (text/x-diff, inline)]

From 10432710416708c7f15a98dff3e2bca5e9549f7f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Wed, 26 Jan 2022 05:56:39 +0000
Subject: [PATCH] debian/rules: Pass arguments to dh_auto_configure instead of
 calling Makefile.PL directly.

---
 debian/rules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 10d019e..5fe76d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,7 @@ override_dh_auto_clean:
 	dh_auto_clean
 
 override_dh_auto_configure:
-	$(PERL) Makefile.PL XFT=1 INSTALLDIRS=vendor X11LIB=/usr/lib/$(DEB_HOST_MULTIARCH) PERL=$(PERL)
-	dh_auto_configure
+	dh_auto_configure -- XFT=1 INSTALLDIRS=vendor X11LIB=/usr/lib/$(DEB_HOST_MULTIARCH) PERL=$(PERL)
 
 
 override_dh_auto_build:
-- 
2.30.2

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

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

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

To: 990912-close@bugs.debian.org

Subject: Bug#990912: fixed in perl-tk 1:804.035-2

Date: Thu, 27 Jan 2022 14:55:09 +0000

Source: perl-tk
Source-Version: 1:804.035-2
Done: Georges Khaznadar <georgesk@debian.org>

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

Debian distribution maintenance software
pp.
Georges Khaznadar <georgesk@debian.org> (supplier of updated perl-tk 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: SHA256

Format: 1.8
Date: Thu, 27 Jan 2022 14:48:24 +0100
Source: perl-tk
Architecture: source
Version: 1:804.035-2
Distribution: unstable
Urgency: medium
Maintainer: Georges Khaznadar <georgesk@debian.org>
Changed-By: Georges Khaznadar <georgesk@debian.org>
Closes: 990912
Changes:
 perl-tk (1:804.035-2) unstable; urgency=medium
 .
   * added VCS stuff (https://salsa.debian.org/georgesk/perl-tk)
   * included Vagrant Cascadian's patch. Closes: #990912
Checksums-Sha1:
 1377eb46c0f1c030771b3253dd9101a8442badfc 2090 perl-tk_804.035-2.dsc
 4f02d02436cc6fc5de5771831ef373c64cf8dd06 15324 perl-tk_804.035-2.debian.tar.xz
 edff56377ff3d55b98577318f1121cdc5cdb070b 8739 perl-tk_804.035-2_source.buildinfo
Checksums-Sha256:
 bb7c3a9d66aa1a0ba254b842554a99e3c1b7ab0dc654340b077584bf3e7acf4c 2090 perl-tk_804.035-2.dsc
 f7ca0a739df882d135b57e35bf13f25c2d2340e062e26797fe8fc00725989266 15324 perl-tk_804.035-2.debian.tar.xz
 35277fe1b359479920ea6ceae4dd2caff454eb2a4a95003a4e8892cc06d1a748 8739 perl-tk_804.035-2_source.buildinfo
Files:
 eb94d44c3499b4369fe1765c9eab39d8 2090 perl optional perl-tk_804.035-2.dsc
 8f2a3e0e1809a1d0f7cc35dcccc14829 15324 perl optional perl-tk_804.035-2.debian.tar.xz
 0a21a231e1ce87ecd066b3842f42857a 8739 perl optional perl-tk_804.035-2_source.buildinfo

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

iQJIBAEBCAAyFiEEM0CzZP9nFT+3zK6FHCgWkHE2rjkFAmHyo1oUHGdlb3JnZXNr
QGRlYmlhbi5vcmcACgkQHCgWkHE2rjkiyg/+LQozCUTMc5XuapXDGeJM41WD+8+d
6RxCkHwTXIJac6IynvsaAfqVgHCVoWf4JanpyOh03QyUK/9USFZe+9tTURccSa4w
fJY5gr/xSpN0eOlnu2OPF3iV42VUhu6kbesJOpIZQSJesMc3yQ3aQVih9x+IUA4F
oAQt/dYuJaIkjWDWyX4GbhFq8jlfqYefLHuo8kWXFNamf+mXKD2Dw71kCtcXeb5K
acuB2394lw56HV5SewW5UhL6yvRx/FUB7HADtbFuBUx4pVKeifDQiXKUwbuc8s28
pdS3OEdOfbj0NnXhYlOvZZ9MpwkjVyvuGSwOEgx1fg4VSklfylsQAabxaf7KdUY/
aZun/PmnrjqDx6BtItQqVokGK1+fomK5w5J+BVHhiJAqBCYkuMpim+fcA5IeknV7
W6jrg3/9Bz48+cQshUg1of6zfQIN0/6neB2CQX04DrD0E5ZXHCw4psV1JSrX3zL4
o83mGFiBRk+WDERUXxaQPramH4mMjPuW1raAq8mhqhfWyRzBVfXBEwlLjfpqngls
cNf9ZgfVAvFIsbnwxYyQ/Z5fj8w1Xhd0rya5s06RvT26uNP3ALIivA4gHHbi2xpi
d0ldrBloLKUeNHVgJBEdiS2EzB0CEE/7xuO4R3L01Ap+X5dn6imn5yORqPlOF1EH
4XnfDqNi2TjQeOY=
=+Qhn
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.