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

[tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 5d4ff915cb2fda4fa416bfbe4d51387b81edac42 Merge: 9fe6ffa 4732e15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 09:06:10 2016 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0

[tor/release-0.2.8] Bump to 0.2.8.11
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 4732e150e83fdc4d07f5741ed6e9451901b0e9e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 09:04:37 2016 -0500 Bump to 0.2.8.11 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fb5d6d7..3113366 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.10-dev]) +AC_INIT([tor],[0.2.8.11]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index a36123f..17e6f03 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.10-dev" +!define VERSION "0.2.8.11" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 923d520..29a9f6f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.10-dev" +#define VERSION "0.2.8.11"

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 1ba52d044dc4418fefe29ac205bbb7cac94e2df6 Merge: 8553849 5d4ff91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 09:06:49 2016 -0500 Merge branch 'maint-0.2.9'

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 90c3764704b8ce986ee847b2cedc1a79b7d14b0d Merge: 669d79d 5d4ff91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 09:06:23 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9

1 0

[tor-browser-bundle/hardened-builds] Revert "Bug 20147: (re-)dzip.sh: various improvements"
by gk＠torproject.org 08 Dec '16

08 Dec '16

commit a6c4a3d715b863a2e4ff2b6d2129d090a7a6e32a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 8 12:48:18 2016 +0000 Revert "Bug 20147: (re-)dzip.sh: various improvements" This reverts commit a38d827c12ce75d13e18f19fc8f5bac8aca28c55. Surprisingly this breaks our builds. See the reopened #20417 for more details. --- gitian/build-helpers/dzip.sh | 17 +++++++++-------- gitian/build-helpers/re-dzip.sh | 23 +++++++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/gitian/build-helpers/dzip.sh b/gitian/build-helpers/dzip.sh index 64fcdca..5772c8b 100755 --- a/gitian/build-helpers/dzip.sh +++ b/gitian/build-helpers/dzip.sh @@ -1,13 +1,14 @@ -#!/bin/sh -e +#!/bin/sh # Crappy deterministic zip wrapper export LC_ALL=C -ZIPFILE=${1:?} +ZIPFILE=$1 shift -if [ -n "$REFERENCE_DATETIME" ]; then - find "$@" -exec touch --date="$REFERENCE_DATETIME" -- {} + -fi -find "$@" -executable -exec chmod 700 {} + -find "$@" ! -executable -exec chmod 600 {} + -find "$@" | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" +[ -n "$REFERENCE_DATETIME" ] && \ + find $@ -exec touch --date="$REFERENCE_DATETIME" {} \; + +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + +find $@ | sort | zip $ZIPOPTS -X -@ "$ZIPFILE" diff --git a/gitian/build-helpers/re-dzip.sh b/gitian/build-helpers/re-dzip.sh index 58942c4..27828e9 100755 --- a/gitian/build-helpers/re-dzip.sh +++ b/gitian/build-helpers/re-dzip.sh @@ -1,14 +1,17 @@ -#!/bin/sh -e +#!/bin/sh # Crappy deterministic zip repackager export LC_ALL=C -ZIPFILE_BASENAME=$(basename -- "${1:?}") -TEMPDIR=tmp-re-dzip-$$ -RE_DZIP=$(readlink -f -- "$(which -- "$0")") -PATH=$PATH:$(dirname "$RE_DZIP") +ZIPFILE=`basename $1` -mkdir "$TEMPDIR" -unzip $UNZIPOPTS -d "$TEMPDIR" -- "$1" -(cd "$TEMPDIR"; dzip.sh ./"$ZIPFILE_BASENAME" .) -mv -- "$TEMPDIR"/"$ZIPFILE_BASENAME" "$1" -rm -rf "$TEMPDIR" +mkdir tmp_dzip +cd tmp_dzip +unzip ../$1 +[ -n "$REFERENCE_DATETIME" ] && \ + find . -exec touch --date="$REFERENCE_DATETIME" {} \; +find . -executable -exec chmod 700 {} \; +find . ! -executable -exec chmod 600 {} \; +find . | sort | zip $ZIPOPTS -X -@ $ZIPFILE +mv $ZIPFILE ../$1 +cd .. +rm -rf tmp_dzip

1 0

[tor/maint-0.2.9] Use the correct preprocessor macro for Linux
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 9fe6ffa58864b0719bdec9a55b84c11255fa505b Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Aug 23 13:07:03 2016 +0000 Use the correct preprocessor macro for Linux Also combine all of the checks into one if-tree as only one of them should actually succeed. --- src/test/test_options.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 2570f8d..e85e118 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1071,7 +1071,7 @@ test_options_validate__transproxy(void *ignored) free_options_test_data(tdata); tdata = NULL; -#if defined(linux) +#if defined(__linux__) tdata = get_options_test_data("TransProxyType tproxy\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1079,8 +1079,7 @@ test_options_validate__transproxy(void *ignored) if (msg) { TT_DIE(("Expected NULL but got '%s'", msg)); } -#endif -#ifdef KERNEL_MAY_SUPPORT_IPFW +#elif defined(KERNEL_MAY_SUPPORT_IPFW) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1088,8 +1087,7 @@ test_options_validate__transproxy(void *ignored) if (msg) { TT_DIE(("Expected NULL but got '%s'", msg)); } -#endif -#if defined(__OpenBSD__) +#elif defined(__OpenBSD__) tdata = get_options_test_data("TransProxyType pf-divert\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1097,8 +1095,7 @@ test_options_validate__transproxy(void *ignored) if (msg) { TT_DIE(("Expected NULL but got '%s'", msg)); } -#endif -#if defined(__NetBSD__) +#elif defined(__NetBSD__) tdata = get_options_test_data("TransProxyType default\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0

[tor/master] Merge branch 'bug19960_2' into maint-0.2.9
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit d838a812bd17f9bf68b77b5771c2388b82e17f15 Merge: f602172 53d4e89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 07:48:14 2016 -0500 Merge branch 'bug19960_2' into maint-0.2.9 changes/bug19960 | 4 ++++ src/or/config.c | 2 +- src/test/test_options.c | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.9] Merge branch 'bug19960_2' into maint-0.2.9
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit d838a812bd17f9bf68b77b5771c2388b82e17f15 Merge: f602172 53d4e89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 07:48:14 2016 -0500 Merge branch 'bug19960_2' into maint-0.2.9 changes/bug19960 | 4 ++++ src/or/config.c | 2 +- src/test/test_options.c | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.9] Netbsd doesn't have ipfw, only the regular pf transport stuff.
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 53d4e89626856eabe235c50ffc3d6a697f176741 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 15:21:21 2016 -0500 Netbsd doesn't have ipfw, only the regular pf transport stuff. Attempted fix for 19960. Also, fixes a typo. --- changes/bug19960 | 4 ++++ src/or/config.c | 2 +- src/test/test_options.c | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/bug19960 b/changes/bug19960 new file mode 100644 index 0000000..5d65585 --- /dev/null +++ b/changes/bug19960 @@ -0,0 +1,4 @@ + o Minor bugfixes (netbsd, unit tests): + - Stop expecting NetBSD unit tests to report success for ipfw; + on NetBSD, it's only pf that's supported. + Part of a fix for bug 19960; bugfix on 0.2.9.5-alpha. diff --git a/src/or/config.c b/src/or/config.c index 8568ea9..3693cdf 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3004,7 +3004,7 @@ options_validate(or_options_t *old_options, or_options_t *options, } else if (!strcasecmp(options->TransProxyType, "ipfw")) { #ifndef KERNEL_MAY_SUPPORT_IPFW /* Earlier versions of OS X have ipfw */ - REJECT("ipfw is a FreeBSD-specific" + REJECT("ipfw is a FreeBSD-specific " "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_IPFW; diff --git a/src/test/test_options.c b/src/test/test_options.c index 6770c16..2570f8d 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1050,7 +1050,7 @@ test_options_validate__transproxy(void *ignored) tt_int_op(ret, OP_EQ, -1); #ifndef KERNEL_MAY_SUPPORT_IPFW - tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " + tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specific and OS X/Darwin-specific " "feature."); #else tt_int_op(tdata->opt->TransProxyType_parsed, OP_EQ, TPT_IPFW); @@ -1080,7 +1080,7 @@ test_options_validate__transproxy(void *ignored) TT_DIE(("Expected NULL but got '%s'", msg)); } #endif -#if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__) +#ifdef KERNEL_MAY_SUPPORT_IPFW tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1098,6 +1098,15 @@ test_options_validate__transproxy(void *ignored) TT_DIE(("Expected NULL but got '%s'", msg)); } #endif +#if defined(__NetBSD__) + tdata = get_options_test_data("TransProxyType default\n" + "TransPort 127.0.0.1:123\n"); + ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); + tt_int_op(ret, OP_EQ, -1); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } +#endif // Assert that a test has run for some TransProxyType tt_assert(tdata);

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 08 Dec '16

08 Dec '16

commit 669d79d2d66ec8346fc590038367b87f72697d9f Merge: 9ead4e9 9fe6ffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 8 07:49:44 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug19960 | 4 ++++ src/or/config.c | 2 +- src/test/test_options.c | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 7 deletions(-)

1 0