January 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Use -lresolv in LIBS with rust on OSX.
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 2ac9734bd21f3eecb20560cde5c4037230029157 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 14:02:24 2018 -0500 Use -lresolv in LIBS with rust on OSX. This fixes issue #24652, and is a workaround for Rust issue https://github.com/rust-lang/rust/issues/46797 . --- Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ad2ceb66a..a126986f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif diff --git a/changes/bug24652 b/changes/bug24652 new file mode 100644 index 000000000..6e35e259e --- /dev/null +++ b/changes/bug24652 @@ -0,0 +1,6 @@ + o Minor bugfixes (build, compatibility, rust, OSX): + + - When building with Rust on OSX, link against libresolv, to + work around the issue at + https://github.com/rust-lang/rust/issues/46797. Fixes bug + 24652; bugfix on 0.3.1.1-alpha. diff --git a/configure.ac b/configure.ac index 1bd782eb8..6bfbc2326 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,15 @@ if test "x$enable_rust" = "xyes"; then fi fi + dnl This is a workaround for #46797 + dnl (a.k.a https://github.com/rust-lang/rust/issues/46797 ). Once the + dnl upstream bug is fixed, we can remove this workaround. + case "$host_os" in + darwin*) + TOR_RUST_EXTRA_LIBS="-lresolv" + ;; + esac + dnl For now both MSVC and MinGW rust libraries will output static libs with dnl the MSVC naming convention. if test "$bwin32" = "true"; then @@ -460,6 +469,8 @@ if test "x$enable_rust" = "xyes"; then fi fi +AC_SUBST(TOR_RUST_EXTRA_LIBS) + AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl])

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 Merge: db5aa54a4 2ac9734bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:35:52 2018 -0500 Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2 Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 7e96767825f2c6bd60c1c4beae98e5158b1bdc15 Merge: dbea64aab 0cb89eb82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:35:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Use -lresolv in LIBS with rust on OSX.
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 2ac9734bd21f3eecb20560cde5c4037230029157 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 14:02:24 2018 -0500 Use -lresolv in LIBS with rust on OSX. This fixes issue #24652, and is a workaround for Rust issue https://github.com/rust-lang/rust/issues/46797 . --- Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ad2ceb66a..a126986f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif diff --git a/changes/bug24652 b/changes/bug24652 new file mode 100644 index 000000000..6e35e259e --- /dev/null +++ b/changes/bug24652 @@ -0,0 +1,6 @@ + o Minor bugfixes (build, compatibility, rust, OSX): + + - When building with Rust on OSX, link against libresolv, to + work around the issue at + https://github.com/rust-lang/rust/issues/46797. Fixes bug + 24652; bugfix on 0.3.1.1-alpha. diff --git a/configure.ac b/configure.ac index 1bd782eb8..6bfbc2326 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,15 @@ if test "x$enable_rust" = "xyes"; then fi fi + dnl This is a workaround for #46797 + dnl (a.k.a https://github.com/rust-lang/rust/issues/46797 ). Once the + dnl upstream bug is fixed, we can remove this workaround. + case "$host_os" in + darwin*) + TOR_RUST_EXTRA_LIBS="-lresolv" + ;; + esac + dnl For now both MSVC and MinGW rust libraries will output static libs with dnl the MSVC naming convention. if test "$bwin32" = "true"; then @@ -460,6 +469,8 @@ if test "x$enable_rust" = "xyes"; then fi fi +AC_SUBST(TOR_RUST_EXTRA_LIBS) + AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl])

1 0

[tor/master] Use -lresolv in LIBS with rust on OSX.
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 2ac9734bd21f3eecb20560cde5c4037230029157 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 4 14:02:24 2018 -0500 Use -lresolv in LIBS with rust on OSX. This fixes issue #24652, and is a workaround for Rust issue https://github.com/rust-lang/rust/issues/46797 . --- Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ad2ceb66a..a126986f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif diff --git a/changes/bug24652 b/changes/bug24652 new file mode 100644 index 000000000..6e35e259e --- /dev/null +++ b/changes/bug24652 @@ -0,0 +1,6 @@ + o Minor bugfixes (build, compatibility, rust, OSX): + + - When building with Rust on OSX, link against libresolv, to + work around the issue at + https://github.com/rust-lang/rust/issues/46797. Fixes bug + 24652; bugfix on 0.3.1.1-alpha. diff --git a/configure.ac b/configure.ac index 1bd782eb8..6bfbc2326 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,15 @@ if test "x$enable_rust" = "xyes"; then fi fi + dnl This is a workaround for #46797 + dnl (a.k.a https://github.com/rust-lang/rust/issues/46797 ). Once the + dnl upstream bug is fixed, we can remove this workaround. + case "$host_os" in + darwin*) + TOR_RUST_EXTRA_LIBS="-lresolv" + ;; + esac + dnl For now both MSVC and MinGW rust libraries will output static libs with dnl the MSVC naming convention. if test "$bwin32" = "true"; then @@ -460,6 +469,8 @@ if test "x$enable_rust" = "xyes"; then fi fi +AC_SUBST(TOR_RUST_EXTRA_LIBS) + AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl])

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 Merge: db5aa54a4 2ac9734bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:35:52 2018 -0500 Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2 Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7 Merge: 01adeb247 0cb89eb82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:36:48 2018 -0500 Merge branch 'maint-0.3.2' Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --cc Makefile.am index 2c6de3574,a126986f3..04ca88a23 --- a/Makefile.am +++ b/Makefile.am @@@ -26,7 -26,8 +26,8 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/ endif if USE_RUST - rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \ ++rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif diff --cc configure.ac index e471f8f91,0fdb84c13..9bb09b2df --- a/configure.ac +++ b/configure.ac @@@ -479,9 -467,10 +488,11 @@@ if test "x$enable_rust" = "xyes"; the if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then AC_MSG_ERROR([rustc must be at least version 1.14]) fi + AC_MSG_RESULT([$RUSTC_VERSION]) fi + AC_SUBST(TOR_RUST_EXTRA_LIBS) + AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl])

1 0

[tor/master] Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 Merge: db5aa54a4 2ac9734bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:35:52 2018 -0500 Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2 Makefile.am | 3 ++- changes/bug24652 | 6 ++++++ configure.ac | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'stack_em_up'
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 01adeb2471360f4c832252d8b9b9a05ab212a76c Merge: d8c1c70d7 81aec1449 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 13:31:29 2018 -0500 Merge branch 'stack_em_up' src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Compute flavor name before dereference, to avoid a STACK warning.
by nickm＠torproject.org 16 Jan '18

16 Jan '18

commit 81aec1449b2c765c395c9f5920c287500e747488 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 11:31:03 2018 -0500 Compute flavor name before dereference, to avoid a STACK warning. (See 24423) --- src/or/networkstatus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index deef62bd4..aa0a8d15c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2077,6 +2077,7 @@ networkstatus_note_certs_arrived(const char *source_dir) { int i; for (i=0; i<N_CONSENSUS_FLAVORS; ++i) { + const char *flavor_name = networkstatus_get_flavor_name(i); consensus_waiting_for_certs_t *waiting = &consensus_waiting_for_certs[i]; if (!waiting->consensus) continue; @@ -2084,7 +2085,7 @@ networkstatus_note_certs_arrived(const char *source_dir) char *waiting_body = waiting->body; if (!networkstatus_set_current_consensus( waiting_body, - networkstatus_get_flavor_name(i), + flavor_name, NSSET_WAS_WAITING_FOR_CERTS, source_dir)) { tor_free(waiting_body);

1 0