commit 35ba9ab7df8c5732d94faa4826b1de63caedb7a0 Author: Mike Perry mikeperry-git@torproject.org Date: Wed Jun 26 20:27:55 2013 -0700

Include 3.0 changelog in the bundle Docs directory. --- Bundle-Data/Docs/ChangeLog.txt | 40 ++++++++++++++++++++++++++ gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 6 +++- gitian/mkbundle-mac.sh | 6 +++- gitian/mkbundle-windows.sh | 6 +++- 7 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt new file mode 100644 index 0000000..a9ea0cd --- /dev/null +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -0,0 +1,40 @@ +Tor Browser Bundle 3.0alpha2 -- June 27 2013 + * All Platforms: + * Update Firefox to 17.0.7esr + * Update Tor to 0.2.4.14-alpha + * Include Tor's GeoIP file + * This should fix custom torrc issues with country-based node + restrictions + * Fix several build determinism issues + * Include ChangeLog in bundles. + * Linux: + * Use Ubuntu's 'hardening-wrapper' to build our Linux binaries + * Windows: + * Fix many crash issues by disabling Direct2D support for now. + * Mac: + * Bug 8987: Disable TBB's 'Saved Application State' disk records on OSX 10.7+ + +Tor Browser Bundle 3.0alpha1 -- June 17 2013 + * All Platforms: + * Remove Vidalia; Use the new Tor Launcher Firefox Addon instead + * Update Torbutton to 1.6.0 + * bug 7494: Create a local home page for TBB as about:tor + * misc: Perform a control port test of proper Tor configuration by default. + Only use https://check.torproject.org if the control port is + unavailable. + * misc: Add an icon menu option for Tor Launcher's Network Settings + * misc: Add branding string overrides (primarily controls browser name and + homepage) + * Update HTTPS-Everywhere to 3.2.2 + * Update NoScript to 2.6.6.6 + * Update PDF.JS to 0.8.1 + * Windows: + * Use MinGW-w64 (via Gitian) to cross-compile the bundles from Ubuntu + * Use TBB-Windows-Installer to guide Windows users through TBB extraction + * Temporarily disable WebGL and Accessibility support due to minor MinGW + issues + * Mac: + * Use 'Toolchain4' fork by Ray Donnelley to cross-compile the bundles from + Ubuntu + + diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 265b895..7d61b94 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -36,6 +36,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -95,6 +96,7 @@ script: | unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip + unzip ~/build/tbb-docs.zip chmod 700 Data/Tor cd .. # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index f259c44..d696fdb 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -32,6 +32,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -95,6 +96,7 @@ script: | unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip + unzip ~/build/tbb-docs.zip cd Contents/MacOS/ unzip ~/build/tor-browser-mac$GBUILD_BITS-gbuilt.zip cd ../../../ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index aac19f6..714a173 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -34,6 +34,7 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "tbb-docs.zip" script: | INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" @@ -99,6 +100,7 @@ script: | unzip ~/build/tor-browser-win32-gbuilt.zip unzip ~/build/tor-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip + unzip ~/build/tbb-docs.zip cd .. # # Copy reproducibility info diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 97ead7c..6dcea41 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -68,7 +68,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/

-cd ./Bundle-Data/linux +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/linux-skeleton.zip .

diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8caf6dc..0d2fb0e 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -51,7 +51,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/

-cd ./Bundle-Data/mac +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip .

diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index dd3de1a..7b87fc6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -51,7 +51,11 @@ cd $WRAPPER_DIR/.. rm -f $GITIAN_DIR/inputs/relativelink-src.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/

-cd ./Bundle-Data/windows +cd ./Bundle-Data/ +rm -f $GITIAN_DIR/inputs/tbb-docs.zip +$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ + +cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/windows-skeleton.zip .