mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse source
This commit is contained in:
David Goulet 2021-10-29 09:20:21 -04:00
commit 77c47417f2
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -739,3 +739,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)"

3
changes/ticket26299 Normal file
View file

@ -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.

4
doc/asciidoc-helper.sh
View file

@ -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;

3
doc/nofooter.conf Normal file
View file

@ -0,0 +1,3 @@
# There is a single space on the footer-text line to make it reproducible.
[footer-text]