summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-03 18:44:13 +0000
committerNick Mathewson <nickm@torproject.org>2016-07-05 12:38:24 -0400
commit3f33a5b1e7c0be15e37a07ffb301ad746b4b8839 (patch)
tree24b47e1d7579ed961178a7149935dc88b89c3bfc
parentf4408747d3e8de35f6beaf37535315b907c87656 (diff)
downloadtor-3f33a5b1e7c0be15e37a07ffb301ad746b4b8839.tar.gz
tor-3f33a5b1e7c0be15e37a07ffb301ad746b4b8839.zip
Run asciidoc in UTC timezone for build reproducibility.
asciidoc adds a timestamp at the end of a generated HTML file. This timestamp is based on the date of the file but it can change depending on the TZ environment variable.
-rw-r--r--changes/asciidoc-UTC4
-rwxr-xr-xdoc/asciidoc-helper.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC
new file mode 100644
index 0000000000..21fbfc1d67
--- /dev/null
+++ b/changes/asciidoc-UTC
@@ -0,0 +1,4 @@
+ o Minor bugfixes (build):
+ - When building manual pages, set the timezone to "UTC", so that the
+ output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha.
+ Patch from intrigeri.
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index c06b57026b..a3ef53f884 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then
base=${output%%.html.in}
if [ "$2" != none ]; then
- "$2" -d manpage -o $output $input;
+ TZ=UTC "$2" -d manpage -o $output $input;
else
echo "==================================";
echo;