Your message dated Sun, 17 Feb 2019 05:51:18 +0000
with message-id <[email protected]>
and subject line Bug#921513: fixed in sphinx 1.8.4-1
has caused the Debian Bug report #921513,
regarding sphinx: please make the build reproducible
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
921513: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921513
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: sphinx
Version: 1.8.3-2
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: buildpath toolchain
X-Debbugs-Cc: [email protected]
Hi,
Whilst working on the Reproducible Builds effort [0], we noticed
that sphinx could generate output that is not reproducible.
In particular, the graphviz extension module would construct
filenames based on, inter alia, the contents of the `options`
dictionary.
As this contained the absolute build path of the source file
embedded in the `docname` variable this meant that builds of
documentation were not independent of where on a filesystem they
were built from.
Example filenames might be:
- html/_images/graphviz-9e71e0f9ba91d0842b51211b676ec4adb7e7afb8.png
+ html/_images/graphviz-6241bbfd7ac6bd4e2ad9af451ab0dfb8719988d2.png
We fix this by limiting how much of the `docname` variable ends up
in the final constructed filename; I assume there is a good reason
for including the `options` dictionary in the first place, otherwise
we could simply omit it.
[0] https://reproducible-builds.org
(Patch attached.)
Regards,
--
,''`.
: :' : Chris Lamb
`. `'` [email protected] 🍥 chris-lamb.co.uk
`-
diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py
index c9b1541..820a693 100644
--- a/sphinx/ext/graphviz.py
+++ b/sphinx/ext/graphviz.py
@@ -216,7 +216,9 @@ def render_dot(self, code, options, format,
prefix='graphviz'):
# type: (nodes.NodeVisitor, unicode, Dict, unicode, unicode) ->
Tuple[unicode, unicode]
"""Render graphviz code into a PNG or PDF output file."""
graphviz_dot = options.get('graphviz_dot',
self.builder.config.graphviz_dot)
- hashkey = (code + str(options) + str(graphviz_dot) +
+ options_for_hash = options.copy()
+ options_for_hash = path.basename(options_for_hash.pop('docname', ''))
+ hashkey = (code + str(options_for_hash) + str(graphviz_dot) +
str(self.builder.config.graphviz_dot_args)).encode('utf-8')
fname = '%s-%s.%s' % (prefix, sha1(hashkey).hexdigest(), format)
--- End Message ---
--- Begin Message ---
Source: sphinx
Source-Version: 1.8.4-1
We believe that the bug you reported is fixed in the latest version of
sphinx, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Dmitry Shachnev <[email protected]> (supplier of updated sphinx 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 16 Feb 2019 16:55:01 +0300
Source: sphinx
Binary: python-sphinx python3-sphinx sphinx-common sphinx-doc libjs-sphinxdoc
Architecture: source
Version: 1.8.4-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Python Modules Team
<[email protected]>
Changed-By: Dmitry Shachnev <[email protected]>
Description:
libjs-sphinxdoc - JavaScript support for Sphinx documentation
python-sphinx - documentation generator for Python projects (implemented in
Pytho
python3-sphinx - documentation generator for Python projects (implemented in
Pytho
sphinx-common - documentation generator for Python projects - common data
sphinx-doc - documentation generator for Python projects - documentation
Closes: 921513
Changes:
sphinx (1.8.4-1) unstable; urgency=medium
.
* New upstream release.
* Ensure the graphviz filenames are reproducible (closes: #921513).
* Bump year in debian/copyright.
Checksums-Sha1:
27becb776ae4b9e4bda1a4edb6c4d49cf6b625a7 4016 sphinx_1.8.4-1.dsc
ca77a4b3a63db251e1a14823d6095592cf05088d 5754841 sphinx_1.8.4.orig.tar.gz
302ee958dadd02656fae4194a0d9ef4c26d958c9 833 sphinx_1.8.4.orig.tar.gz.asc
5ede76984f145601adc5855f958d94cb44b5a526 36844 sphinx_1.8.4-1.debian.tar.xz
1f3a4dbe8ca0c850bf9fcdb4300b336037a19128 5744 sphinx_1.8.4-1_source.buildinfo
Checksums-Sha256:
c2990df91e387bdb4664d9baf1c9a3eb7d336eb53c4dc7e2d00ba6824f98c2f7 4016
sphinx_1.8.4-1.dsc
c1c00fc4f6e8b101a0d037065043460dffc2d507257f2f11acaed71fd2b0c83c 5754841
sphinx_1.8.4.orig.tar.gz
3b64557d12c432b806210f3f505b323c6b9fcf59f080cc50dbd99253b78dc931 833
sphinx_1.8.4.orig.tar.gz.asc
1d4036ad0c056f9fe7a398f491d1c0f61a35963067032ad83d88df9b1ca64830 36844
sphinx_1.8.4-1.debian.tar.xz
2f801c04173088d0c13f1a5f6ab9dbdc74ed60f422136c7e855657991cb482f3 5744
sphinx_1.8.4-1_source.buildinfo
Files:
2143f27c29784cffe66137c938a5562a 4016 python optional sphinx_1.8.4-1.dsc
8466f512322e81ef2f4da4d1ba61ff2f 5754841 python optional
sphinx_1.8.4.orig.tar.gz
8f47ab437e78980c142de4e602aee2b5 833 python optional
sphinx_1.8.4.orig.tar.gz.asc
78b5c0478e5734c31699ab55c1e0d4e1 36844 python optional
sphinx_1.8.4-1.debian.tar.xz
29212ea71021f05799724d74e5451daa 5744 python optional
sphinx_1.8.4-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJHBAEBCgAxFiEE8kKZ/xu8kBi5BqTLYCaTbS8ciuAFAlxob8cTHG1pdHlhNTdA
ZGViaWFuLm9yZwAKCRBgJpNtLxyK4H3FEACHg08Su17yaN7WhREVKAyarZFv5k4m
zCgpbgCxVcMkiaHBXGqCElMIZlX/Iu7ifyU+HLcRKjTz09z9NHMH25HkqlKVxdc+
7LjD+b01MYfiKPuMEbOede9xciENhb4s+H5OqwsJychkeHNMizZT8U0mEirrqcCt
LTPwoQFUAp5jtgP2iyu1ks3HHDw0EriYMzyAlOYIBT4FcRTOh1FTjJf0uTv6i5Kd
PcbP3S679zZkBo8VIISbROqkvthehx+bE9B5g0Bw7HHitHXscVXtPSM4cuXeHhzE
N6SjZk/av4gt8oRr41bVfyk9Oytqo9wybe8ZK4v+B35tTPRUREineliT7h/FvRF1
c1WXQ3Xr1E2e/OaOfCjrcYOaBcTWjl42IKFx09tmLI4j56Ry8XQcec+EAFPev850
6+4r6ZLc5a0HPOGDOeLmwGfQn6mlzj4akmnd/ZSD0Ns6Gw0H1qxw+RUxlEQVWNGY
Ao3jxuHP255EK/9dh9l+jruKEycciD0K2O3XLAuSBCwJEYNV0QwE6l5VibeU0HcI
1eLE8+m0YejOUdahzcCi9tjSVGAIaZwSw2DRp+6FBHhRiAH8cDNEMdK7BTKW4Vih
nNh0uJ+MCHgEXhKX/Oofnv+8BYJ6IJEB1f3eTzc/aERXQtUWZ/c+U1puxG6C493V
Eng4V0sdhySL2A==
=JvcV
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
Python-modules-team mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/python-modules-team
