Browse Source

Merge branch 'maint-0.3.3'

Nick Mathewson 6 years ago
parent
commit
43f3155582
4 changed files with 18 additions and 7 deletions
  1. 3 0
      changes/bug25582
  2. 4 0
      changes/bug25679
  3. 6 6
      configure.ac
  4. 5 1
      doc/tor.1.txt

+ 3 - 0
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.

+ 4 - 0
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.

+ 6 - 6
configure.ac

@@ -446,23 +446,23 @@ if test "x$enable_rust" = "xyes"; then
     AC_MSG_CHECKING([rust crate dependencies])
     AC_MSG_CHECKING([rust crate dependencies])
     AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
     AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror])
     if test "x$TOR_RUST_DEPENDENCIES" = "x"; then
     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
     fi
+    dnl Check whether the path exists before we try to cd into it.
     if test ! -d "$TOR_RUST_DEPENDENCIES"; then
     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.])
       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
       ERRORED=1
     fi
     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
     for dep in $rust_crates; do
       if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then
       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.])
         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
         ERRORED=1
       fi
       fi
     done
     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
     if test "x$ERRORED" = "x"; then
       AC_MSG_RESULT([yes])
       AC_MSG_RESULT([yes])
     fi
     fi

+ 5 - 1
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
         on different SocksPorts, TransPorts, etc are always isolated from one
         another. This option overrides that behavior.)
         another. This option overrides that behavior.)
 
 
+// Anchor only for formatting, not visible in the man page.
 [[OtherSocksPortFlags]]::
 [[OtherSocksPortFlags]]::
     Other recognized __flags__ for a SocksPort are:
     Other recognized __flags__ for a SocksPort are:
     **NoIPv4Traffic**;;
     **NoIPv4Traffic**;;
@@ -1267,6 +1268,7 @@ The following options are useful only for clients (that is, if
         authentication" when IsolateSOCKSAuth is disabled, or when this
         authentication" when IsolateSOCKSAuth is disabled, or when this
         option is set.
         option is set.
 
 
+// Anchor only for formatting, not visible in the man page.
 [[SocksPortFlagsMisc]]::
 [[SocksPortFlagsMisc]]::
     Flags are processed left to right. If flags conflict, the last flag on the
     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
     line is used, and all earlier flags are ignored. No error is issued for
@@ -1904,7 +1906,8 @@ is non-zero):
        reject *:6881-6999
        reject *:6881-6999
        accept *:*
        accept *:*
 
 
-[[ExitPolicyDefault]] **ExitPolicyDefault**::
+// Anchor only for formatting, not visible in the man page.
+[[ExitPolicyDefault]]::
     Since the default exit policy uses accept/reject *, it applies to both
     Since the default exit policy uses accept/reject *, it applies to both
     IPv4 and IPv6 addresses.
     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
         If the address is absent, or resolves to both an IPv4 and an IPv6
         address, only listen to the IPv6 address.
         address, only listen to the IPv6 address.
 
 
+// Anchor only for formatting, not visible in the man page.
 [[ORPortFlagsExclusive]]::
 [[ORPortFlagsExclusive]]::
     For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
     For obvious reasons, NoAdvertise and NoListen are mutually exclusive, and
     IPv4Only and IPv6Only are mutually exclusive.
     IPv4Only and IPv6Only are mutually exclusive.