[tbb-commits] [tor-browser-build/master] Bug 30518 - Add SocksPort flags for consistency across platforms

[gk at torproject.org]

commit 619cf8e9c1826812936b491711f67107aaf24fe7
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Thu May 16 18:51:30 2019 +0000

    Bug 30518 - Add SocksPort flags for consistency across platforms
---
 .../tor-onion-proxy-library/add_socks_port_flags.patch     | 14 ++++++++++++++
 projects/tor-onion-proxy-library/build                     |  1 +
 projects/tor-onion-proxy-library/config                    |  1 +
 3 files changed, 16 insertions(+)

diff --git a/projects/tor-onion-proxy-library/add_socks_port_flags.patch b/projects/tor-onion-proxy-library/add_socks_port_flags.patch
new file mode 100644
index 0000000..84aefc9
--- /dev/null
+++ b/projects/tor-onion-proxy-library/add_socks_port_flags.patch
@@ -0,0 +1,14 @@
+diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+index 731fb3e..e0d0c42 100644
+--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
+@@ -395,6 +395,9 @@ public final class TorConfigBuilder {
+         if (!isNullOrEmpty(isolationFlag)) {
+             buffer.append(" ").append(isolationFlag);
+         }
++        buffer.append(" KeepAliveIsolateSOCKSAuth");
++        buffer.append(" IPv6Traffic");
++        buffer.append(" PreferIPv6");
+         buffer.append('\n');
+         return this;
+     }
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build
index 5844076..defedde 100644
--- a/projects/tor-onion-proxy-library/build
+++ b/projects/tor-onion-proxy-library/build
@@ -19,6 +19,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 # Patch projects
 cd /var/tmp/build/[% project %]-[% c('version') %]
 patch -p1 < $rootdir/maven-repo.patch
+patch -p1 < $rootdir/add_socks_port_flags.patch
 
 # Build Android Libraries and Apps
 $GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index afd800f..889b30d 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -29,3 +29,4 @@ input_files:
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
   - filename: maven-repo.patch
+  - filename: add_socks_port_flags.patch