[tor-commits] [tor-messenger-build/master] Trac 23542: Add snowflake pt

[arlo at torproject.org]

commit de4f50f02929b36f7ecdcb654e3dfe2b7e8ca5d2
Author: Arlo Breault <arlolra at gmail.com>
Date:   Sat Oct 14 08:53:55 2017 -0400

    Trac 23542: Add snowflake pt
---
 projects/tor-browser-alpha/build  |  3 +++
 projects/tor-browser-alpha/config | 34 ++++++++++++++++++++++++++++++++++
 projects/tor-messenger/build      | 14 ++++++++++++++
 projects/tor-messenger/build.osx  | 13 +++++++++++++
 projects/tor-messenger/config     |  2 ++
 5 files changed, 66 insertions(+)

diff --git a/projects/tor-browser-alpha/build b/projects/tor-browser-alpha/build
new file mode 100644
index 0000000..a78518d
--- /dev/null
+++ b/projects/tor-browser-alpha/build
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+cp -p [% c('input_files_by_name/torbrowser-alpha') %] [% dest_dir %]/[% c('filename') %]
diff --git a/projects/tor-browser-alpha/config b/projects/tor-browser-alpha/config
new file mode 100644
index 0000000..d9dec20
--- /dev/null
+++ b/projects/tor-browser-alpha/config
@@ -0,0 +1,34 @@
+# vim: filetype=yaml sw=2
+version: 7.5a5
+filename: 'tor-browser-alpha-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]'
+
+input_files:
+  - URL: "[% c('var/base_url') %]/tor-browser-[% c('var/tb_osname') %]-[% c('version') %]_en-US.tar.xz"
+    name: torbrowser-alpha
+    file_gpg_id: 1
+    sig_ext: asc
+    gpg_keyring: torbrowser.gpg
+    var:
+      base_url: "https://dist.torproject.org/torbrowser/[% c('version') %]"
+    targets:
+      windows-i686:
+        URL: "[% c('var/base_url') %]/torbrowser-install-[% c('version') %]_en-US.exe"
+      osx-x86_64:
+        URL: "[% c('var/base_url') %]/TorBrowser-[% c('version') %]-osx64_en-US.dmg"
+
+var:
+  extension: 'tar.xz'
+
+targets:
+  linux-x86_64:
+    var:
+      tb_osname: linux64
+  linux-i686:
+    var:
+      tb_osname: linux32
+  windows-i686:
+    var:
+      extension: 'exe'
+  osx-x86_64:
+    var:
+      extension: 'dmg'
diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build
index cffd8a1..aa75f35 100755
--- a/projects/tor-messenger/build
+++ b/projects/tor-messenger/build
@@ -78,6 +78,20 @@ sed -i 's/\(ClientTransportPlugin meek exec\) [^ ]\+ -- /\1 /' tor-browser_en-US
 rm -f  tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser
 [% END -%]
 
+# snowflake
+[% IF c("var/linux") -%]
+mkdir snowflake
+cd snowflake
+tar xf ../[% c('input_files_by_name/tor-browser-alpha') %]
+cp tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/snowflake-client ../tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/snowflake-client
+echo 'ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302' >> \
+        ../tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults
+# This needs to happen before "tor-launcher" below
+echo 'pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");' >> \
+        $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js
+cd ..
+[% END -%]
+
 mv tor-browser_en-US/Browser/TorBrowser/Tor bundle/Browser/TorBrowser/
 cp tor-browser_en-US/Browser/TorBrowser/Data/Tor/* bundle/Browser/TorBrowser/Data/Tor/
 
diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index 317daa7..bc5970b 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -25,6 +25,19 @@ sed -i 's/\(ClientTransportPlugin meek exec\) [^ ]\+ -- /\1 /' torbrowser/TorBro
 rm -Rf torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper/
 rm -f  torbrowser/TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/meek-client-torbrowser
 
+# snowflake
+mkdir snowflake
+cd snowflake
+7z x $rootdir/[% c('input_files_by_name/tor-browser-alpha') %]
+bsdtar xf '0.unknown partition'
+cp TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/snowflake-client ../torbrowser/TorBrowser.app/Contents/MacOS/Tor/PluggableTransports/snowflake-client
+echo 'ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302' >> \
+        ../torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults
+# This needs to happen before "tor-launcher" below
+echo 'pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");' >> \
+        $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js
+cd ..
+
 mkdir TorMessenger.app/TorBrowser/
 mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/
 mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/
diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config
index ee2f401..2301270 100644
--- a/projects/tor-messenger/config
+++ b/projects/tor-messenger/config
@@ -10,6 +10,8 @@ input_files:
     name: tor-launcher
   - project: tor-browser
     name: tor-browser
+  - project: tor-browser-alpha
+    name: tor-browser-alpha
   - project: bundle-data
     name: bundle-data
   - project: gcc