July 2016 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8d25ab6347910784ee100b6b4a784c7a6779277b Merge: 74cbbda 55d380f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:40:25 2016 -0400 Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8 changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Run asciidoc in UTC timezone for build reproducibility.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 3f33a5b1e7c0be15e37a07ffb301ad746b4b8839 Author: intrigeri <intrigeri(a)boum.org> Date: Sun Jul 3 18:44:13 2016 +0000 Run asciidoc in UTC timezone for build reproducibility. asciidoc adds a timestamp at the end of a generated HTML file. This timestamp is based on the date of the file but it can change depending on the TZ environment variable. --- changes/asciidoc-UTC | 4 ++++ doc/asciidoc-helper.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC new file mode 100644 index 0000000..21fbfc1 --- /dev/null +++ b/changes/asciidoc-UTC @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - When building manual pages, set the timezone to "UTC", so that the + output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha. + Patch from intrigeri. diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index c06b570..a3ef53f 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then base=${output%%.html.in} if [ "$2" != none ]; then - "$2" -d manpage -o $output $input; + TZ=UTC "$2" -d manpage -o $output $input; else echo "=================================="; echo;

1 0

[tor/release-0.2.8] sandboxing: allow open() of stats dir
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 2c4e78d95b2bc42c43ba09163e9c2d0744d9ac7b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 17:47:45 2016 +0200 sandboxing: allow open() of stats dir When sandboxing is enabled, we could not write any stats to disk. check_or_create_data_subdir("stats"), which prepares the private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. --- changes/bug19556 | 6 ++++++ src/or/main.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug19556 b/changes/bug19556 new file mode 100644 index 0000000..fb1e601 --- /dev/null +++ b/changes/bug19556 @@ -0,0 +1,6 @@ + o Minor bugfixes (sandboxing): + - When sandboxing is enabled, we could not write any stats to + disk. check_or_create_data_subdir("stats"), which prepares the + private stats directory, calls check_private_dir(), which also + opens and not just stats() the directory. Therefore, we need to + also allow open() for the stats dir in our sandboxing setup. diff --git a/src/or/main.c b/src/or/main.c index f585f0b..0562f84 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3568,6 +3568,7 @@ sandbox_init_filter(void) get_datadir_fname2("keys", "secret_onion_key_ntor.old")); STAT_DATADIR("keys"); + OPEN_DATADIR("stats"); STAT_DATADIR("stats"); STAT_DATADIR2("stats", "dirreq-stats"); }

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8d25ab6347910784ee100b6b4a784c7a6779277b Merge: 74cbbda 55d380f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:40:25 2016 -0400 Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8 changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.2.8] Note which bug this fixes in the changes entry
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 51b5d09c9406ad58a2ae45b036c381637379fc0a Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:04:33 2016 +0200 Note which bug this fixes in the changes entry --- changes/bug19556 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug19556 b/changes/bug19556 index fb1e601..f4ac894 100644 --- a/changes/bug19556 +++ b/changes/bug19556 @@ -4,3 +4,4 @@ private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. + Fixes bug 19556.

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit e512e6ca59ff86852e29ffe6fbb9d2bdb8688e82 Merge: 803fa75 8d25ab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:43:13 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/asciidoc-UTC | 4 ++++ changes/bug19556 | 7 +++++++ changes/bug19557 | 4 ++++ doc/asciidoc-helper.sh | 2 +- src/or/main.c | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.8] sandboxing: allow open() of stats dir
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 2c4e78d95b2bc42c43ba09163e9c2d0744d9ac7b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 17:47:45 2016 +0200 sandboxing: allow open() of stats dir When sandboxing is enabled, we could not write any stats to disk. check_or_create_data_subdir("stats"), which prepares the private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. --- changes/bug19556 | 6 ++++++ src/or/main.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug19556 b/changes/bug19556 new file mode 100644 index 0000000..fb1e601 --- /dev/null +++ b/changes/bug19556 @@ -0,0 +1,6 @@ + o Minor bugfixes (sandboxing): + - When sandboxing is enabled, we could not write any stats to + disk. check_or_create_data_subdir("stats"), which prepares the + private stats directory, calls check_private_dir(), which also + opens and not just stats() the directory. Therefore, we need to + also allow open() for the stats dir in our sandboxing setup. diff --git a/src/or/main.c b/src/or/main.c index f585f0b..0562f84 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3568,6 +3568,7 @@ sandbox_init_filter(void) get_datadir_fname2("keys", "secret_onion_key_ntor.old")); STAT_DATADIR("keys"); + OPEN_DATADIR("stats"); STAT_DATADIR("stats"); STAT_DATADIR2("stats", "dirreq-stats"); }

1 0

[tor/maint-0.2.8] Note which bug this fixes in the changes entry
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 51b5d09c9406ad58a2ae45b036c381637379fc0a Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:04:33 2016 +0200 Note which bug this fixes in the changes entry --- changes/bug19556 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug19556 b/changes/bug19556 index fb1e601..f4ac894 100644 --- a/changes/bug19556 +++ b/changes/bug19556 @@ -4,3 +4,4 @@ private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. + Fixes bug 19556.

1 0

[tor/maint-0.2.8] Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 74cbbda86e01a40e5cbf7889d5a5bc3445f68510 Merge: 3f33a5b 51b5d09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:39:40 2016 -0400 Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8 changes/bug19556 | 7 +++++++ src/or/main.c | 1 + 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.2.8] Run asciidoc in UTC timezone for build reproducibility.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 3f33a5b1e7c0be15e37a07ffb301ad746b4b8839 Author: intrigeri <intrigeri(a)boum.org> Date: Sun Jul 3 18:44:13 2016 +0000 Run asciidoc in UTC timezone for build reproducibility. asciidoc adds a timestamp at the end of a generated HTML file. This timestamp is based on the date of the file but it can change depending on the TZ environment variable. --- changes/asciidoc-UTC | 4 ++++ doc/asciidoc-helper.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/asciidoc-UTC b/changes/asciidoc-UTC new file mode 100644 index 0000000..21fbfc1 --- /dev/null +++ b/changes/asciidoc-UTC @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - When building manual pages, set the timezone to "UTC", so that the + output is reproducible. Fixes bug 19558; bugfix on 0.2.2.9-alpha. + Patch from intrigeri. diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index c06b570..a3ef53f 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -19,7 +19,7 @@ if [ "$1" = "html" ]; then base=${output%%.html.in} if [ "$2" != none ]; then - "$2" -d manpage -o $output $input; + TZ=UTC "$2" -d manpage -o $output $input; else echo "=================================="; echo;

1 0