Debian Bug report logs - #990969
lxml: reproducible-builds: Build path embedded in documentation

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: lxml: reproducible-builds: Build path embedded in documentation

Date: Sun, 11 Jul 2021 13:43:58 -0700

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

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

The version is derived from the build directory name, which gets
embedded into the changes-VERSION.html file:

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

  usr/share/doc/python-lxml/html/changes-4.6.3+dfsg.html
  vs.
  usr/share/doc/python-lxml/html/changes-2nd.html

The attached patch changes debian/rules to use DEB_UPSTREAM_VERSION from
dpkg's pkg-info.mk instead of deriving the upstream version from the
build directory.


Unfortunately, there are other build path related issues in binaries,
but this significantly reduces the diff between builds.


Thanks for maintaining lxml!


live well,
  vagrant

[0003-Use-DEB_VERSION_UPSTREAM-from-dpkg-pkg-info.mk-to-pa.patch (text/x-diff, inline)]

From 95c022663849bc83ad5f76ef7be17809494b8bfb Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sun, 11 Jul 2021 20:15:53 +0000
Subject: [PATCH 3/3] Use DEB_VERSION_UPSTREAM from dpkg/pkg-info.mk to pass
 the upstream version to doc/mkhtml.py.

Assuming that the build directory contains the package name and
version will result in different builds dependent on the build path.
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 466e936..9c1e0d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 PY3VERS	:= $(shell py3versions -vs)
 PY3VER	:= $(shell py3versions -vd)
 
-UPSTREAMVER := $(subst lxml-,,$(notdir $(CURDIR)))
+include /usr/share/dpkg/pkg-info.mk
 
 # Some locales trigger reproducibility issues in html documentation
 export LC_ALL=C.UTF-8
@@ -29,7 +29,7 @@ build3-stamp: $(PY3VERS:%=build3-python%) $(PY3VERS:%=dbg-build3-python%)
 build3-python%: prebuild
 	python$* setup.py build
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
-	python$* doc/mkhtml.py doc/html . $(UPSTREAMVER)
+	python$* doc/mkhtml.py doc/html . $(DEB_VERSION_UPSTREAM)
 endif
 	touch $@
 dbg-build3-python%: prebuild
-- 
2.32.0

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

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

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

To: 990969-close@bugs.debian.org

Subject: Bug#990969: fixed in lxml 4.6.3+dfsg-1

Date: Wed, 15 Sep 2021 11:33:37 +0000

Source: lxml
Source-Version: 4.6.3+dfsg-1
Done: Matthias Klose <doko@debian.org>

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

Debian distribution maintenance software
pp.
Matthias Klose <doko@debian.org> (supplier of updated lxml 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: Wed, 15 Sep 2021 12:46:13 +0200
Source: lxml
Architecture: source
Version: 4.6.3+dfsg-1
Distribution: unstable
Urgency: medium
Maintainer: Matthias Klose <doko@debian.org>
Changed-By: Matthias Klose <doko@debian.org>
Closes: 990865 990952 990969 994308
Changes:
 lxml (4.6.3+dfsg-1) unstable; urgency=medium
 .
   * Stop building the python3-lxml-dbg package. Closes: #994308.
   * Only build documentation for the default Python version; build documentation
     for the currently built version of lxml (Sebastian Ramacher).
     Closes: #990865.
   * Do not embed timestamps in html documentation (Vagrant Cascadian).
     Closes: #990952.
   * Don't embed the build path in the documentation (Vagrant Cascadian).
     Closes: #990969.
   * Set LC_ALL and LANG to C.UTF-8 to avoid reproducibility issues when
     generating html. (Vagrant Cascadian). Closes: #990969.
Checksums-Sha1:
 31ac6780d1cd8e5b84003dfbf060180ddac3cafb 1967 lxml_4.6.3+dfsg-1.dsc
 6dba9ddbd2f60d48b6a2c926153b0e96ece5a209 8152 lxml_4.6.3+dfsg-1.debian.tar.xz
 3caa703d739fd1513b17e4e72a1d58737d35d407 8584 lxml_4.6.3+dfsg-1_source.buildinfo
Checksums-Sha256:
 b17f239ac858e9188ab586a94a2d3b0d83acd5940550c355f609a49c646b37f8 1967 lxml_4.6.3+dfsg-1.dsc
 266f8e9b080c04c4f71d449f53689f19f4ff7d610b26f20f39087e8fd76e4e24 8152 lxml_4.6.3+dfsg-1.debian.tar.xz
 36674c49214785497f126ba0c6374a65083746440e2a4554b1ce5ef3eff3add6 8584 lxml_4.6.3+dfsg-1_source.buildinfo
Files:
 34e84a090de85914029ce9b5d9c95cd3 1967 python optional lxml_4.6.3+dfsg-1.dsc
 c7c129b8bd00b99ef65e77778c169dc5 8152 python optional lxml_4.6.3+dfsg-1.debian.tar.xz
 52fbcd5a15bcec6c793c192c54b8182a 8584 python optional lxml_4.6.3+dfsg-1_source.buildinfo

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

iQJEBAEBCAAuFiEE1WVxuIqLuvFAv2PWvX6qYHePpvUFAmFB08UQHGRva29AZGVi
aWFuLm9yZwAKCRC9fqpgd4+m9aoiD/9ERqT8K4FoEqtIKWHhYdTEsWh67FNvVQMb
GUCCjOVlxMWNjnR8JgrCE6AqJi7cDbduzTrTTgkr/tKrm0UUzghua4yhbWodtzGk
4cUmPOc3MYF5L/fZwYSJdQfV6NzLYB7gNIIHoJ+siOjsET0TerNR9OAom9jQ7+6v
oGDi3vk/6FTyWQjH/whSiTCFq77l2fkLPMqUJLZo6bdhrmsBEQI2wapXpQU2mb7q
Sy/cKWZcaq/fS4dXbyHAJIVNC9hMd8UJwFO4Z1BGUFRXfe2HOBMkPJMoBkKNc6em
lLsA49Z/OrNo8N+syTFiMekoSrybC+/wS9+/lVU4SVIjRSCKk29+SJn2qcuvmavf
71A+SHJlMfv5/nSXVtc4zaDrRDAFN3fw6XFfTfom/hIR6paJMtt4KTqtjou99w67
hsICxVVIx7dXqDk80w6tOifTHKx8rlC/WAVKp2OcG4Q1r4dGZDcMOobc77oiIRBx
XKK6zDKMcaIm4I13A4m/tj2L7ohcN5ajZ+39M/LeyScMWGaZ/BRqbaWw3UmRmje3
w5MPP0nVDldbNhaWAWeyq6ZM7AttkGyQ/zTzXo8MD+IX/nrAv3Kx0xn6VmMyEXuI
s26kxx+lbS7PcxM05SUHzQYED3EbMPBzAAYOEQbPhQssb7vtwaLvGKDQ9K7Zvj9P
IJIQL2tgew==
=p3qv
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.