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

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963 Merge: 07d8d398c d9cc2b292 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:35 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] CI: Fix Appveyor printf format error
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 09:20:28 2020 -0400 CI: Fix Appveyor printf format error For some reasons, Appveyor started to use the stdio printf format for 64 bit values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows specific macros by setting D__USE_MINGW_ANSI_STDIO=0. Fixes #40026 --- .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 461eacb4a..03cf2f69f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'" Execute-Bash "V=1 make -k -j2" Execute-Bash "V=1 make -k -j2 install" } diff --git a/changes/ticket40026 b/changes/ticket40026 new file mode 100644 index 000000000..f87c2964e --- /dev/null +++ b/changes/ticket40026 @@ -0,0 +1,3 @@ + o Minor bugfix (CI, Windows): + - Don't use stdio 64 bit printf format when compiling with MINGW on + Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963 Merge: 07d8d398c d9cc2b292 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:35 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit a213d2793860240b315f372159311f307aed68ca Merge: 5a5ff3d8c 19d579e8c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:36 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] CI: Fix Appveyor printf format error
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit d9cc2b2928eab045f89d0abf95a9e5c75e290ff8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 7 09:20:28 2020 -0400 CI: Fix Appveyor printf format error For some reasons, Appveyor started to use the stdio printf format for 64 bit values (PRIu64, ...). Mingw doesn't like that so force it to use the Windows specific macros by setting D__USE_MINGW_ANSI_STDIO=0. Fixes #40026 --- .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 461eacb4a..03cf2f69f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening} CFLAGS='-D__USE_MINGW_ANSI_STDIO=0'" Execute-Bash "V=1 make -k -j2" Execute-Bash "V=1 make -k -j2 install" } diff --git a/changes/ticket40026 b/changes/ticket40026 new file mode 100644 index 000000000..f87c2964e --- /dev/null +++ b/changes/ticket40026 @@ -0,0 +1,3 @@ + o Minor bugfix (CI, Windows): + - Don't use stdio 64 bit printf format when compiling with MINGW on + Appveyor. Fixes bug 40026; bugfix on 0.3.5.5-alpha.

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963 Merge: 07d8d398c d9cc2b292 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:35 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit a213d2793860240b315f372159311f307aed68ca Merge: 5a5ff3d8c 19d579e8c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:36 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 07 Jul '20

07 Jul '20

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5 Merge: 05ca50c9a a213d2793 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jul 7 14:48:36 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Add correct exclusions to Doxyfile.in.
by nickm＠torproject.org 07 Jul '20

07 Jul '20

commit bc63f59f3c45c61296aac94411f9ab73cfbda322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 7 10:24:24 2020 -0400 Add correct exclusions to Doxyfile.in. Now that we have src/ext/ext.md (since b0a716dfb0a73920ac4f), we don't want to have src/ext excluded in its entirety. Like a smart person, when I added src/ext/ext.md, I edited Doxyfile, forgetting that it is generated from Doxyfile.in. :/ This should fix travis builds. --- Doxyfile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index 503c1302d..4374e5485 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -863,7 +863,8 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = ./src/ext \ +EXCLUDE = ./src/ext/ed25519 \ + ./src/ext/rust \ ./src/trunnel \ ./src/test \ ./src/rust/registry

1 0

[tor/master] Fix coccinelle complaint in test_config.c
by asn＠torproject.org 07 Jul '20

07 Jul '20

commit 1ee748e4ca80b6708e737b76184c0fb9980d55cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 6 15:17:47 2020 -0400 Fix coccinelle complaint in test_config.c --- src/test/test_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 045dbde0d..765db03c0 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6413,11 +6413,13 @@ test_config_getinfo_config_names(void *arg) tor_free(answer); } +#ifndef COCCI #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } #define CONFIG_TEST_SETUP(suffix, name, flags, setup, setup_data) \ { #name#suffix, test_config_ ## name, flags, setup, setup_data } +#endif struct testcase_t config_tests[] = { CONFIG_TEST(adding_trusted_dir_server, TT_FORK),

1 0