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

[tor/maint-0.3.3] man: Add a comment to anchor only option
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit ff38c0589ceab60cda9c27b117d1dcfef55b3539 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 4 11:38:42 2018 -0400 man: Add a comment to anchor only option Some anchor don't appear in the final man page so document those so we understand why we do that in the future. Part of #25582 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/tor.1.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2c01a3ec9..415cd6f3a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1203,6 +1203,7 @@ The following options are useful only for clients (that is, if on different SocksPorts, TransPorts, etc are always isolated from one another. This option overrides that behavior.) +// Anchor only for formatting, not visible in the man page. [[OtherSocksPortFlags]]:: Other recognized __flags__ for a SocksPort are: **NoIPv4Traffic**;; @@ -1267,6 +1268,7 @@ The following options are useful only for clients (that is, if authentication" when IsolateSOCKSAuth is disabled, or when this option is set. +// Anchor only for formatting, not visible in the man page. [[SocksPortFlagsMisc]]:: Flags are processed left to right. If flags conflict, the last flag on the line is used, and all earlier flags are ignored. No error is issued for @@ -1904,6 +1906,7 @@ is non-zero): reject *:6881-6999 accept *:* +// Anchor only for formatting, not visible in the man page. [[ExitPolicyDefault]]:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses. @@ -2079,6 +2082,7 @@ is non-zero): If the address is absent, or resolves to both an IPv4 and an IPv6 address, only listen to the IPv6 address. +// Anchor only for formatting, not visible in the man page. [[ORPortFlagsExclusive]]:: For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and IPv4Only and IPv6Only are mutually exclusive.

1 0

[tor/maint-0.3.3] Remove erroneous section heading "ExitPolicyDefault"
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 29 15:06:07 2018 -0400 Remove erroneous section heading "ExitPolicyDefault" The anchor here was originally introduced to make sure that the manpage would format correctly, but we had mistaken it for a section anchor, and introduced a bogus section heading in 3563a2c8194ebe94. Fixes bug 25582; bugfix on 0.3.3.1-alpha. --- changes/bug25582 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug25582 b/changes/bug25582 new file mode 100644 index 000000000..609b94aac --- /dev/null +++ b/changes/bug25582 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Revert a misformatting issue in the ExitPolicy + documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 80769412f..2c01a3ec9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1904,7 +1904,7 @@ is non-zero): reject *:6881-6999 accept *:* -[[ExitPolicyDefault]] **ExitPolicyDefault**:: +[[ExitPolicyDefault]]:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses.

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 43f31555827319077858fb3872c28764961b944a Merge: 52846f728 ac3e389db Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:21:43 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25582 | 3 +++ changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ doc/tor.1.txt | 6 +++++- 4 files changed, 18 insertions(+), 7 deletions(-)

1 0

[tor/master] Remove erroneous section heading "ExitPolicyDefault"
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 6d7c4c6ec2f76512c1142c1cb4453967d3bc1661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 29 15:06:07 2018 -0400 Remove erroneous section heading "ExitPolicyDefault" The anchor here was originally introduced to make sure that the manpage would format correctly, but we had mistaken it for a section anchor, and introduced a bogus section heading in 3563a2c8194ebe94. Fixes bug 25582; bugfix on 0.3.3.1-alpha. --- changes/bug25582 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug25582 b/changes/bug25582 new file mode 100644 index 000000000..609b94aac --- /dev/null +++ b/changes/bug25582 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Revert a misformatting issue in the ExitPolicy + documentation. Fixes bug 25582; bugfix on 0.3.3.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 80769412f..2c01a3ec9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1904,7 +1904,7 @@ is non-zero): reject *:6881-6999 accept *:* -[[ExitPolicyDefault]] **ExitPolicyDefault**:: +[[ExitPolicyDefault]]:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses.

1 0

[tor/master] Merge branch 'bug25679_033_squashed' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69 Merge: ec8ee5412 e3ad4957a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:20:15 2018 -0400 Merge branch 'bug25679_033_squashed' into maint-0.3.3 changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:21:38 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3 changes/bug25582 | 3 +++ doc/tor.1.txt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix the default for TOR_RUST_DEPENDENCIES
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 30 08:53:58 2018 -0400 Fix the default for TOR_RUST_DEPENDENCIES By default, we want to look at the crates directory of the submodule, not the toplevel of the submodule. Fixes bug 25679; bugfix on 0.3.3.1-alpha. --- changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/bug25679 b/changes/bug25679 new file mode 100644 index 000000000..9247a2915 --- /dev/null +++ b/changes/bug25679 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, rust): + - Build correctly when the rust dependencies submodule is loaded, + but the TOR_RUST_DEPENDENCIES environment variable is not set. + Fixes bug 25679; bugfix on 0.3.3.1-alpha. diff --git a/configure.ac b/configure.ac index 2045e0d5f..143044956 100644 --- a/configure.ac +++ b/configure.ac @@ -440,23 +440,23 @@ if test "x$enable_rust" = "xyes"; then AC_MSG_CHECKING([rust crate dependencies]) AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror]) if test "x$TOR_RUST_DEPENDENCIES" = "x"; then - TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/" - NEED_MOD=1 + TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates" fi + dnl Check whether the path exists before we try to cd into it. if test ! -d "$TOR_RUST_DEPENDENCIES"; then AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) ERRORED=1 fi + dnl Make the path absolute, since we'll be using it from within a + dnl subdirectory. + TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd) + for dep in $rust_crates; do if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) ERRORED=1 fi done - if test "x$NEED_MOD" = "x1"; then - dnl When looking for dependencies from cargo, pick right directory - TOR_RUST_DEPENDENCIES="../../src/ext/rust" - fi if test "x$ERRORED" = "x"; then AC_MSG_RESULT([yes]) fi

1 0

[tor/release-0.3.3] Merge branch 'bug25679_033_squashed' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit 8f798b686d0d699c55a20ef19fe57dd487b3aa69 Merge: ec8ee5412 e3ad4957a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:20:15 2018 -0400 Merge branch 'bug25679_033_squashed' into maint-0.3.3 changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit ac3e389dbd7224a23dfa12da7a15b748feb88435 Merge: 8f798b686 ff38c0589 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 5 08:21:38 2018 -0400 Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3 changes/bug25582 | 3 +++ doc/tor.1.txt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Fix the default for TOR_RUST_DEPENDENCIES
by nickm＠torproject.org 05 Apr '18

05 Apr '18

commit e3ad4957a8d06716d3e5dad9cda09ce236b941d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 30 08:53:58 2018 -0400 Fix the default for TOR_RUST_DEPENDENCIES By default, we want to look at the crates directory of the submodule, not the toplevel of the submodule. Fixes bug 25679; bugfix on 0.3.3.1-alpha. --- changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/bug25679 b/changes/bug25679 new file mode 100644 index 000000000..9247a2915 --- /dev/null +++ b/changes/bug25679 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, rust): + - Build correctly when the rust dependencies submodule is loaded, + but the TOR_RUST_DEPENDENCIES environment variable is not set. + Fixes bug 25679; bugfix on 0.3.3.1-alpha. diff --git a/configure.ac b/configure.ac index 2045e0d5f..143044956 100644 --- a/configure.ac +++ b/configure.ac @@ -440,23 +440,23 @@ if test "x$enable_rust" = "xyes"; then AC_MSG_CHECKING([rust crate dependencies]) AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror]) if test "x$TOR_RUST_DEPENDENCIES" = "x"; then - TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/" - NEED_MOD=1 + TOR_RUST_DEPENDENCIES="${srcdir}/src/ext/rust/crates" fi + dnl Check whether the path exists before we try to cd into it. if test ! -d "$TOR_RUST_DEPENDENCIES"; then AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) ERRORED=1 fi + dnl Make the path absolute, since we'll be using it from within a + dnl subdirectory. + TOR_RUST_DEPENDENCIES=$(cd "$TOR_RUST_DEPENDENCIES" ; pwd) + for dep in $rust_crates; do if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) ERRORED=1 fi done - if test "x$NEED_MOD" = "x1"; then - dnl When looking for dependencies from cargo, pick right directory - TOR_RUST_DEPENDENCIES="../../src/ext/rust" - fi if test "x$ERRORED" = "x"; then AC_MSG_RESULT([yes]) fi

1 0