diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-29 09:20:21 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-29 09:20:21 -0400 |
| commit | f439d0fe4430a1d4c114afc788a1e03999a70e51 (patch) | |
| tree | d9dc57f95fb0c54ed2ceaacd850a30d40ea0d110 | |
| parent | e0a96cf2b6d2c21e0c8db0a285c0a86286e47821 (diff) | |
| parent | 92fedb9f448555abbbde6ac5c73b9de0a2ba7932 (diff) | |
| download | tor-f439d0fe4430a1d4c114afc788a1e03999a70e51.tar.gz tor-f439d0fe4430a1d4c114afc788a1e03999a70e51.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | changes/ticket26299 | 3 | ||||
| -rwxr-xr-x | doc/asciidoc-helper.sh | 4 | ||||
| -rw-r--r-- | doc/nofooter.conf | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c7bc514287..7cae870706 100644 --- a/Makefile.am +++ b/Makefile.am @@ -484,3 +484,7 @@ lsp: else \ echo "No bear command found. On debian, apt install bear"; \ fi + +# Reproducible tarball. We change the tar options for this. +dist-reprod: + $(MAKE) dist am__tar="$${TAR-tar} --format=gnu --owner=root --group=root --sort=name --mtime=\"`git show --no-patch --format='%ci'`\" -chof - $(distdir)" diff --git a/changes/ticket26299 b/changes/ticket26299 new file mode 100644 index 0000000000..6b08adf53c --- /dev/null +++ b/changes/ticket26299 @@ -0,0 +1,3 @@ + o Minor feature (reproducible build): + - The repository can now build reproducible tarballs which adds the build + command "make dist-reprod" for that purpose. Closes ticket 26299. diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index a3ef53f884..2b63154441 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -12,6 +12,8 @@ if [ $# != 3 ]; then exit 1; fi +export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct') + output=$3 if [ "$1" = "html" ]; then @@ -19,7 +21,7 @@ if [ "$1" = "html" ]; then base=${output%%.html.in} if [ "$2" != none ]; then - TZ=UTC "$2" -d manpage -o $output $input; + TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input"; else echo "=================================="; echo; diff --git a/doc/nofooter.conf b/doc/nofooter.conf new file mode 100644 index 0000000000..f16d76b2da --- /dev/null +++ b/doc/nofooter.conf @@ -0,0 +1,3 @@ +# There is a single space on the footer-text line to make it reproducible. +[footer-text] + |