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

[tor/maint-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/maint-0.4.2] configure: Clarify the description of --disable-module-dirauth
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 5ff99901d29fe0645edf5f5cfc1d15e2ca6f4686 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 15:32:21 2019 +1000 configure: Clarify the description of --disable-module-dirauth Part of 32123. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f610fb0a0..0540ffb40 100644 --- a/configure.ac +++ b/configure.ac @@ -258,7 +258,7 @@ 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 an authority]), + [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]))

1 0

[tor/maint-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/maint-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/master] 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/master] 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/master] configure: Clarify the description of --disable-module-dirauth
by nickm＠torproject.org 18 Oct '19

18 Oct '19

commit 5ff99901d29fe0645edf5f5cfc1d15e2ca6f4686 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 15:32:21 2019 +1000 configure: Clarify the description of --disable-module-dirauth Part of 32123. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f610fb0a0..0540ffb40 100644 --- a/configure.ac +++ b/configure.ac @@ -258,7 +258,7 @@ 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 an authority]), + [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]))

1 0

[tor/master] 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/maint-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/master] 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