- tor-commits - lists.torproject.org

[tor/release-0.4.6] release: Patches to make tarball reproducible
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit d37273be0dc5f3b6b9fb30b95ba3978772f30dd4 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Jul 10 02:31:35 2020 +0200 release: Patches to make tarball reproducible Closes #26299 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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] +

1 0

[tor/release-0.4.6] release: Patches to make tarball reproducible
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 11fedab9cec75293485f2bf89e47d73de074ce73 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Jul 10 02:31:35 2020 +0200 release: Patches to make tarball reproducible Closes #26299 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 765850a125..10604d31cf 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] +

1 0

[tor/release-0.4.6] makefile: Add a reproducible dist make job
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 8da8105ee2f6b17aa3c3243eb8c406b509296802 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 16:29:22 2021 -0400 makefile: Add a reproducible dist make job Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3056b08446..c889945d5a 100644 --- 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)"

1 0

[tor/release-0.4.6] changes: Add file for ticket 26299
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 92fedb9f448555abbbde6ac5c73b9de0a2ba7932 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:19:21 2021 -0400 changes: Add file for ticket 26299 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26299 | 3 +++ 1 file changed, 3 insertions(+) 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.

1 0

[tor/release-0.4.6] changes: Add file for ticket 26299
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit f5bd5754011e06803ee7866d6fbd01933658ff9f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:19:59 2021 -0400 changes: Add file for ticket 26299 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26299 | 3 +++ 1 file changed, 3 insertions(+) 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.

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 41c7646d695e9f9bc9e333c936c3333e7db1abf8 Merge: 27738a9cba 3ebf217009 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:20:21 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 Makefile.am | 4 ++++ changes/ticket26299 | 3 +++ doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] makefile: Add a reproducible dist make job
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 8cf6f9183c4cb8bbf6431f07c433eb7ab37a638d Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 16:29:22 2021 -0400 makefile: Add a reproducible dist make job Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) 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)"

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 3ebf21700988132f5936383840a323bb4cab39dc Merge: f5bd575401 92fedb9f44 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:20:21 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 9da81112aea69302b670451c7963e5ac1c7e4203 Merge: 74599cdb31 77c47417f2 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:20:21 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 Makefile.am | 4 ++++ changes/ticket26299 | 3 +++ doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 29 Oct '21

29 Oct '21

commit 77c47417f20f5cdc18b495999c6e9e89536cb7e8 Merge: 5363d9b118 3ebf217009 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Oct 29 09:20:21 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 Makefile.am | 4 ++++ changes/ticket26299 | 3 +++ doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-)

1 0