tor

commit 77c47417f20f5cdc18b495999c6e9e89536cb7e8
parent 5363d9b118def1a6c2d2bf431fbcdcf3f588b0db
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri, 29 Oct 2021 09:20:21 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

Diffstat:
M
Makefile.am
 | 
4
++++
A
changes/ticket26299
 | 
3
+++
M
doc/asciidoc-helper.sh
 | 
4
+++-
A
doc/nofooter.conf
 | 
3
+++

4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
@@ -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)"
diff --git a/changes/ticket26299 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
@@ -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
@@ -0,0 +1,3 @@
+# There is a single space on the footer-text line to make it reproducible.
+[footer-text]
+