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

[tor/release-0.2.7] Merge branch 'bug18841_1_025' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 039fc8427a512efce87b7bd21c10c4adca4ba30d Merge: 61c0bae c662bef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:22:36 2016 -0400 Merge branch 'bug18841_1_025' into maint-0.2.7 changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.7] Merge branch 'bug18977_024_v2' into bug18977_026_v2
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 20b01cece8cd2ceb7f8051aee04294bdba471f1a Merge: 0b477bf e57f26c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 14:39:06 2016 -0400 Merge branch 'bug18977_024_v2' into bug18977_026_v2 Had conflicts related to other correct_tm bugs in 0.2.6. Added wday for another case. changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+) diff --cc src/common/compat.c index 1788e32,90132fc..103ce24 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -2683,18 -2461,11 +2683,20 @@@ correct_tm(int islocal, const time_t *t r->tm_year = 8099; r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; + } else if (r->tm_year < (1-1900)) { + r->tm_year = (1-1900); + r->tm_mon = 0; + r->tm_mday = 1; + r->tm_yday = 0; ++ r->tm_wday = 0; + r->tm_hour = 0; + r->tm_min = 0; + r->tm_sec = 0; } return r; } @@@ -2708,7 -2479,8 +2710,8 @@@ r->tm_year = 70; /* 1970 CE */ r->tm_mon = 0; r->tm_mday = 1; - r->tm_yday = 1; + r->tm_yday = 0; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@@ -2721,7 -2493,8 +2724,8 @@@ r->tm_year = 137; /* 2037 CE */ r->tm_mon = 11; r->tm_mday = 31; - r->tm_yday = 365; + r->tm_yday = 364; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59;

1 0

[tor/release-0.2.7] Undefine _FORTIFY_SOURCE before defining it.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit c662bef45595e40106becfbdbb39811300d15a7f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 12:15:37 2016 -0400 Undefine _FORTIFY_SOURCE before defining it. This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal". --- changes/bug18841.1 | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug18841.1 b/changes/bug18841.1 new file mode 100644 index 0000000..205ee5a --- /dev/null +++ b/changes/bug18841.1 @@ -0,0 +1,7 @@ + o Major bugfixes (compilation): + - Correctly detect compiler flags on systems where _FORTIFY_SOURCE + is predefined. Previously, our use of -D_FORTIFY_SOURCE would + cause a compiler warning, thereby making other checks fail. + Fixes one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from + "trudokal". + diff --git a/configure.ac b/configure.ac index 29ba2fd..2116b41 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ #endif])], have_clang=yes, have_clang=no) if test x$enable_gcc_hardening != xno; then - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" if test x$have_clang = xyes; then TOR_CHECK_CFLAGS(-Qunused-arguments) fi

1 0

[tor/release-0.2.7] Add "-c 1" to ping6 in test-network-all
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 85c698da72ef3737e7c209732b2a9b892c9273fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 18:12:59 2016 -0400 Add "-c 1" to ping6 in test-network-all Fixes bug 19008. bugfix on 0.2.7.3-rc --- Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index beea69d..6fd9405 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,7 @@ test-network: need-chutney-path all test-network-all: need-chutney-path all test-driver mkdir -p $(TEST_NETWORK_ALL_LOG_DIR) @flavors="$(TEST_CHUTNEY_FLAVORS)"; \ - if ping6 -q -o ::1 >/dev/null 2>&1; then \ + if ping6 -q -c 1 -o ::1 >/dev/null 2>&1; then \ echo "ping6 ::1 succeeded, running IPv6 flavors: $(TEST_CHUTNEY_FLAVORS_IPV6)."; \ flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \ else \ diff --git a/changes/bug19008 b/changes/bug19008 new file mode 100644 index 0000000..c51c98f --- /dev/null +++ b/changes/bug19008 @@ -0,0 +1,3 @@ + o Major bugfixes (testing): + - Fix a bug that would block 'make test-network-all' on systems + where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc.

1 0

[tor/release-0.2.7] Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 4e94580591da579e53461aeedfb1340836427c02 Merge: 039fc84 bf3e32a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 11 13:13:23 2016 -0400 Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7 changes/bug19032 | 4 ++++ src/or/dirserv.c | 31 ++++++++++++++++--------------- src/or/dirserv.h | 2 +- src/or/networkstatus.c | 3 +-- 4 files changed, 22 insertions(+), 18 deletions(-)

1 0

[tor/release-0.2.7] Have correct_tm set tm_wday as well.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit e57f26c135b03f5dbde77aea24551b6a9fc20889 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 10:49:55 2016 -0400 Have correct_tm set tm_wday as well. The tm_wday field had been left uninitialized, which was causing some assertions to fail on Windows unit tests. Fixes bug 18977. --- changes/bug18977 | 4 ++++ src/common/compat.c | 3 +++ src/common/util.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/changes/bug18977 b/changes/bug18977 new file mode 100644 index 0000000..3f46b09 --- /dev/null +++ b/changes/bug18977 @@ -0,0 +1,4 @@ + o Minor bugfixes (time handling): + - When correcting a corrupt 'struct tm' value, fill in the tm_wday + field. Otherwise, our unit tests crash on Windows. + Fixes bug 18977; bugfix on 0.2.2.25-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..90132fc 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2462,6 +2462,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; @@ -2479,6 +2480,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 0; r->tm_mday = 1; r->tm_yday = 1; + r->tm_wday = 0; r->tm_hour = 0; r->tm_min = 0 ; r->tm_sec = 0; @@ -2492,6 +2494,7 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, r->tm_mon = 11; r->tm_mday = 31; r->tm_yday = 365; + r->tm_wday = 6; r->tm_hour = 23; r->tm_min = 59; r->tm_sec = 59; diff --git a/src/common/util.c b/src/common/util.c index 5eb0f9a..31dc2a4 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1460,6 +1460,7 @@ parse_iso_time(const char *cp, time_t *t) st_tm.tm_hour = hour; st_tm.tm_min = minute; st_tm.tm_sec = second; + st_tm.tm_wday = 0; /* Should be ignored. */ if (st_tm.tm_year < 70) { char *esc = esc_for_log(cp); @@ -1517,6 +1518,7 @@ parse_http_time(const char *date, struct tm *tm) tm->tm_hour = (int)tm_hour; tm->tm_min = (int)tm_min; tm->tm_sec = (int)tm_sec; + tm->tm_wday = 0; /* Leave this unset. */ month[3] = '\0'; /* Okay, now decode the month. */

1 0

[tor/release-0.2.7] unbreak the build (when warnings are enabled)
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit d40e8695f42959d180fe563d447422327535c753 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 11 13:42:00 2016 -0400 unbreak the build (when warnings are enabled) --- src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a367669..01b08ca 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1597,9 +1597,8 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil) * networkstatus_getinfo_by_purpose(). */ void -dirserv_compute_bridge_flag_thresholds() +dirserv_compute_bridge_flag_thresholds(void) { - digestmap_t *omit_as_sybil = digestmap_new(); dirserv_compute_performance_thresholds(omit_as_sybil); digestmap_free(omit_as_sybil, NULL);

1 0

[tor/release-0.2.7] Merge branch 'bug18977_026_v2' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 4165b1a0da893a9f67a2ba32b4fcd54a7804ce14 Merge: d40e869 20b01ce Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 15:33:35 2016 -0400 Merge branch 'bug18977_026_v2' into maint-0.2.7 changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)

1 0

[tor/release-0.2.7] Use tor_sscanf, not sscanf, in test_util.c.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 5854b19816bc7b09df4785afbfb0e8891b398638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:11:29 2016 -0400 Use tor_sscanf, not sscanf, in test_util.c. Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from working. --- changes/bug19213 | 3 +++ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug19213 b/changes/bug19213 new file mode 100644 index 0000000..f912ffb --- /dev/null +++ b/changes/bug19213 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Cause the unit tests to compile correctly on mingw64 versions + that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 0a5783e..046e92e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4377,7 +4377,7 @@ test_util_writepid(void *arg) contents = read_file_to_str(fname, 0, NULL); tt_assert(contents); - int n = sscanf(contents, "%lu\n%c", &pid, &c); + int n = tor_sscanf(contents, "%lu\n%c", &pid, &c); tt_int_op(n, OP_EQ, 1); #ifdef _WIN32

1 0

[tor/release-0.2.7] Merge branch 'bug19008_027' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 61c0bae4f20556cf155562582ea00a6a147252d6 Merge: 7fe80c2 85c698d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 18:14:27 2016 -0400 Merge branch 'bug19008_027' into maint-0.2.7 Makefile.am | 2 +- changes/bug19008 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0