October 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.2] configure: Interpret --disable-module-dirauth=no correctly
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit f59c4a094090e0c5cfe4c5a7aa3ffdc357fc95f0 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 16:04:39 2019 +1000 configure: Interpret --disable-module-dirauth=no correctly Fixes bug 32134; bugfix on 0.3.4.1-alpha. --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 0540ffb40..11d49df45 100644 --- a/configure.ac +++ b/configure.ac @@ -258,11 +258,11 @@ m4_define(MODULES, dirauth) dnl Directory Authority module. AC_ARG_ENABLE([module-dirauth], AS_HELP_STRING([--disable-module-dirauth], - [Build tor without the Directory Authority module: tor can not run as a directory authority or bridge authority]), - [], dnl Action if-given - AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], - [Compile with Directory Authority feature support])) -AM_CONDITIONAL(BUILD_MODULE_DIRAUTH, [test "x$enable_module_dirauth" != "xno"]) + [Build tor without the Directory Authority module: tor can not run as a directory authority or bridge authority])) +AM_CONDITIONAL(BUILD_MODULE_DIRAUTH,[test "x$enable_module_dirauth" != "xno"]) +AM_COND_IF(BUILD_MODULE_DIRAUTH, + AC_DEFINE([HAVE_MODULE_DIRAUTH], [1], + [Compile with Directory Authority feature support])) dnl Helper variables. TOR_MODULES_ALL_ENABLED=

1 0

[tor/master] Merge branch 'maint-0.4.2'
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 37320bce064730b111018d255009390d887a8a17 Merge: 264c5312e f0f3f3338 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:42:56 2019 -0400 Merge branch 'maint-0.4.2' changes/bug32124 | 7 +++++++ configure.ac | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-)

1 0

[tor/master] changes: file for 32124.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit b3fc3b609bb222ecbd1dd8a28993f3b19dc8bfd4 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 17:26:09 2019 +1000 changes: file for 32124. --- changes/bug32124 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug32124 b/changes/bug32124 new file mode 100644 index 000000000..164b33c7e --- /dev/null +++ b/changes/bug32124 @@ -0,0 +1,7 @@ + o Minor bugfixes (build system): + - Stop failing when jemalloc is requested, but tcmalloc is not found. + Fixes bug 32124; bugfix on 0.3.5.1-alpha. + - Interpret --disable-module-dirauth=no correctly. + Fixes bug 32124; bugfix on 0.3.4.1-alpha. + - Interpret --with-tcmalloc=no correctly. + Fixes bug 32124; bugfix on 0.2.0.20-rc.

1 0

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit f0f3f3338e220f773b4921215f3c9955f5601a7c Merge: 0994050c4 b3fc3b609 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:42:49 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2 changes/bug32124 | 7 +++++++ configure.ac | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-)

1 0

[tor/release-0.4.2] changes: file for 32124.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit b3fc3b609bb222ecbd1dd8a28993f3b19dc8bfd4 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 17:26:09 2019 +1000 changes: file for 32124. --- changes/bug32124 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug32124 b/changes/bug32124 new file mode 100644 index 000000000..164b33c7e --- /dev/null +++ b/changes/bug32124 @@ -0,0 +1,7 @@ + o Minor bugfixes (build system): + - Stop failing when jemalloc is requested, but tcmalloc is not found. + Fixes bug 32124; bugfix on 0.3.5.1-alpha. + - Interpret --disable-module-dirauth=no correctly. + Fixes bug 32124; bugfix on 0.3.4.1-alpha. + - Interpret --with-tcmalloc=no correctly. + Fixes bug 32124; bugfix on 0.2.0.20-rc.

1 0

[tor/release-0.4.2] configure: Interpret --with-tcmalloc=no correctly
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 4442eef0b3d308008992ae71fcd78ba52f305cd7 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 17:16:32 2019 +1000 configure: Interpret --with-tcmalloc=no correctly Fixes bug 32124; bugfix on 0.2.0.20-rc. --- configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 11d49df45..da74042dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1894,8 +1894,7 @@ if test "$tor_cv_uint8_uchar" = "no"; then fi AC_ARG_WITH(tcmalloc, -AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc]), -[ tcmalloc=yes ], [ tcmalloc=no ]) +AS_HELP_STRING(--with-tcmalloc, [use tcmalloc memory allocation library. Deprecated; see --with-malloc])) default_malloc=system @@ -1904,7 +1903,7 @@ if test "x$enable_openbsd_malloc" = "xyes" ; then default_malloc=openbsd fi -if test "x$tcmalloc" = "xyes"; then +if test "x$with_tcmalloc" = "xyes"; then AC_MSG_NOTICE([The --with-tcmalloc argument is deprecated; use --with-malloc=tcmalloc instead.]) default_malloc=tcmalloc fi

1 0

[tor/release-0.4.2] configure: Stop failing when jemalloc is requested, but tcmalloc is not found
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit ac71ad662c80c034517dc882703f735df0648e21 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 17:18:52 2019 +1000 configure: Stop failing when jemalloc is requested, but tcmalloc is not found Fixes bug 32124; bugfix on 0.3.5.1-alpha. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index da74042dc..b8b745e98 100644 --- a/configure.ac +++ b/configure.ac @@ -1934,7 +1934,7 @@ AS_CASE([$malloc], have_jemalloc=yes, have_jemalloc=no) - if test "x$have_tcmalloc" = "xno" ; then + if test "x$have_jemalloc" = "xno" ; then AC_MSG_ERROR([Unable to find jemalloc requested by --with-malloc, $pkg_config_user_action, or set JEMALLOC_CFLAGS and JEMALLOC_LIBS.]) fi

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 00ad6f12fb910223e42bbd9d41ed131075ed49a2 Merge: 8b27498f1 f0f3f3338 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:42:56 2019 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32124 | 7 +++++++ configure.ac | 17 ++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.4.2] Handle errors from execve() in the Unix process backend more gracefully.
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 85b4a5c27659a7d162c2e476e1e0dfbeefd73095 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 17 16:39:05 2019 +0200 Handle errors from execve() in the Unix process backend more gracefully. This patch removes a call to tor_assert_unreached() after execve() failed. This assertion leads to the child process emitting a stack trace on its standard output, which makes the error harder for the user to demystify, since they think it is an internal error in Tor instead of "just" being a "no such file or directory" error. The process will now instead output "Error from child process: X" where X is the stringified version of the errno value. See: https://bugs.torproject.org/31810 --- changes/bug31810 | 4 ++++ src/lib/process/process_unix.c | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug31810 b/changes/bug31810 new file mode 100644 index 000000000..628d12f09 --- /dev/null +++ b/changes/bug31810 @@ -0,0 +1,4 @@ + o Minor bugfixes (process management): + - Remove assertion in the Unix process backend. This assertion would trigger + when a new process is spawned where the executable is not found leading to + a stack trace from the child process. Fixes bug 31810; bugfix on 0.4.0.1-alpha. diff --git a/src/lib/process/process_unix.c b/src/lib/process/process_unix.c index 332b432c5..8191bdc1f 100644 --- a/src/lib/process/process_unix.c +++ b/src/lib/process/process_unix.c @@ -253,22 +253,15 @@ process_unix_exec(process_t *process) process_environment_t *env = process_get_environment(process); /* Call the requested program. */ - retval = execve(argv[0], argv, env->unixoid_environment_block); + execve(argv[0], argv, env->unixoid_environment_block); /* If we made it here it is because execve failed :-( */ - if (-1 == retval) - fprintf(stderr, "Call to execve() failed: %s", strerror(errno)); - tor_free(argv); process_environment_free(env); - tor_assert_unreached(); - error: - /* LCOV_EXCL_START */ fprintf(stderr, "Error from child process: %s", strerror(errno)); _exit(1); - /* LCOV_EXCL_STOP */ } /* We are in the parent process. */

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 0994050c4a766fad94ce5108e99d18b0a6200e5f Merge: 57c4af16f 95e3527df Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 18 12:32:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2 changes/bug31810 | 4 ++++ scripts/maint/practracker/exceptions.txt | 2 +- src/lib/process/process_unix.c | 9 +-------- src/lib/process/process_win32.c | 18 ++++++++++++++++++ src/test/test_process_slow.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-)

1 0