mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge branch 'maint-0.4.5' into maint-0.4.6
This commit is contained in:
@@ -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)"
|
||||
|
||||
@@ -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.
|
||||
@@ -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;
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
# There is a single space on the footer-text line to make it reproducible.
|
||||
[footer-text]
|
||||
|
||||
Reference in New Issue
Block a user