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

[tor/release-0.2.7] Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 7c3f210e709703a3ce3e36107166f67c31f4c8e1 Merge: c464a36 5521366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 9 10:14:59 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7 changes/geoip-october2015 | 3 + src/config/geoip | 7429 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 863 ++++-- 3 files changed, 5447 insertions(+), 2848 deletions(-)

1 0

[tor/release-0.2.7] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 552136668c29a469d72dc7020aedddc9e9c95df4 Merge: fb5a858 3569cff Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 9 10:14:46 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 changes/geoip-october2015 | 3 + src/config/geoip | 7429 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 863 ++++-- 3 files changed, 5447 insertions(+), 2848 deletions(-)

1 0

[tor/release-0.2.7] Fix compilation of sandbox.[ch] under musl-libc
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit a5ed8b1667156384483c12eb4f98d511c6dd2bd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:35:45 2015 -0400 Fix compilation of sandbox.[ch] under musl-libc Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347. --- changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000..487b132 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7..b995762 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6..21d517f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h>

1 0

[tor/release-0.2.7] tweak some changes files
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 551af4f97d37c7b4cff7a8557c1a1a647487b4cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 19 11:12:43 2015 -0400 tweak some changes files --- changes/bug17173-socket-hack-rv | 9 +-------- changes/bug17237_027 | 3 +-- changes/ifaddrs-tests-network-configs | 12 +++++------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv index c9f30d3..d513211 100644 --- a/changes/bug17173-socket-hack-rv +++ b/changes/bug17173-socket-hack-rv @@ -1,10 +1,3 @@ o Minor bug fixes (addresses, testing): - - Handle errors in get_interface_address6_via_udp_socket_hack by - returning an empty list (no addresses found). This bug was triggered - in ElectroBSD/FreeBSD jails. - - Ensure that either a valid address is returned in address pointers, - or that the address data is zeroed on error. - - Ensure that free_interface_address6_list handles NULL lists. - Add unit tests for get_interface_address* failure cases. - Fixes bug #17173. - Patch by fk/teor, not in any released version of tor. + Fixes bug 17173; bugfix on 0.2.7.3-rc. Patch by fk/teor. diff --git a/changes/bug17237_027 b/changes/bug17237_027 index 8448bb0..e5978d0 100644 --- a/changes/bug17237_027 +++ b/changes/bug17237_027 @@ -1,4 +1,3 @@ o Minor features (compilation): - Repair compilation with the most recent (unreleased, alpha) - vesions of OpenSSL 1.1. Fixes the 0.2.7-related part of - ticket 17237. + vesions of OpenSSL 1.1. Fixes part of ticket 17237. diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs index f7f3d3e..6b5ed4d 100644 --- a/changes/ifaddrs-tests-network-configs +++ b/changes/ifaddrs-tests-network-configs @@ -1,7 +1,5 @@ - o Minor fixes (unit tests, networking): - - Make get_ifaddrs_* unit tests more tolerant of different network - configurations: - - Don't assume every test box has an IPv4 address. - - Don't assume every test box has a non-localhost address. - - Closes ticket #17255. Patch by "teor". - Fix for unit tests released in 0.2.7.3. + o Minor bugfixes (testing): + - Make the get_ifaddrs_* unit tests more tolerant of different network + configurations. (Don't assume every test box has an IPv4 address, and + Don't assume every test box has a non-localhost address. + Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".

1 0

[tor/release-0.2.7] Add hidserv-stats filname to our sandbox filter
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 2ec5e24c58a08816ed2f09c8bd6301599bc2f2f7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Oct 15 13:38:12 2015 -0400 Add hidserv-stats filname to our sandbox filter Fixes #17354 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug17354 b/changes/bug17354 new file mode 100644 index 0000000..53da007 --- /dev/null +++ b/changes/bug17354 @@ -0,0 +1,4 @@ + o Minor bugfixes (sandbox): + - Add the "hidserv-stats" filename to our sandbox filter for the + HiddenServiceStatistics option to work properly. Fixes bug 17354; + bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/src/or/main.c b/src/or/main.c index e539222..df0cd1b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3018,6 +3018,7 @@ sandbox_init_filter(void) RENAME_SUFFIX2("stats", "exit-stats", ".tmp"); RENAME_SUFFIX2("stats", "buffer-stats", ".tmp"); RENAME_SUFFIX2("stats", "conn-stats", ".tmp"); + RENAME_SUFFIX2("stats", "hidserv-stats", ".tmp"); RENAME_SUFFIX("hashed-fingerprint", ".tmp"); RENAME_SUFFIX("router-stability", ".tmp");

1 0

[tor/release-0.2.7] Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 7e7683b254f8124e0115c9112488e47bff2b1d22 Merge: a5ed8b1 2ec5e24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 13:56:41 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7 changes/bug17354 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.2.7] Skip tests if backtrace support not compiled-in
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 5c95762ec6c8e43fe7bc5582fd43585076214ba4 Author: Marcin Cieślak <saper(a)saper.info> Date: Thu Sep 24 22:32:51 2015 +0000 Skip tests if backtrace support not compiled-in FreeBSD needs -lexecinfo to fully support backtrace reporting. --- src/test/test_bt.sh | 1 + src/test/test_bt_cl.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh index 56e6cc4..f55f451 100755 --- a/src/test/test_bt.sh +++ b/src/test/test_bt.sh @@ -3,6 +3,7 @@ exitcode=0 +"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77 "${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 "${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 01c621e..dabaee6 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -84,15 +84,24 @@ main(int argc, char **argv) if (argc < 2) { puts("I take an argument. It should be \"assert\" or \"crash\" or " - "\"none\""); + "\"backtraces\" or \"none\""); return 1; } + +#if !(defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ + defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)) + puts("Backtrace reporting is not supported on this platform"); + return 77; +#endif + if (!strcmp(argv[1], "assert")) { crashtype = 1; } else if (!strcmp(argv[1], "crash")) { crashtype = 0; } else if (!strcmp(argv[1], "none")) { crashtype = -1; + } else if (!strcmp(argv[1], "backtraces")) { + return 0; } else { puts("Argument should be \"assert\" or \"crash\" or \"none\""); return 1;

1 0

[tor/release-0.2.7] FreeBSD needs -lexecinfo to get backtrace()
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 00e15ba4772bb11c00e88f9e263966c856f1f275 Author: Marcin Cieślak <saper(a)saper.info> Date: Fri Sep 25 00:59:59 2015 +0000 FreeBSD needs -lexecinfo to get backtrace() --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index b190522..24de46e 100644 --- a/configure.ac +++ b/configure.ac @@ -360,6 +360,7 @@ AC_SEARCH_LIBS(socket, [socket network]) AC_SEARCH_LIBS(gethostbyname, [nsl]) AC_SEARCH_LIBS(dlopen, [dl]) AC_SEARCH_LIBS(inet_aton, [resolv]) +AC_SEARCH_LIBS(backtrace, [execinfo]) saved_LIBS="$LIBS" AC_SEARCH_LIBS([clock_gettime], [rt]) if test "$LIBS" != "$saved_LIBS"; then

1 0

[tor/release-0.2.7] Add changes file for bug17151
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit 546d70dc7c5c2fd6687d3aaa0ff3c52c6c7dc4de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 29 10:08:02 2015 +0200 Add changes file for bug17151 --- changes/bug17151 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug17151 b/changes/bug17151 new file mode 100644 index 0000000..0993b90 --- /dev/null +++ b/changes/bug17151 @@ -0,0 +1,7 @@ + o Minor bugfixes (portability): + - Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of + bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak. + + o Minor bugfixes (testing): + - Skip backtrace tests when backtrace support is not compiled in. Fixes + part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak.

1 0

[tor/release-0.2.7] No spaces around = in variable assignment
by nickm＠torproject.org 19 Oct '15

19 Oct '15

commit f75325c132847883a7ddc5f0f6e55847edc68507 Author: Marcin Cieślak <saper(a)saper.info> Date: Fri Sep 25 14:16:40 2015 +0000 No spaces around = in variable assignment BSD make takes spaces around = literally and produces a "TESTING_TOR_BINARY " variable with a trailing space, which leads to test_keygen.sh failure. Fixes 17154 --- src/or/include.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/include.am b/src/or/include.am index 7b12b56..d0e955f 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -123,9 +123,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov +export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov else -export TESTING_TOR_BINARY = $(top_builddir)/src/or/tor +export TESTING_TOR_BINARY=$(top_builddir)/src/or/tor endif ORHEADERS = \

1 0