- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Merge remote-tracking branch 'pc/bug4234-04'
by gk＠torproject.org 28 Aug '14

28 Aug '14

commit 55ba877738578e16269ce3517db5deb2a596083e Merge: b6c8f29 2fa11cb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 28 10:35:30 2014 +0000 Merge remote-tracking branch 'pc/bug4234-04' gitian/Makefile | 1 + gitian/descriptors/linux/gitian-bundle.yml | 31 ++++++++++++++++++---- gitian/descriptors/linux/gitian-firefox.yml | 13 ++++++++- gitian/descriptors/mac/gitian-bundle.yml | 35 ++++++++++++++++++++----- gitian/descriptors/mac/gitian-firefox.yml | 16 +++++++++-- gitian/descriptors/windows/gitian-bundle.yml | 35 +++++++++++++++++++++---- gitian/descriptors/windows/gitian-firefox.yml | 16 +++++++++-- gitian/mkbundle-linux.sh | 4 ++- gitian/mkbundle-mac.sh | 4 +-- gitian/mkbundle-windows.sh | 3 ++- gitian/versions | 2 ++ gitian/versions.alpha | 2 ++ gitian/versions.beta | 2 ++ gitian/versions.nightly | 2 ++ 14 files changed, 140 insertions(+), 26 deletions(-)

1 0

[tor-browser-bundle/master] Bug 4234: Use the Firefox Update Process for TBB.
by gk＠torproject.org 28 Aug '14

28 Aug '14

commit 2fa11cb1ebc0ccc71e467d0779136d3dadb658d4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 27 17:17:51 2014 -0400 Bug 4234: Use the Firefox Update Process for TBB. Create and deliver complete MAR files for each platform/locale combination.. Deliver a set of MAR file creation tools for Linux (32 and 64-bit). Just in case someone wants to skip the Linux build, we build these tools (which are host tools) during the Windows and Mac builds as well. Use the new --with-tor-browser-version configure option to pass the Tor Browser version to the Firefox build process. Pass the correct update channel to the Firefox build process via the --enable-update-channel configure option. --- gitian/Makefile | 1 + gitian/descriptors/linux/gitian-bundle.yml | 31 ++++++++++++++++++---- gitian/descriptors/linux/gitian-firefox.yml | 13 ++++++++- gitian/descriptors/mac/gitian-bundle.yml | 35 ++++++++++++++++++++----- gitian/descriptors/mac/gitian-firefox.yml | 16 +++++++++-- gitian/descriptors/windows/gitian-bundle.yml | 35 +++++++++++++++++++++---- gitian/descriptors/windows/gitian-firefox.yml | 16 +++++++++-- gitian/mkbundle-linux.sh | 4 ++- gitian/mkbundle-mac.sh | 4 +-- gitian/mkbundle-windows.sh | 3 ++- gitian/versions | 2 ++ gitian/versions.alpha | 2 ++ gitian/versions.beta | 2 ++ gitian/versions.nightly | 2 ++ 14 files changed, 140 insertions(+), 26 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index c81e32c..3967795 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -89,6 +89,7 @@ clean-browser: clean-bundle rm -f ../../gitian-builder/inputs/tor-browser-linux* rm -f ../../gitian-builder/inputs/tor-browser-mac* rm -f ../../gitian-builder/inputs/tor-browser-win* + rm -f ../../gitian-builder/inputs/mar-tools-* clean-pt: clean-bundle rm -f ../../gitian-builder/inputs/pluggable-transports* diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 4b0696f..38882f3 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -50,8 +50,9 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "mar-tools-linux32.zip" +- "mar-tools-linux64.zip" - "tbb-docs.zip" -- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -73,6 +74,10 @@ script: | export PATH=$INSTDIR/python/bin:$PATH unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # + # Extract the MAR tools. + unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip + MARTOOLS=~/build/mar-tools + # cd tor-launcher make clean make package @@ -141,16 +146,22 @@ script: | # pushd tor-browser_en-US/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js - # Set the version of the bundle. - grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed - cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed - mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + # + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd tor-browser_en-US/Browser + rm -f precomplete + python $MARTOOLS/createprecomplete.py popd # + # Create full MAR file and compressed package. + MAR_FILE=tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE tor-browser_en-US/Browser ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz tor-browser_en-US rm -rf tor-browser_en-US # @@ -169,8 +180,18 @@ script: | # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd tor-browser_$LANG/Browser + rm -f precomplete + python $MARTOOLS/createprecomplete.py popd + # Create full MAR file and compressed package for this locale. + MAR_FILE=tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE tor-browser_$LANG/Browser ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.tar.xz tor-browser_$LANG rm -rf tor-browser_$LANG diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 7e6c598..90958c2 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -71,7 +71,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # make $MAKEOPTS -f client.mk build @@ -84,6 +84,17 @@ script: | # But let's find out if it actually matters first.. rm -f $INSTDIR/Browser/*.chk # + # Make MAR-based update tools available for use during the bundle phase. + MARTOOLS=~/build/mar-tools + mkdir -p $MARTOOLS + cp -p config/createprecomplete.py $MARTOOLS/ + cp -p tools/update-packaging/*.sh $MARTOOLS/ + cp -p obj-*/dist/host/bin/mar $MARTOOLS/ + cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + cd ~/build + zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools + cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ + # # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, and the plugin-container (see ticket #10126) cd $INSTDIR diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 8528106..9801826 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -3,7 +3,7 @@ name: "bundle-mac" suites: - "precise" architectures: -- "i386" +- "amd64" packages: - "git-core" - "unzip" @@ -52,9 +52,9 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "mar-tools-mac64.zip" - "tbb-docs.zip" - "mac-tor.sh" -- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -73,6 +73,13 @@ script: | export TORBROWSER_NAME="TorBrowserBundle" fi # + # Extract the MAR tools. + unzip -d ~/build ~/build/mar-tools-mac$GBUILD_BITS.zip + MARTOOLS=~/build/mar-tools + # + # XXX: Find a better way to tell that we are having a 32bit build + GBUILD_BITS=32 + # mkdir -p $OUTDIR/ mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions @@ -158,14 +165,11 @@ script: | # pushd $TORBROWSER_NAME.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js - # Set the version of the bundle. - grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed - cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed - mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults popd # Install a headless copy of TorBrowser.app, with a modified Info.plist so # that it runs without a dock icon. See #11429. @@ -185,7 +189,15 @@ script: | # XXX: We need to insert these placeholders because otherwise mkisofs won't # include these otherwise empty dirs: touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt - touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd ~/build/$TORBROWSER_NAME.app/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py + popd + # + # Create full MAR file and disk image. + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app @@ -212,6 +224,7 @@ script: | # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults popd if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then @@ -220,6 +233,14 @@ script: | rm -rf TorBrowserBundle_$LANG.app popd else + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd ~/build/dmg/$DEST.app/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py + popd + # + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ rm -rf ~/build/dmg/$DEST.app fi diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 10077f5..be3544e 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -57,7 +57,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # make $MAKEOPTS -f client.mk build @@ -67,9 +67,21 @@ script: | # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $INSTDIR/TorBrowser.app/Contents/MacOS/firefox-bin # - cd $INSTDIR + # Make MAR-based update tools available for use during the bundle phase. + MARTOOLS=~/build/mar-tools + mkdir -p $MARTOOLS + cp -p config/createprecomplete.py $MARTOOLS/ + cp -p tools/update-packaging/*.sh $MARTOOLS/ + cp -p obj-*/dist/host/bin/mar $MARTOOLS/ + cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + cd ~/build + zip -r mar-tools-mac${GBUILD_BITS}.zip mar-tools + cp -p mar-tools-mac${GBUILD_BITS}.zip $OUTDIR/ + # # XXX: Find a better way to tell that we are having a 32bit build GBUILD_BITS=32 + # + cd $INSTDIR # Adjust the Info.plist file INFO_PLIST=TorBrowser.app/Contents/Info.plist mv $INFO_PLIST tmp.plist diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index bf7f531..79d6340 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -42,8 +42,8 @@ files: - "bare-version" - "bundle.inputs" - "versions" +- "mar-tools-win32.zip" - "tbb-docs.zip" -- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -55,6 +55,10 @@ script: | export LC_ALL=C umask 0022 # + # Extract the MAR tools. + unzip -d ~/build ~/build/mar-tools-win32.zip + MARTOOLS=~/build/mar-tools + # mkdir -p $OUTDIR/ mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions @@ -121,15 +125,24 @@ script: | # pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js - # Set the version of the bundle. - grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed - cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed - mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + # + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd "Tor Browser"/Browser/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py popd + # + # Create full MAR file and installer. + # Strangely, mbsdiff is linked as mbsdiff.exe even though it is a host + # (e.g., Linux) executable. + MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_en-US.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "Tor Browser"/Browser makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe # @@ -146,8 +159,20 @@ script: | cp ~/build/000-tor-browser.js defaults/preferences/ echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js + rm -rf defaults + popd + + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd "Tor Browser"/Browser/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py popd + # Create full MAR file and installer for this locale. + # Strangely, mbsdiff is linked as mbsdiff.exe even though it is a host + # (e.g., Linux) executable. + MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_$LANG.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "Tor Browser"/Browser makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe rm "Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 94b5eef..4ea551f 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -1,4 +1,3 @@ ---- name: "torbrowser-windows" suites: - "precise" @@ -70,7 +69,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - make -f client.mk configure + make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" find -type f | xargs touch --date="$REFERENCE_DATETIME" # # FIXME: MinGW doens't like being built with hardening, and Firefox doesn't @@ -99,6 +98,19 @@ script: | i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll + # Make MAR-based update tools available for use during the bundle phase. + # Strangely, mbsdiff is linked as mbsdiff.exe even though it is a host + # (e.g., Linux) executable. + MARTOOLS=~/build/mar-tools + mkdir -p $MARTOOLS + cp -p config/createprecomplete.py $MARTOOLS/ + cp -p tools/update-packaging/*.sh $MARTOOLS/ + cp -p obj-*/dist/host/bin/mar $MARTOOLS/ + cp -p obj-*/dist/host/bin/mbsdiff.exe $MARTOOLS/ + cd ~/build + zip -r mar-tools-win32.zip mar-tools + cp mar-tools-win32.zip $OUTDIR/ + # Making the .ja files deterministic and grabbing the results cd $INSTDIR ~/build/re-dzip.sh Browser/omni.ja diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index e3e2af5..7e90165 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -42,7 +42,6 @@ fi cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Linux\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -195,6 +194,7 @@ then cp -a build/out/tor-browser-linux*-gbuilt.zip inputs/ cp -a build/out/tor-browser-linux*-debug.zip inputs/ + cp -a build/out/mar-tools-linux*.zip inputs/ #cp -a result/torbrowser-linux-res.yml inputs/ else echo @@ -241,6 +241,8 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch inputs/bundle-linux.gbuilt else diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 995959a..9e8ec7c 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -42,7 +42,6 @@ fi cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -109,7 +108,7 @@ if [ ! -f inputs/openssl-$OPENSSL_VER-mac32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-mac32-utils.zip ]; then echo - echo "****** Starting Utilities Component of Mac Bundle (1/5 for Max) ******" + echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; @@ -174,6 +173,7 @@ then fi cp -a build/out/tor-browser-mac*-gbuilt.zip inputs/ + cp -a build/out/mar-tools-mac*.zip inputs/ #cp -a result/torbrowser-mac-res.yml inputs/ else echo diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 0af015d..58b23f1 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -42,7 +42,6 @@ fi cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions @@ -176,6 +175,7 @@ then fi cp -a build/out/tor-browser-win32-gbuilt.zip inputs/ + cp -a build/out/mar-tools-win32.zip inputs/ #cp -a result/torbrowser-windows-res.yml inputs/ else echo @@ -221,6 +221,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch inputs/bundle-windows.gbuilt else echo diff --git a/gitian/versions b/gitian/versions index 20c7e73..523005f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -6,6 +6,8 @@ VERIFY_TAGS=0 FIREFOX_VERSION=24.6.0esr +TORBROWSER_UPDATE_CHANNEL=release + TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.6.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 52d0b9b..ddcc0ad 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,6 +6,8 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.7.0esr +TORBROWSER_UPDATE_CHANNEL=alpha + TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.6-alpha TORLAUNCHER_TAG=0.2.6.2 diff --git a/gitian/versions.beta b/gitian/versions.beta index dbb50d8..6371d51 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -6,6 +6,8 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr +TORBROWSER_UPDATE_CHANNEL=beta + TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f2ef57c..a460782 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -6,6 +6,8 @@ VERIFY_TAGS=0 FIREFOX_VERSION=24.7.0esr +TORBROWSER_UPDATE_CHANNEL=default + TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master TORLAUNCHER_TAG=master

1 0

[tor-browser-bundle/master] Removed already fixed/wrongly categorized bugs.
by gk＠torproject.org 28 Aug '14

28 Aug '14

commit b6c8f29844459ea69fd69e51a55c60e889045dd0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 28 10:31:13 2014 +0000 Removed already fixed/wrongly categorized bugs. --- Bundle-Data/Docs/ChangeLog.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 43257b5..37d8339 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -25,11 +25,6 @@ Tor Browser Bundle 3.6.5 -- Sep 2 2014 * Update Firefox to 24.8.0esr * Update Torbutton to 1.6.12.1 * Bug 12684: New strings for canvas image extraction message - * Bug 12221: Remove obsolete Javascript components from the toggle era - * Bug 10819: Bind new third party isolation pref to Torbutton security UI - * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. - * Bug 12680: Change Torbutton URL in about dialog. - * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap * Bug 9531: Workaround to avoid rare hangs during New Identity * Bug 12684: Improve Canvas image extraction permissions prompt * Bug 7265: Only prompt for first party canvas access. Log all scripts @@ -82,7 +77,6 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Bug 11200: Fix a hang during bootstrap introduced in the initial bug11200 patch. * Update NoScript to 2.6.8.36 - * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap * Bug 12680: Fix Torbutton about url.

1 0

[tor-browser-bundle/maint-3.6] Removed already fixed/wrongly categorized bugs.
by gk＠torproject.org 28 Aug '14

28 Aug '14

commit d3e6f5c3fe0ee4e7825740c12c21a424f8ab8ff3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 28 10:26:09 2014 +0000 Removed already fixed/wrongly categorized bugs. --- Bundle-Data/Docs/ChangeLog.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b0d8eee..e2301cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,11 +3,6 @@ Tor Browser Bundle 3.6.5 -- Sep 2 2014 * Update Firefox to 24.8.0esr * Update Torbutton to 1.6.12.1 * Bug 12684: New strings for canvas image extraction message - * Bug 12221: Remove obsolete Javascript components from the toggle era - * Bug 10819: Bind new third party isolation pref to Torbutton security UI - * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. - * Bug 12680: Change Torbutton URL in about dialog. - * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap * Bug 9531: Workaround to avoid rare hangs during New Identity * Bug 12684: Improve Canvas image extraction permissions prompt * Bug 7265: Only prompt for first party canvas access. Log all scripts @@ -27,7 +22,6 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Bug 11200: Fix a hang during bootstrap introduced in the initial bug11200 patch. * Update NoScript to 2.6.8.36 - * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap * Bug 12680: Fix Torbutton about url.

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Bug 4234: Use the Firefox Update Process for TBB.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 43c5ec54ce50cd08ccc27b02ef2b3ebbef9a02aa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 14 11:39:09 2014 -0400 Bug 4234: Use the Firefox Update Process for TBB. New configure options: --with-tor-browser-version=VERSION # Pass TBB version throughout build. --enable-tor-browser-update # Enable bundle update behavior. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc --- .mozconfig | 5 +- .mozconfig-mac | 6 +- .mozconfig-mingw | 5 +- accessible/src/Makefile.in | 2 +- accessible/src/shared.mozbuild | 2 +- browser/app/profile/000-tor-browser.js | 8 +- browser/app/profile/firefox.js | 11 +- browser/base/content/aboutDialog.js | 45 +++- browser/branding/official/pref/firefox-branding.js | 4 +- browser/confvars.sh | 19 +- browser/installer/Makefile.in | 4 + browser/installer/removed-files.in | 4 +- config/createprecomplete.py | 14 +- configure.in | 28 ++- js/src/configure.in | 3 - toolkit/modules/debug.js | 1 + toolkit/mozapps/extensions/Makefile.in | 2 +- toolkit/mozapps/update/nsUpdateService.js | 68 +++++- toolkit/mozapps/update/updater/updater.cpp | 245 +++++++++++++++++--- toolkit/xre/nsAppRunner.cpp | 10 +- toolkit/xre/nsUpdateDriver.cpp | 39 ++++ tools/update-packaging/common.sh | 62 ++++- tools/update-packaging/make_full_update.sh | 40 +++- tools/update-packaging/make_incremental_update.sh | 62 ++++- 24 files changed, 566 insertions(+), 123 deletions(-) diff --git a/.mozconfig b/.mozconfig index e9a9432..97e0349 100755 --- a/.mozconfig +++ b/.mozconfig @@ -9,12 +9,15 @@ mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +# We do not use signed MAR files yet (Mozilla uses them on Windows only). +ac_add_options --disable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-maintenance-service -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes diff --git a/.mozconfig-mac b/.mozconfig-mac index 25a3f7d..7f28096 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,7 +38,11 @@ ac_add_options --disable-debug # See above for a reason why this is currently disabled # ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS -ac_add_options --disable-updater +#ac_add_options --disable-updater +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +# We do not use signed MAR files yet (Mozilla uses them on Windows only). +ac_add_options --disable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 78f9a06..9c8695d 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -14,8 +14,11 @@ ac_add_options --disable-debug ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --enable-official-branding +ac_add_options --enable-tor-browser-update +ac_add_options --enable-update-packaging +# We do not use signed MAR files yet (Mozilla uses them on Windows only). +ac_add_options --disable-verify-mar -ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc diff --git a/accessible/src/Makefile.in b/accessible/src/Makefile.in index aafeb3b..762a89c 100644 --- a/accessible/src/Makefile.in +++ b/accessible/src/Makefile.in @@ -13,7 +13,7 @@ A11Y_LOG = 0 ifdef MOZ_DEBUG A11Y_LOG = 1 endif -ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifeq (,$(filter aurora alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) A11Y_LOG = 1 endif export A11Y_LOG diff --git a/accessible/src/shared.mozbuild b/accessible/src/shared.mozbuild index 839ef82..52e9804 100644 --- a/accessible/src/shared.mozbuild +++ b/accessible/src/shared.mozbuild @@ -8,5 +8,5 @@ a11y_log = 0 if CONFIG['MOZ_DEBUG']: a11y_log = 1 -if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'beta', 'release', 'esr'): +if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'alpha', 'beta', 'release', 'esr'): a11y_log = 1 diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6ff777..ef2a2a3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -2,9 +2,8 @@ # Tor Browser Bundle # Do not edit this file. -// Disable browser auto updaters and associated homepage notifications +// Disable browser automatic updates and associated homepage notifications pref("app.update.auto", false); -pref("app.update.enabled", false); pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("browser.startup.homepage_override.mstone", "ignore"); @@ -156,5 +155,6 @@ pref("media.audio_data.enabled", false); // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3); -// Version placeholder -pref("torbrowser.version", "UNKNOWN"); +#ifdef TOR_BROWSER_VERSION +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ae78798..3e3a77c 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -121,11 +121,8 @@ pref("app.update.cert.maxErrors", 5); // when the |app.update.cert.checkAttributes| preference is set to false. Also, // the |app.update.url.override| preference should ONLY be used for testing. // IMPORTANT! metro.js should also be updated for updates to certs.X.issuerName -pref("app.update.certs.1.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US"); -pref("app.update.certs.1.commonName", "aus3.mozilla.org"); - -pref("app.update.certs.2.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US"); -pref("app.update.certs.2.commonName", "aus3.mozilla.org"); +pref("app.update.certs.1.issuerName", "CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US"); +pref("app.update.certs.1.commonName", "*.torproject.org"); // Whether or not app updates are enabled pref("app.update.enabled", true); @@ -155,7 +152,7 @@ pref("app.update.silent", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TAR…"); +pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update/%CHANNEL%/%BUILD_TARGET%/…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section @@ -173,7 +170,7 @@ pref("app.update.idletime", 60); // upgrade start page instead! Other apps may wish to show this UI, and supply // a whatsNewURL field in their brand.properties that contains a link to a page // which tells users what's new in this new update. -pref("app.update.showInstalledUI", false); +pref("app.update.showInstalledUI", true); // 0 = suppress prompting for incompatibilities if there are updates available // to newer versions of installed addons that resolve them. diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index ea8350c..c72c828 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -7,6 +7,11 @@ Components.utils.import("resource://gre/modules/Services.jsm"); const PREF_EM_HOTFIX_ID = "extensions.hotfix.id"; +#ifdef TOR_BROWSER_VERSION +# Add double-quotes back on (stripped by JarMaker.py). +#expand const TOR_BROWSER_VERSION = "__TOR_BROWSER_VERSION__"; +#endif + function init(aEvent) { if (aEvent.target != document) @@ -37,13 +42,16 @@ function init(aEvent) // Include the build ID and display warning if this is an "a#" (nightly or aurora) build let version = Services.appinfo.version; if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8); - document.getElementById("version").textContent += " (" + buildDate + ")"; document.getElementById("experimental").hidden = false; document.getElementById("communityDesc").hidden = true; } +#ifdef TOR_BROWSER_VERSION + let versionElem = document.getElementById("version"); + if (versionElem) + versionElem.textContent += " (TBB " + TOR_BROWSER_VERSION + ")"; +#endif + #ifdef MOZ_UPDATER gAppUpdater = new appUpdater(); @@ -328,9 +336,15 @@ appUpdater.prototype = return; } + // If the update has the same version as the current application, + // skip add-on compatibility check and start downloading now. +#ifdef TOR_BROWSER_UPDATE + var pkgVersion = TOR_BROWSER_VERSION; +#else + var pkgVersion = Services.appinfo.version; +#endif if (!gAppUpdater.update.appVersion || - Services.vc.compare(gAppUpdater.update.appVersion, - Services.appinfo.version) == 0) { + Services.vc.compare(gAppUpdater.update.appVersion, pkgVersion) == 0) { gAppUpdater.startDownload(); return; } @@ -396,11 +410,16 @@ appUpdater.prototype = // (see bug 566787). The hotfix add-on is also ignored as it shouldn't // block the user from upgrading. try { +#ifdef TOR_BROWSER_UPDATE + let compatVersion = self.update.platformVersion; +#else + let compatVersion = self.update.appVersion; +#endif if (aAddon.type != "plugin" && aAddon.id != hotfixID && !aAddon.appDisabled && !aAddon.userDisabled && aAddon.scope != AddonManager.SCOPE_APPLICATION && aAddon.isCompatible && - !aAddon.isCompatibleWith(self.update.appVersion, + !aAddon.isCompatibleWith(compatVersion, self.update.platformVersion)) self.addons.push(aAddon); } @@ -424,8 +443,13 @@ appUpdater.prototype = */ checkAddonsForUpdates: function() { this.addons.forEach(function(aAddon) { +#ifdef TOR_BROWSER_UPDATE + let compatVersion = self.update.platformVersion; +#else + let compatVersion = self.update.appVersion; +#endif aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED, - this.update.appVersion, + compatVersion, this.update.platformVersion); }, this); }, @@ -446,8 +470,13 @@ appUpdater.prototype = * See XPIProvider.jsm */ onUpdateAvailable: function(aAddon, aInstall) { +#ifdef TOR_BROWSER_UPDATE + let compatVersion = self.update.platformVersion; +#else + let compatVersion = self.update.appVersion; +#endif if (!Services.blocklist.isAddonBlocklisted(aAddon.id, aInstall.version, - this.update.appVersion, + compatVersion, this.update.platformVersion)) { // Compatibility or new version updates mean the same thing here. this.onCompatibilityUpdateAvailable(aAddon); diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index 0201301..6a15345 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -13,10 +13,10 @@ pref("app.update.download.backgroundInterval", 60); pref("app.update.promptWaitTime", 172800); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/firefox/"); +pref("app.update.url.manual", "https://www.torproject.org/download/download-easy.html"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes"); +pref("app.update.url.details", "https://www.torproject.org/projects/torbrowser.html"); pref("browser.search.param.ms-pc", "MOZI"); pref("browser.search.param.yahoo-fr", "moz35"); diff --git a/browser/confvars.sh b/browser/confvars.sh index 5bcb399..5432d51 100644 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -8,21 +8,6 @@ MOZ_APP_VENDOR=Mozilla MOZ_UPDATER=1 MOZ_PHOENIX=1 -if test "$OS_ARCH" = "WINNT"; then - if ! test "$HAVE_64BIT_OS"; then - MOZ_VERIFY_MAR_SIGNATURE=1 - MOZ_MAINTENANCE_SERVICE=1 - if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ - "$MOZ_UPDATE_CHANNEL" = "aurora" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta" -o \ - "$MOZ_UPDATE_CHANNEL" = "release"; then - if ! test "$MOZ_DEBUG"; then - MOZ_STUB_INSTALLER=1 - fi - fi - fi -fi - MOZ_CHROME_FILE_FORMAT=omni MOZ_SAFE_BROWSING=1 MOZ_SERVICES_COMMON=1 @@ -46,9 +31,9 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list # of values. -ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr +ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-release # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " -MAR_CHANNEL_ID=firefox-mozilla-esr +MAR_CHANNEL_ID=torbrowser-torproject-release MOZ_PROFILE_MIGRATOR=1 MOZ_EXTENSION_MANAGER=1 MOZ_APP_STATIC_INI=1 diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 4e3ab6f..b0700db 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -76,6 +76,10 @@ ifdef WIN32_REDIST_DIR DEFINES += -DMOZ_MSVC_REDIST=$(_MSC_VER) endif +ifdef TOR_BROWSER_UPDATE +DEFINES += -DTOR_BROWSER_UPDATE +endif + ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) DEFINES += -DMOZ_SHARED_MOZGLUE=1 endif diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index 6801f63..f2554ea 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -1434,7 +1434,9 @@ xpicleanup@BIN_SUFFIX@ #endif #if MOZ_MSVC_REDIST != 1600 msvcp100.dll - msvcr100.dll + #ifndef TOR_BROWSER_UPDATE + msvcr100.dll + #endif #endif #if MOZ_MSVC_REDIST != 1700 msvcp110.dll diff --git a/config/createprecomplete.py b/config/createprecomplete.py index 7fe8109..8332b21 100644 --- a/config/createprecomplete.py +++ b/config/createprecomplete.py @@ -5,6 +5,7 @@ # update instructions which is used to remove files and directories that are no # longer present in a complete update. The current working directory is used for # the location to enumerate and to create the precomplete file. +# For symlinks, remove instructions are always generated. import sys import os @@ -12,7 +13,10 @@ import os def get_build_entries(root_path): """ Iterates through the root_path, creating a list for each file and directory. Excludes any path starting with extensions or distribution - and paths ending with channel-prefs.js. + and paths ending with channel-prefs.js. To support Tor Browser updates, + excludes TorBrowser/Data/Browser/profiles.ini, + TorBrowser/Data/Browser/profile.default/bookmarks.html and + TorBrowser/Data/Tor/torrc. """ rel_file_path_set = set() rel_dir_path_set = set() @@ -23,6 +27,9 @@ def get_build_entries(root_path): rel_path_file = rel_path_file.replace("\\", "/") if not (rel_path_file.startswith("distribution/") or rel_path_file.startswith("extensions/") or + rel_path_file == "TorBrowser/Data/Browser/profiles.ini" or + rel_path_file == "TorBrowser/Data/Browser/profile.default/bookmarks.html" or + rel_path_file == "TorBrowser/Data/Tor/torrc" or rel_path_file.endswith("channel-prefs.js")): rel_file_path_set.add(rel_path_file) @@ -32,7 +39,10 @@ def get_build_entries(root_path): rel_path_dir = rel_path_dir.replace("\\", "/")+"/" if not (rel_path_dir.startswith("distribution/") or rel_path_dir.startswith("extensions/")): - rel_dir_path_set.add(rel_path_dir) + if (os.path.islink(rel_path_dir[:-1])): + rel_file_path_set.add(rel_path_dir[:-1]) + else: + rel_dir_path_set.add(rel_path_dir) rel_file_path_list = list(rel_file_path_set) rel_file_path_list.sort(reverse=True) diff --git a/configure.in b/configure.in index 7de51e7..243aaee 100644 --- a/configure.in +++ b/configure.in @@ -3849,15 +3849,12 @@ AC_SUBST(GRE_MILESTONE) # set RELEASE_BUILD and NIGHTLY_BUILD variables depending on the cycle we're in # The logic works like this: # - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD) -# - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora # - otherwise, we're building Release/Beta (define RELEASE_BUILD) case "$GRE_MILESTONE" in *a1*) NIGHTLY_BUILD=1 AC_DEFINE(NIGHTLY_BUILD) ;; - *a*) - ;; *) RELEASE_BUILD=1 AC_DEFINE(RELEASE_BUILD) @@ -6408,6 +6405,31 @@ MOZ_ARG_ENABLE_BOOL(update-packaging, AC_SUBST(MOZ_UPDATE_PACKAGING) dnl ======================================================== +dnl Tor Additions +dnl ======================================================== +MOZ_ARG_WITH_STRING(tor-browser-version, +[ --with-tor-browser-version=VERSION + Set Tor Browser version, e.g., 4.0b1], + TOR_BROWSER_VERSION="$withval") + +MOZ_ARG_ENABLE_BOOL(tor-browser-update, +[ --enable-tor-browser-update + Enable Tor Browser update], + TOR_BROWSER_UPDATE=1, + TOR_BROWSER_UPDATE= ) + +if test -n "$TOR_BROWSER_UPDATE"; then + if test -z "$TOR_BROWSER_VERSION"; then + AC_MSG_ERROR([--enable-tor-browser-update requires --with-tor-browser-version.]) + fi + AC_DEFINE(TOR_BROWSER_UPDATE) +fi + +AC_DEFINE_UNQUOTED(TOR_BROWSER_VERSION,"$TOR_BROWSER_VERSION") +AC_SUBST(TOR_BROWSER_VERSION) +AC_SUBST(TOR_BROWSER_UPDATE) + +dnl ======================================================== dnl build the tests by default dnl ======================================================== MOZ_ARG_DISABLE_BOOL(tests, diff --git a/js/src/configure.in b/js/src/configure.in index 22ef8e2..e00c032 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -3074,15 +3074,12 @@ AC_SUBST(GRE_MILESTONE) dnl set RELEASE_BUILD and NIGHTLY_BUILD variables depending on the cycle we're in dnl The logic works like this: dnl - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD) -dnl - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora dnl - otherwise, we're building Release/Beta (define RELEASE_BUILD) case "$GRE_MILESTONE" in *a1*) NIGHTLY_BUILD=1 AC_DEFINE(NIGHTLY_BUILD) ;; - *a*) - ;; *) RELEASE_BUILD=1 AC_DEFINE(RELEASE_BUILD) diff --git a/toolkit/modules/debug.js b/toolkit/modules/debug.js index 822ae90..4c20b82 100644 --- a/toolkit/modules/debug.js +++ b/toolkit/modules/debug.js @@ -40,6 +40,7 @@ this.NS_ASSERT = function NS_ASSERT(condition, message) { try { switch (defB.getCharPref("app.update.channel")) { case "nightly": + case "alpha": case "beta": case "default": releaseBuild = false; diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in index ad9cc62..c90698d 100644 --- a/toolkit/mozapps/extensions/Makefile.in +++ b/toolkit/mozapps/extensions/Makefile.in @@ -9,7 +9,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifeq (,$(filter aurora beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifeq (,$(filter aurora alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) DEFINES += -DMOZ_COMPATIBILITY_NIGHTLY=1 endif diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index e7b6fa8..eb4a74a 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -11,7 +11,11 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/FileUtils.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); +#ifdef BUILD_CTYPES +#ifdef XP_WIN Components.utils.import("resource://gre/modules/ctypes.jsm"); +#endif +#endif const Cc = Components.classes; const Ci = Components.interfaces; @@ -73,6 +77,10 @@ const KEY_GRED = "GreD"; const KEY_UPDROOT = "UpdRootD"; const KEY_EXECUTABLE = "XREExeF"; +#ifdef TOR_BROWSER_VERSION +#expand const TOR_BROWSER_VERSION = __TOR_BROWSER_VERSION__; +#endif + #ifdef MOZ_WIDGET_GONK #define USE_UPDATE_ARCHIVE_DIR #endif @@ -253,6 +261,7 @@ XPCOMUtils.defineLazyGetter(this, "gOSVersion", function aus_gOSVersion() { } if (osVersion) { +#ifdef BUILD_CTYPES #ifdef XP_WIN const BYTE = ctypes.uint8_t; const WORD = ctypes.uint16_t; @@ -359,6 +368,7 @@ XPCOMUtils.defineLazyGetter(this, "gOSVersion", function aus_gOSVersion() { } } #endif +#endif try { osVersion += " (" + sysInfo.getProperty("secondaryLibrary") + ")"; @@ -1224,7 +1234,7 @@ function getLocale() { if (gLocale) return gLocale; - for each (res in ['app', 'gre']) { + for each (var res in ['app', 'gre']) { var channel = Services.io.newChannel("resource://" + res + "/" + FILE_UPDATE_LOCALE, null, null); try { var inputStream = channel.open(); @@ -2390,9 +2400,14 @@ UpdateService.prototype = { updates.forEach(function(aUpdate) { // Ignore updates for older versions of the application and updates for // the same version of the application with the same build ID. - if (vc.compare(aUpdate.appVersion, Services.appinfo.version) < 0 || - vc.compare(aUpdate.appVersion, Services.appinfo.version) == 0 && - aUpdate.buildID == Services.appinfo.appBuildID) { +#ifdef TOR_BROWSER_UPDATE + var compatVersion = TOR_BROWSER_VERSION; +#else + var compatVersion = Services.appinfo.version; +#endif + var rc = vc.compare(aUpdate.appVersion, compatVersion); + if (rc < 0 || ((rc == 0) && + (aUpdate.buildID == Services.appinfo.appBuildID))) { LOG("UpdateService:selectUpdate - skipping update because the " + "update's application version is less than the current " + "application version"); @@ -2548,8 +2563,13 @@ UpdateService.prototype = { } // Only check add-on compatibility when the version changes. +#ifdef TOR_BROWSER_UPDATE + var compatVersion = TOR_BROWSER_VERSION; +#else + var compatVersion = Services.appinfo.version; +#endif if (update.appVersion && - Services.vc.compare(update.appVersion, Services.appinfo.version) != 0) { + Services.vc.compare(update.appVersion, compatVersion) != 0) { this._update = update; this._checkAddonCompatibility(); } @@ -2577,6 +2597,11 @@ UpdateService.prototype = { // Get all the installed add-ons var self = this; AddonManager.getAllAddons(function(addons) { +#ifdef TOR_BROWSER_UPDATE + let compatVersion = self._update.platformVersion; +#else + let compatVersion = self._update.appVersion; +#endif self._incompatibleAddons = []; addons.forEach(function(addon) { // Protect against code that overrides the add-ons manager and doesn't @@ -2605,7 +2630,7 @@ UpdateService.prototype = { !addon.appDisabled && !addon.userDisabled && addon.scope != AddonManager.SCOPE_APPLICATION && addon.isCompatible && - !addon.isCompatibleWith(self._update.appVersion, + !addon.isCompatibleWith(compatVersion, self._update.platformVersion)) self._incompatibleAddons.push(addon); } @@ -2641,7 +2666,7 @@ UpdateService.prototype = { self._incompatibleAddons.forEach(function(addon) { addon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED, - this._update.appVersion, this._update.platformVersion); + compatVersion, this._update.platformVersion); }, self); } else { @@ -2677,8 +2702,13 @@ UpdateService.prototype = { // the add-on will become incompatible. let bs = Cc["@mozilla.org/extensions/blocklist;1"]. getService(Ci.nsIBlocklistService); +#ifdef TOR_BROWSER_UPDATE + let compatVersion = gUpdates.update.platformVersion; +#else + let compatVersion = gUpdates.update.appVersion; +#endif if (bs.isAddonBlocklisted(addon.id, install.version, - gUpdates.update.appVersion, + compatVersion, gUpdates.update.platformVersion)) return; @@ -2781,14 +2811,24 @@ UpdateService.prototype = { // current application's version or the update's version is the same as the // application's version and the build ID is the same as the application's // build ID. +#ifdef TOR_BROWSER_UPDATE + var compatVersion = TOR_BROWSER_VERSION; +#else + var compatVersion = Services.appinfo.version; +#endif if (update.appVersion && - (Services.vc.compare(update.appVersion, Services.appinfo.version) < 0 || + (Services.vc.compare(update.appVersion, compatVersion) < 0 || update.buildID && update.buildID == Services.appinfo.appBuildID && - update.appVersion == Services.appinfo.version)) { + update.appVersion == compatVersion)) { LOG("UpdateService:downloadUpdate - canceling download of update since " + "it is for an earlier or same application version and build ID.\n" + - "current application version: " + Services.appinfo.version + "\n" + +#ifdef TOR_BROWSER_UPDATE + "current Tor Browser version: " + compatVersion + "\n" + + "update Tor Browser version : " + update.appVersion + "\n" + +#else + "current application version: " + compatVersion + "\n" + "update application version : " + update.appVersion + "\n" + +#endif "current build ID: " + Services.appinfo.appBuildID + "\n" + "update build ID : " + update.buildID); cleanupActiveUpdate(); @@ -2821,7 +2861,7 @@ UpdateService.prototype = { } #endif // Set the previous application version prior to downloading the update. - update.previousAppVersion = Services.appinfo.version; + update.previousAppVersion = compatVersion; this._downloader = new Downloader(background, this); return this._downloader.downloadUpdate(update); }, @@ -3233,7 +3273,11 @@ Checker.prototype = { } url = url.replace(/%PRODUCT%/g, Services.appinfo.name); +#ifdef TOR_BROWSER_UPDATE + url = url.replace(/%VERSION%/g, TOR_BROWSER_VERSION); +#else url = url.replace(/%VERSION%/g, Services.appinfo.version); +#endif url = url.replace(/%BUILD_ID%/g, Services.appinfo.appBuildID); url = url.replace(/%BUILD_TARGET%/g, Services.appinfo.OS + "_" + gABI); url = url.replace(/%OS_VERSION%/g, gOSVersion); diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 4012f00..7a5220d 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -20,7 +20,7 @@ * updatev2.manifest * ----------------- * method = "add" | "add-if" | "patch" | "patch-if" | "remove" | - * "rmdir" | "rmrfdir" | type + * "rmdir" | "rmrfdir" | "addsymlink" | type * * 'type' is the update type (e.g. complete or partial) and when present MUST * be the first entry in the update manifest. The type is used to support @@ -404,10 +404,12 @@ get_full_path(const NS_tchar *relpath) * The line from the manifest that contains the path. * @param isdir * Whether the path is a directory path. Defaults to false. + * @param islinktarget + * Whether the path is a symbolic link target. Defaults to false. * @return valid filesystem path or NULL if the path checks fail. */ static NS_tchar* -get_valid_path(NS_tchar **line, bool isdir = false) +get_valid_path(NS_tchar **line, bool isdir = false, bool islinktarget = false) { NS_tchar *path = mstrtok(kQuote, line); if (!path) { @@ -442,10 +444,12 @@ get_valid_path(NS_tchar **line, bool isdir = false) path[NS_tstrlen(path) - 1] = NS_T('\0'); } - // Don't allow relative paths that resolve to a parent directory. - if (NS_tstrstr(path, NS_T("..")) != NULL) { - LOG(("get_valid_path: paths must not contain '..': " LOG_S, path)); - return NULL; + if (!islinktarget) { + // Don't allow relative paths that resolve to a parent directory. + if (NS_tstrstr(path, NS_T("..")) != NULL) { + LOG(("get_valid_path: paths must not contain '..': " LOG_S, path)); + return NULL; + } } return path; @@ -480,7 +484,8 @@ static void ensure_write_permissions(const NS_tchar *path) (void) _wchmod(path, _S_IREAD | _S_IWRITE); #else struct stat fs; - if (!stat(path, &fs) && !(fs.st_mode & S_IWUSR)) { + if (!NS_tlstat(path, &fs) && !S_ISLNK(fs.st_mode) + && !(fs.st_mode & S_IWUSR)) { (void)chmod(path, fs.st_mode | S_IWUSR); } #endif @@ -680,7 +685,7 @@ static int ensure_copy(const NS_tchar *path, const NS_tchar *dest) return READ_ERROR; } -#ifdef XP_UNIX +#ifndef XP_WIN if (S_ISLNK(ss.st_mode)) { return ensure_copy_symlink(path, dest); } @@ -779,7 +784,7 @@ static int ensure_copy_recursive(const NS_tchar *path, const NS_tchar *dest, return READ_ERROR; } -#ifdef XP_UNIX +#ifndef XP_WIN if (S_ISLNK(sInfo.st_mode)) { return ensure_copy_symlink(path, dest); } @@ -838,14 +843,19 @@ static int rename_file(const NS_tchar *spath, const NS_tchar *dpath, return rv; struct stat spathInfo; - rv = NS_tstat(spath, &spathInfo); + rv = NS_tlstat(spath, &spathInfo); if (rv) { LOG(("rename_file: failed to read file status info: " LOG_S ", " \ "err: %d", spath, errno)); return READ_ERROR; } - if (!S_ISREG(spathInfo.st_mode)) { +#ifdef XP_WIN + if (!S_ISREG(spathInfo.st_mode)) +#else + if (!S_ISREG(spathInfo.st_mode) && !S_ISLNK(spathInfo.st_mode)) +#endif + { if (allowDirs && !S_ISDIR(spathInfo.st_mode)) { LOG(("rename_file: path present, but not a file: " LOG_S ", err: %d", spath, errno)); @@ -855,7 +865,12 @@ static int rename_file(const NS_tchar *spath, const NS_tchar *dpath, } } - if (!NS_taccess(dpath, F_OK)) { +#ifdef XP_WIN + if (!NS_taccess(dpath, F_OK)) +#else + if (!S_ISLNK(spathInfo.st_mode) && !NS_taccess(dpath, F_OK)) +#endif + { if (ensure_remove(dpath)) { LOG(("rename_file: destination file exists and could not be " \ "removed: " LOG_S, dpath)); @@ -892,7 +907,18 @@ static int backup_restore(const NS_tchar *path) NS_tsnprintf(backup, sizeof(backup)/sizeof(backup[0]), NS_T("%s") BACKUP_EXT, path); - if (NS_taccess(backup, F_OK)) { + bool isLink = false; +#ifndef XP_WIN + struct stat linkInfo; + int rv = NS_tlstat(path, &linkInfo); + if (!rv) { + LOG(("backup_restore: cannot get info for backup file: " LOG_S, backup)); + return OK; + } + isLink = S_ISLNK(linkInfo.st_mode); +#endif + + if (!isLink && NS_taccess(backup, F_OK)) { LOG(("backup_restore: backup file doesn't exist: " LOG_S, backup)); return OK; } @@ -907,8 +933,18 @@ static int backup_discard(const NS_tchar *path) NS_tsnprintf(backup, sizeof(backup)/sizeof(backup[0]), NS_T("%s") BACKUP_EXT, path); + bool isLink = false; +#ifndef XP_WIN + struct stat linkInfo; + int rv2 = NS_tlstat(backup, &linkInfo); + if (rv2) { + return OK; // File does not exist; nothing to do. + } + isLink = S_ISLNK(linkInfo.st_mode); +#endif + // Nothing to discard - if (NS_taccess(backup, F_OK)) { + if (!isLink && NS_taccess(backup, F_OK)) { return OK; } @@ -988,7 +1024,7 @@ private: class RemoveFile : public Action { public: - RemoveFile() : mFile(NULL), mSkip(0) { } + RemoveFile() : mFile(NULL), mSkip(0), mIsLink(0) { } int Parse(NS_tchar *line); int Prepare(); @@ -998,6 +1034,7 @@ public: private: const NS_tchar *mFile; int mSkip; + int mIsLink; }; int @@ -1015,28 +1052,39 @@ RemoveFile::Parse(NS_tchar *line) int RemoveFile::Prepare() { - // Skip the file if it already doesn't exist. - int rv = NS_taccess(mFile, F_OK); - if (rv) { - mSkip = 1; - mProgressCost = 0; - return OK; + int rv; +#ifndef XP_WIN + struct stat linkInfo; + rv = NS_tlstat(mFile, &linkInfo); + mIsLink = ((0 == rv) && S_ISLNK(linkInfo.st_mode)); +#endif + + if (!mIsLink) { + // Skip the file if it already doesn't exist. + rv = NS_taccess(mFile, F_OK); + if (rv) { + mSkip = 1; + mProgressCost = 0; + return OK; + } } LOG(("PREPARE REMOVEFILE " LOG_S, mFile)); - // Make sure that we're actually a file... - struct stat fileInfo; - rv = NS_tstat(mFile, &fileInfo); - if (rv) { - LOG(("failed to read file status info: " LOG_S ", err: %d", mFile, - errno)); - return READ_ERROR; - } + if (!mIsLink) { + // Make sure that we're actually a file... + struct stat fileInfo; + rv = NS_tstat(mFile, &fileInfo); + if (rv) { + LOG(("failed to read file status info: " LOG_S ", err: %d", mFile, + errno)); + return READ_ERROR; + } - if (!S_ISREG(fileInfo.st_mode)) { - LOG(("path present, but not a file: " LOG_S, mFile)); - return UNEXPECTED_FILE_OPERATION_ERROR; + if (!S_ISREG(fileInfo.st_mode)) { + LOG(("path present, but not a file: " LOG_S, mFile)); + return UNEXPECTED_FILE_OPERATION_ERROR; + } } NS_tchar *slash = (NS_tchar *) NS_tstrrchr(mFile, NS_T('/')); @@ -1066,7 +1114,13 @@ RemoveFile::Execute() // The file is checked for existence here and in Prepare since it might have // been removed by a separate instruction: bug 311099. - int rv = NS_taccess(mFile, F_OK); + int rv = 0; + if (mIsLink) { + struct stat linkInfo; + rv = NS_tlstat(mFile, &linkInfo); + } else { + rv = NS_taccess(mFile, F_OK); + } if (rv) { LOG(("file cannot be removed because it does not exist; skipping")); mSkip = 1; @@ -1683,6 +1737,97 @@ PatchIfFile::Finish(int status) PatchFile::Finish(status); } +#ifndef XP_WIN +class AddSymlink : public Action +{ +public: + AddSymlink() : mLinkName(NULL) + , mTarget(NULL) + , mAdded(false) + { } + + virtual int Parse(NS_tchar *line); + virtual int Prepare(); + virtual int Execute(); + virtual void Finish(int status); + +private: + const NS_tchar *mLinkName; + const NS_tchar *mTarget; + bool mAdded; +}; + +int +AddSymlink::Parse(NS_tchar *line) +{ + // format "<linkname>" "target" + + mLinkName = get_valid_path(&line); + if (!mLinkName) + return PARSE_ERROR; + + // consume whitespace between args + NS_tchar *q = mstrtok(kQuote, &line); + if (!q) + return PARSE_ERROR; + + mTarget = get_valid_path(&line, false, true); + if (!mTarget) + return PARSE_ERROR; + + return OK; +} + +int +AddSymlink::Prepare() +{ + LOG(("PREPARE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + + return OK; +} + +int +AddSymlink::Execute() +{ + LOG(("EXECUTE ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + + // First make sure that we can actually get rid of any existing file or link. + struct stat linkInfo; + int rv = NS_tlstat(mLinkName, &linkInfo); + if ((0 == rv) && !S_ISLNK(linkInfo.st_mode)) { + rv = NS_taccess(mLinkName, F_OK); + } + if (rv == 0) { + rv = backup_create(mLinkName); + if (rv) + return rv; + } else { + rv = ensure_parent_dir(mLinkName); + if (rv) + return rv; + } + + // Create the link. + rv = symlink(mTarget, mLinkName); + if (!rv) { + mAdded = true; + } + + return rv; +} + +void +AddSymlink::Finish(int status) +{ + LOG(("FINISH ADDSYMLINK " LOG_S " -> " LOG_S, mLinkName, mTarget)); + // When there is an update failure and a link has been added it is removed + // here since there might not be a backup to replace it. + if (status && mAdded) + NS_tremove(mLinkName); + backup_finish(mLinkName, status); +} +#endif + //----------------------------------------------------------------------------- #ifdef XP_WIN @@ -1902,19 +2047,40 @@ CopyInstallDirToDestDir() // These files should not be copied over to the updated app #ifdef XP_WIN -#define SKIPLIST_COUNT 3 + #ifdef TOR_BROWSER_UPDATE + #define SKIPLIST_COUNT 5 + #else + #define SKIPLIST_COUNT 3 + #endif #else -#define SKIPLIST_COUNT 2 + #ifdef TOR_BROWSER_UPDATE + #define SKIPLIST_COUNT 4 + #else + #define SKIPLIST_COUNT 2 + #endif #endif copy_recursive_skiplist<SKIPLIST_COUNT> skiplist; #ifdef XP_MACOSX skiplist.append(0, installDir, NS_T("Updated.app")); skiplist.append(1, installDir, NS_T("Contents/MacOS/updates/0")); +#ifdef TOR_BROWSER_UPDATE + skiplist.append(2, installDir, NS_T("TorBrowser/Data/Browser/profile.default/.parentlock")); + skiplist.append(3, installDir, NS_T("TorBrowser/Data/Tor/lock")); +#endif #else skiplist.append(0, installDir, NS_T("updated")); skiplist.append(1, installDir, NS_T("updates/0")); +#ifdef TOR_BROWSER_UPDATE +#ifdef XP_UNIX + skiplist.append(2, installDir, NS_T("TorBrowser/Data/Browser/profile.default/.parentlock")); +#else + skiplist.append(2, installDir, NS_T("TorBrowser/Data/Browser/profile.default/parent.lock")); +#endif + skiplist.append(3, installDir, NS_T("TorBrowser/Data/Tor/lock")); +#endif #ifdef XP_WIN - skiplist.append(2, installDir, NS_T("updated.update_in_progress.lock")); + skiplist.append(SKIPLIST_COUNT - 1, installDir, + NS_T("updated.update_in_progress.lock")); #endif #endif @@ -3124,7 +3290,7 @@ int NS_main(int argc, NS_tchar **argv) LogFinish(); if (argc > callbackIndex) { -#if defined(XP_WIN) +#if defined(XP_WIN) && !defined(TOR_BROWSER_UPDATE) if (gSucceeded) { // The service update will only be executed if it is already installed. // For first time installs of the service, the install will happen from @@ -3747,6 +3913,11 @@ int DoUpdate() else if (NS_tstrcmp(token, NS_T("add-cc")) == 0) { // no longer supported continue; } +#ifndef XP_WIN + else if (NS_tstrcmp(token, NS_T("addsymlink")) == 0) { + action = new AddSymlink(); + } +#endif else { LOG(("DoUpdate: unknown token: " LOG_S, token)); return PARSE_ERROR; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 42787c0..c94839f 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3499,12 +3499,20 @@ XREMain::XRE_mainStartup(bool* aExitFlag) NS_ENSURE_SUCCESS(rv, 1); rv = exeFile->GetParent(getter_AddRefs(exeDir)); NS_ENSURE_SUCCESS(rv, 1); +#ifdef TOR_BROWSER_UPDATE + nsAutoCString compatVersion(TOR_BROWSER_VERSION); +#endif ProcessUpdates(mDirProvider.GetGREDir(), exeDir, updRoot, gRestartArgc, gRestartArgv, - mAppData->version); +#ifdef TOR_BROWSER_UPDATE + compatVersion.get() +#else + mAppData->version +#endif + ); if (EnvHasValue("MOZ_PROCESS_UPDATES")) { SaveToEnv("MOZ_PROCESS_UPDATES="); *aExitFlag = true; diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 5223e8cc8..a4e4034 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -139,6 +139,18 @@ GetCurrentWorkingDir(char *buf, size_t size) return NS_OK; } + +#ifdef DEBUG +static void +dump_argv(const char *aPrefix, char **argv, int argc) +{ + printf("%s - %d args\n", aPrefix, argc); + for (int i = 0; i < argc; ++i) + printf(" %d: %s\n", i, argv[i]); +} +#endif + + #if defined(XP_MACOSX) // This is a copy of OS X's XRE_GetBinaryPath from nsAppRunner.cpp with the // gBinaryPath check removed so that the updater can reload the stub executable @@ -294,6 +306,10 @@ IsOlderVersion(nsIFile *versionFile, const char *appVersion) if (strncmp(buf, kNull, sizeof(kNull) - 1) == 0) return false; +#ifdef DEBUG + printf("IsOlderVersion checking appVersion %s against updateVersion %s\n", + appVersion, buf); +#endif if (mozilla::Version(appVersion) > buf) return true; @@ -874,6 +890,9 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, #endif LOG(("spawning updater process [%s]\n", updaterPath.get())); +#ifdef DEBUG + dump_argv("ApplyUpdate updater", argv, argc); +#endif #if defined(USE_EXECV) // Don't use execv for background updates. @@ -897,6 +916,9 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, // LaunchChildMac uses posix_spawnp and prefers the current // architecture when launching. It doesn't require a // null-terminated string but it doesn't matter if we pass one. +#ifdef DEBUG + dump_argv("ApplyUpdate after SetupMacCommandLine", argv, argc); +#endif LaunchChildMac(argc, argv, 0, outpid); if (restart) { exit(0); @@ -938,6 +960,12 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir, nsresult rv; nsCOMPtr<nsIFile> updatesDir; +#ifdef DEBUG + nsAutoCString path; + updRootDir->GetNativePath(path); + printf("ProcessUpdates updateRootDir: %s appVersion: %s\n", + path.get(), appVersion); +#endif rv = updRootDir->Clone(getter_AddRefs(updatesDir)); if (NS_FAILED(rv)) return rv; @@ -985,6 +1013,11 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir, nsCOMPtr<nsIFile> statusFile; UpdateStatus status = GetUpdateStatus(updatesDir, statusFile); +#ifdef DEBUG + printf("ProcessUpdates status: %d\n", status); + updatesDir->GetNativePath(path); + printf("ProcessUpdates updatesDir: %s\n", path.get()); +#endif switch (status) { case ePendingUpdate: case ePendingService: { @@ -1064,7 +1097,11 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate) if (NS_FAILED(rv)) appDir = dirProvider->GetAppDir(); +#ifdef TOR_BROWSER_UPDATE + appVersion = TOR_BROWSER_VERSION; +#else appVersion = gAppData->version; +#endif argc = gRestartArgc; argv = gRestartArgv; } else { @@ -1088,6 +1125,8 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate) if (NS_FAILED(rv)) updRoot = appDir; + // To support Tor Browser Bundle updates from xpcshell, modify the + // following code to use the TBB version fron the configure process. nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1"); if (appInfo) { diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index c358846..075ab08 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -9,6 +9,8 @@ # # ----------------------------------------------------------------------------- +QUIET=0 + # By default just assume that these tools exist on our path MAR=${MAR:-mar} BZIP2=${BZIP2:-bzip2} @@ -21,6 +23,12 @@ notice() { echo "$*" 1>&2 } +verbose_notice() { + if [ $QUIET -eq 0 ]; then + notice "$*" + fi +} + get_file_size() { info=($(ls -ln "$1")) echo ${info[4]} @@ -52,14 +60,22 @@ make_add_instruction() { # Use the subdirectory of the extensions folder as the file to test # before performing this add instruction. testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - notice " add-if: $f$forced" + verbose_notice " add-if: $f$forced" echo "add-if \"$testdir\" \"$f\"" else - notice " add: $f$forced" + verbose_notice " add: $f$forced" echo "add \"$f\"" fi } +make_addsymlink_instruction() { + link="$1" + target="$2" + + verbose_notice " addsymlink: $link -> $target" + echo "addsymlink \"$link\" \"$target\"" +} + make_patch_instruction() { f="$1" is_extension=$(echo "$f" | grep -c 'distribution/extensions/.*/') @@ -67,10 +83,10 @@ make_patch_instruction() { # Use the subdirectory of the extensions folder as the file to test # before performing this add instruction. testdir=$(echo "$f" | sed 's/$.*distribution\/extensions\/[^\/]*$\/.*/\1/') - notice " patch-if: $f" + verbose_notice " patch-if: $f" echo "patch-if \"$testdir\" \"$f.patch\" \"$f\"" else - notice " patch: $f" + verbose_notice " patch: $f" echo "patch \"$f.patch\" \"$f\"" fi } @@ -113,17 +129,17 @@ append_remove_instructions() { fi fi if [ $(echo "$f" | grep -c '\/$') = 1 ]; then - notice " rmdir: $fixedprefix$f" - echo "rmdir \"$fixedprefix$f\"" >> $filev2 + verbose_notice " rmdir: $fixedprefix$f" + echo "rmdir \"$fixedprefix$f\"" >> "$filev2" elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then # Remove the * f=$(echo "$f" | sed -e 's:\*$::') - notice " rmrfdir: $fixedprefix$f" - echo "rmrfdir \"$fixedprefix$f\"" >> $filev2 + verbose_notice " rmrfdir: $fixedprefix$f" + echo "rmrfdir \"$fixedprefix$f\"" >> "$filev2" else - notice " remove: $fixedprefix$f" - echo "remove \"$fixedprefix$f\"" >> $filev1 - echo "remove \"$fixedprefix$f\"" >> $filev2 + verbose_notice " remove: $fixedprefix$f" + echo "remove \"$fixedprefix$f\"" >> "$filev1" + echo "remove \"$fixedprefix$f\"" >> "$filev2" fi fi fi @@ -132,6 +148,9 @@ append_remove_instructions() { } # List all files in the current directory, stripping leading "./" +# To support Tor Browser updates, skip TorBrowser/Data/Browser/profiles.ini, +# TorBrowser/Data/Browser/profile.default/bookmarks.html and +# TorBrowser/Data/Tor/torrc. # Skip the channel-prefs.js file as it should not be included in any # generated MAR files (see bug 306077). Pass a variable name and it will be # filled as an array. @@ -147,6 +166,11 @@ list_files() { | sed 's/\.\/$.*$/\1/' \ | sort -r > "temp-filelist" while read file; do + if [ $file = "TorBrowser/Data/Browser/profiles.ini" -o \ + $file = "TorBrowser/Data/Browser/profile.default/bookmarks.html" -o \ + $file = "TorBrowser/Data/Tor/torrc" ]; then + continue; + fi eval "${1}[$count]=\"$file\"" (( count++ )) done < "temp-filelist" @@ -168,3 +192,19 @@ list_dirs() { done < "temp-dirlist" rm "temp-dirlist" } + +# List all symbolic links in the current directory, stripping leading "./" +list_symlinks() { + count=0 + + find . -type l \ + | sed 's/\.\/$.*$/\1/' \ + | sort -r > "temp-symlinklist" + while read symlink; do + target=$(readlink "$symlink") + eval "${1}[$count]=\"$symlink\"" + eval "${2}[$count]=\"$target\"" + (( count++ )) + done < "temp-symlinklist" + rm "temp-symlinklist" +} diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 03ba9af..b1ba54e 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -10,6 +10,9 @@ . $(dirname "$0")/common.sh +# TODO: it would be better to pass this as a command line option. +directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' + # ----------------------------------------------------------------------------- print_usage() { @@ -28,10 +31,16 @@ if [ $1 = -h ]; then notice "" notice "Options:" notice " -h show this help text" + notice " -q be less verbose" notice "" exit 1 fi +if [ $1 = -q ]; then + QUIET=1 + shift +fi + # ----------------------------------------------------------------------------- archive="$1" @@ -64,19 +73,20 @@ if [ ! -f "precomplete" ]; then fi list_files files +list_symlinks symlinks symlink_targets popd notice "" notice "Adding file add instructions to file 'update.manifest'" -> $updatemanifestv1 +> "$updatemanifestv1" num_files=${#files[*]} for ((i=0; $i<$num_files; i=$i+1)); do f="${files[$i]}" - make_add_instruction "$f" >> $updatemanifestv1 + make_add_instruction "$f" >> "$updatemanifestv1" dir=$(dirname "$f") mkdir -p "$workdir/$dir" @@ -88,15 +98,35 @@ done # Add the type of update to the beginning of and cat the contents of the version # 1 update manifest to the version 2 update manifest. -> $updatemanifestv2 +> "$updatemanifestv2" notice "" notice "Adding type instruction to file 'updatev2.manifest'" notice " type: complete" -echo "type \"complete\"" >> $updatemanifestv2 +echo "type \"complete\"" >> "$updatemanifestv2" + +# If removal of any old, existing directories is desired, emit the appropriate +# rmdfdir commands. +for dir_to_remove in $directories_to_remove; do + # rmrfdir requires a trailing slash; if slash is missing, add one. + if ! [[ "$dir_to_remove" =~ /$ ]]; then + dir_to_remove="${dir_to_remove}/" + fi + echo "rmrfdir \"$dir_to_remove\"" >> "$updatemanifestv2" +done + notice "" notice "Concatenating file 'update.manifest' to file 'updatev2.manifest'" -cat $updatemanifestv1 >> $updatemanifestv2 +cat "$updatemanifestv1" >> "$updatemanifestv2" + +notice "" +notice "Adding symlink add instructions to file 'updatev2.manifest'" +num_symlinks=${#symlinks[*]} +for ((i=0; $i<$num_symlinks; i=$i+1)); do + link="${symlinks[$i]}" + target="${symlink_targets[$i]}" + make_addsymlink_instruction "$link" "$target" >> "$updatemanifestv2" +done # Append remove instructions for any dead files. notice "" diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 0363831..b58e7dd 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -21,6 +21,7 @@ print_usage() { notice " -h show this help text" notice " -f clobber this file in the installation" notice " Must be a path to a file to clobber in the partial update." + notice " -q be less verbose" notice "" } @@ -47,6 +48,17 @@ check_for_forced_update() { ## "true" *giggle* return 0; fi + + # If the file in the skip list ends with /*, do a prefix match. + # This allows TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/* to be used to force all HTTPS Everywhere files to be updated. + f_suffix=${f##*/} + if [[ $f_suffix = "*" ]]; then + f_prefix="${f%\/\*}"; + if [[ $forced_file_chk == $f_prefix* ]]; then + ## 0 means "true" + return 0; + fi + fi done ## 'false'... because this is bash. Oh yay! return 1; @@ -57,13 +69,26 @@ if [ $# = 0 ]; then exit 1 fi -requested_forced_updates='Contents/MacOS/firefox' +# The last .xpi is NoScript. +ext_path='TorBrowser/Data/Browser/profile.default/extensions'; +# TODO: it would be better to pass this as a command line option. +exts='https-everywhere(a)eff.org/* tor-launcher(a)torproject.org.xpi torbutton(a)torproject.org.xpi uriloader(a)pdf.js.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' +requested_forced_updates='Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox' +for ext in $exts; do + requested_forced_updates="$requested_forced_updates $ext_path/$ext" +done + + +# TODO: it would be better to pass this as a command line option. +directories_to_remove='TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org' -while getopts "hf:" flag +while getopts "hqf:" flag do case "$flag" in h) print_usage; exit 0 ;; + q) QUIET=1 + ;; f) requested_forced_updates="$requested_forced_updates $OPTARG" ;; ?) print_usage; exit 1 @@ -102,6 +127,7 @@ if test $? -ne 0 ; then fi list_files oldfiles +list_symlinks oldsymlinks oldsymlink_targets list_dirs olddirs popd @@ -118,6 +144,7 @@ fi list_dirs newdirs list_files newfiles +list_symlinks newsymlinks newsymlink_targets popd @@ -139,7 +166,7 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do # removed-files is excluded by make_incremental_updates.py so it is excluded # here for consistency. - if [ `basename $f` = "removed-files" ]; then + if [ "`basename "$f"`" = "removed-files" ]; then continue 1 fi @@ -188,6 +215,23 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do fi done +# Remove and re-add symlinks +notice "" +notice "Adding symlink remove/add instructions to file 'update.manifest'" +num_oldsymlinks=${#oldsymlinks[*]} +for ((i=0; $i<$num_oldsymlinks; i=$i+1)); do + link="${oldsymlinks[$i]}" + verbose_notice " remove: $link" + echo "remove \"$link\"" >> $updatemanifestv1 +done + +num_newsymlinks=${#newsymlinks[*]} +for ((i=0; $i<$num_newsymlinks; i=$i+1)); do + link="${newsymlinks[$i]}" + target="${newsymlink_targets[$i]}" + make_addsymlink_instruction "$link" "$target" >> $updatemanifestv1 +done + # Newly added files notice "" notice "Adding file add instructions to file 'update.manifest'" @@ -198,7 +242,7 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do # removed-files is excluded by make_incremental_updates.py so it is excluded # here for consistency. - if [ `basename $f` = "removed-files" ]; then + if [ "`basename "$f"`" = "removed-files" ]; then continue 1 fi @@ -235,6 +279,16 @@ notice "Adding type instruction to file 'updatev2.manifest'" notice " type: partial" echo "type \"partial\"" >> $updatemanifestv2 +# If removal of any old, existing directories is desired, emit the appropriate +# rmdfdir commands. +for dir_to_remove in $directories_to_remove; do + # rmrfdir reuires a trailing slash, so add one if missing. + if ! [[ "$dir_to_remove" =~ /$ ]]; then + dir_to_remove="${dir_to_remove}/" + fi + echo "rmrfdir \"$dir_to_remove\"" >> $updatemanifestv2 +done + notice "" notice "Concatenating file 'update.manifest' to file 'updatev2.manifest'" cat $updatemanifestv1 >> $updatemanifestv2

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Merge remote-tracking branch 'brade/bug4234-05' into tor-browser-24.7.0esr-4.x-2
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 3b338aadd92ac0c3d9584fceea28f8934cdf20f0 Merge: 88d5119 43c5ec5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 23:44:37 2014 -0700 Merge remote-tracking branch 'brade/bug4234-05' into tor-browser-24.7.0esr-4.x-2 .mozconfig | 5 +- .mozconfig-mac | 6 +- .mozconfig-mingw | 5 +- accessible/src/Makefile.in | 2 +- accessible/src/shared.mozbuild | 2 +- browser/app/profile/000-tor-browser.js | 8 +- browser/app/profile/firefox.js | 11 +- browser/base/content/aboutDialog.js | 45 +++- browser/branding/official/pref/firefox-branding.js | 4 +- browser/confvars.sh | 19 +- browser/installer/Makefile.in | 4 + browser/installer/removed-files.in | 4 +- config/createprecomplete.py | 14 +- configure.in | 28 ++- js/src/configure.in | 3 - toolkit/modules/debug.js | 1 + toolkit/mozapps/extensions/Makefile.in | 2 +- toolkit/mozapps/update/common/updatedefines.h | 1 + toolkit/mozapps/update/common/updatehelper.cpp | 2 - toolkit/mozapps/update/nsUpdateService.js | 68 ++++- toolkit/mozapps/update/test/Makefile.in | 6 + toolkit/mozapps/update/test/TestAUSHelper.cpp | 2 - toolkit/mozapps/update/updater/Makefile.in | 7 + toolkit/mozapps/update/updater/updater.cpp | 262 +++++++++++++++++--- toolkit/xre/nsAppRunner.cpp | 10 +- toolkit/xre/nsUpdateDriver.cpp | 39 +++ tools/update-packaging/common.sh | 62 ++++- tools/update-packaging/make_full_update.sh | 40 ++- tools/update-packaging/make_incremental_update.sh | 62 ++++- 29 files changed, 595 insertions(+), 129 deletions(-)

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] MinGW-w64 fixes for updater. See Moz bug 1022847.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit 616b4446a586de5d5ba487ed813f78dc54ca1af7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 13 21:38:11 2014 -0400 MinGW-w64 fixes for updater. See Moz bug 1022847. --- toolkit/mozapps/update/common/updatedefines.h | 1 + toolkit/mozapps/update/common/updatehelper.cpp | 2 -- toolkit/mozapps/update/test/Makefile.in | 6 ++++++ toolkit/mozapps/update/test/TestAUSHelper.cpp | 2 -- toolkit/mozapps/update/updater/Makefile.in | 7 +++++++ toolkit/mozapps/update/updater/updater.cpp | 17 +++++++++++++++-- 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h index 6a35129..09a2231 100644 --- a/toolkit/mozapps/update/common/updatedefines.h +++ b/toolkit/mozapps/update/common/updatedefines.h @@ -39,6 +39,7 @@ # define putenv _putenv # define stat _stat +# define fstat _fstat // This Tor Project change may not be needed with ESR 31. # define DELETE_DIR L"tobedeleted" # define CALLBACK_BACKUP_EXT L".moz-callback" diff --git a/toolkit/mozapps/update/common/updatehelper.cpp b/toolkit/mozapps/update/common/updatehelper.cpp index ab64c2d..b14b0f6 100644 --- a/toolkit/mozapps/update/common/updatehelper.cpp +++ b/toolkit/mozapps/update/common/updatehelper.cpp @@ -10,7 +10,6 @@ #define _WIN32_WINNT 0x602 #include <objbase.h> #include <shobjidl.h> -#pragma comment(lib, "ole32.lib") #endif #include <windows.h> @@ -27,7 +26,6 @@ // Needed for PathAppendW #include <shlwapi.h> -#pragma comment(lib, "shlwapi.lib") WCHAR* MakeCommandLine(int argc, WCHAR **argv); BOOL PathAppendSafe(LPWSTR base, LPCWSTR extra); diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in index b01aac7..a12d2fe 100644 --- a/toolkit/mozapps/update/test/Makefile.in +++ b/toolkit/mozapps/update/test/Makefile.in @@ -56,6 +56,12 @@ LIBS += \ ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 DEFINES += -DUNICODE -D_UNICODE +OS_LIBS += $(call EXPAND_LIBNAME,wintrust shlwapi) +ifdef GNU_CC +# MinGW requires -municode to define the wWinMain() entry point. +# With ESR 31, this Tor Project change will need to be moved to moz.build. +WIN32_EXE_LDFLAGS += -municode +endif endif endif # Not Android diff --git a/toolkit/mozapps/update/test/TestAUSHelper.cpp b/toolkit/mozapps/update/test/TestAUSHelper.cpp index 854293b..542c0ed 100644 --- a/toolkit/mozapps/update/test/TestAUSHelper.cpp +++ b/toolkit/mozapps/update/test/TestAUSHelper.cpp @@ -3,8 +3,6 @@ */ #ifdef XP_WIN -#pragma comment(lib, "wintrust.lib") -#pragma comment(lib, "crypt32.lib") # include <windows.h> # include <wintrust.h> # include <tlhelp32.h> diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 4c0edc6..ba28b0b 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -75,6 +75,13 @@ WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup WIN32_EXE_LDFLAGS += -DELAYLOAD:wsock32.dll -DELAYLOAD:crypt32.dll -DELAYLOAD:userenv.dll endif +ifeq ($(OS_ARCH),WINNT) +ifdef GNU_CC +# With ESR 31, this Tor Project change will need to be moved to moz.build. +WIN32_EXE_LDFLAGS += -municode +endif +endif + ifdef MOZ_WIDGET_GTK libs:: updater.png $(NSINSTALL) -D $(DIST)/bin/icons diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 927f77e..4012f00 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -30,6 +30,12 @@ * ----------- * method = "remove" | "rmdir" */ + +// To avoid conflicts within MinGW headers, sys/stat.h must be included +// before ../common/updatedefines.h which is included by progressui.h +// This Tor Project change may not be needed with ESR 31. +#include <sys/stat.h> + #include "bspatch.h" #include "progressui.h" #include "archivereader.h" @@ -41,9 +47,12 @@ #include <string.h> #include <stdlib.h> #include <stdarg.h> +#ifdef XP_WIN +// This Tor Project change may not be needed with ESR 31. +#include <algorithm> // for std::max +#endif #include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include <limits.h> #include <errno.h> @@ -2301,6 +2310,10 @@ UpdateThreadFunc(void *param) QuitProgressUI(); } +#ifdef __MINGW32__ +// This Tor Project change may not be needed with gcc 4.9 or newer. +extern "C" +#endif int NS_main(int argc, NS_tchar **argv) { #if defined(MOZ_WIDGET_GONK) @@ -2947,7 +2960,7 @@ int NS_main(int argc, NS_tchar **argv) if (!GetInstallationDir(installDir)) return 1; size_t callbackPrefixLength = PathCommonPrefixW(argv[callbackIndex], installDir, NULL); - NS_tstrncpy(p, argv[callbackIndex] + max(callbackPrefixLength, commonPrefixLength), bufferLeft); + NS_tstrncpy(p, argv[callbackIndex] + std::max(callbackPrefixLength, commonPrefixLength), bufferLeft); targetPath = buffer; } if (!GetLongPathNameW(targetPath, callbackLongPath,

1 0

[tor-browser-bundle/master] Add in 3.6.5 to canonical changelog.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 0fdd0fda1d11bc40f50efc8c60c244aae645528b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 19:16:26 2014 -0700 Add in 3.6.5 to canonical changelog. --- Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0aa0e7a..43257b5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -20,6 +20,24 @@ Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * Windows: * Bug 10065: Enable DEP, ASLR, and SSP hardening options +Tor Browser Bundle 3.6.5 -- Sep 2 2014 + * All Platforms + * Update Firefox to 24.8.0esr + * Update Torbutton to 1.6.12.1 + * Bug 12684: New strings for canvas image extraction message + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Bug 12680: Change Torbutton URL in about dialog. + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 9531: Workaround to avoid rare hangs during New Identity + * Bug 12684: Improve Canvas image extraction permissions prompt + * Bug 7265: Only prompt for first party canvas access. Log all scripts + that attempt to extract canvas images to Browser console. + * Bug 12974: Disable NTLM and Negotiate HTTP Auth + * Bug 2874: Remove Components.* from content access (regression) + * Bug 9881: Open popups in new tabs by default + Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) @@ -57,6 +75,7 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Bug 9516: Show Tor log in TorBrowser's Browser Console * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message

1 0

[tor-browser-bundle/maint-3.6] Add missing subticket for Tor Launcher to 3.6.4 changelog.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 7838ffa0f401822048c420fbfb08598524af29e6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 19:15:20 2014 -0700 Add missing subticket for Tor Launcher to 3.6.4 changelog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fe69179..b0d8eee 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -20,6 +20,7 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Bug 9516: Show Tor log in TorBrowser's Browser Console * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message

1 0

[tor-browser-bundle/maint-3.6] Changelog for 3.6.5.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit d923d8defe18ec7776e56e3541d21a5681a03089 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 19:14:09 2014 -0700 Changelog for 3.6.5. --- Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d0336d7..fe69179 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser Bundle 3.6.5 -- Sep 2 2014 + * All Platforms + * Update Firefox to 24.8.0esr + * Update Torbutton to 1.6.12.1 + * Bug 12684: New strings for canvas image extraction message + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Bug 12680: Change Torbutton URL in about dialog. + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 9531: Workaround to avoid rare hangs during New Identity + * Bug 12684: Improve Canvas image extraction permissions prompt + * Bug 7265: Only prompt for first party canvas access. Log all scripts + that attempt to extract canvas images to Browser console. + * Bug 12974: Disable NTLM and Negotiate HTTP Auth + * Bug 2874: Remove Components.* from content access (regression) + * Bug 9881: Open popups in new tabs by default + Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23

1 0

[torbutton/master] Bug 8940: Move RecommendedTBBVersions file to www.torproject.org.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit cdd220ec835705a68aa06c047b235ad172b6fe40 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 19:05:24 2014 -0700 Bug 8940: Move RecommendedTBBVersions file to www.torproject.org. --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index d2945c0..af9838a 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -29,7 +29,7 @@ pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/ pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); -pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions"); +pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true); // XXX: wtf prefs? These seem not actually connected, but govern

1 0

[tor-browser-bundle/master] Changelog draft for 4.0-alpha-2.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit a0ce2c3ade02b29c155508639724fe72f5b4b740 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 18:31:36 2014 -0700 Changelog draft for 4.0-alpha-2. --- Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8eb4284..0aa0e7a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 + * All Platforms + * Update Firefox to 24.8.0esr + * Update Tor Launcher to 0.2.7.0 + * Bug 11405: Remove firewall prompt from wizard. + * Bug 12895: Mention @riseup.net as a valid bridge request email address + * Bug 12444: Provide feedback when “Copy Tor Log” is clicked. + * Bug 11199: Improve error messages if Tor exits unexpectedly + * Update Torbutton to 1.6.12.1 + * Bug 12684: New strings for canvas image extraction message + * Bug 12684: Improve Canvas image extraction permissions prompt + * Bug 7265: Only prompt for first party canvas access. Log all scripts + that attempt to extract canvas images to Browser console. + * Bug 12974: Disable NTLM and Negotiate HTTP Auth + * Bug 2874: Remove Components.* from content access (regression) + * Bug 4234: Automatic Update support (off by default) + * Bug 9881: Open popups in new tabs by default + * Meek Pluggable Transport: + * Use TLSv1.0 in meek-http-helper to blend in with Firefox 24 + * Windows: + * Bug 10065: Enable DEP, ASLR, and SSP hardening options + Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10)

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 88d511942b3efba809e70e4709360130ca91c09a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 18:26:22 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Open popups in new tabs to avoid full screen popups. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6ff777..a58ce4a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -73,6 +73,7 @@ pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); +pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 3b4d010889e1ab571698a3b6294e0bef348ed044 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 18:27:06 2014 -0700 fixup! Tor Browser's Firefox preference overrides. Open popups in new tabs to avoid full screen popups. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6ff777..a58ce4a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -73,6 +73,7 @@ pref("dom.enable_performance", false); pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); +pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser-bundle/master] Stop checking HTTPS-Everywhere's tag. We use the xpi.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit b923c68ede1199ad492cfae7045c5dd98ef017ba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 16:07:53 2014 -0700 Stop checking HTTPS-Everywhere's tag. We use the xpi. --- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 7ca4416..afcd70d 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -50,7 +50,7 @@ echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs -echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs +#echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs echo "`cd mingw-w64-git && git log --format=%H -1 $MINGW_TAG` mingw-w64.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a664b52..a4f6ca1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -96,13 +96,13 @@ torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG -https-everywhere https-everywhere.gpg $HTTPSE_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG EOF +#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit"

1 0

[tor-browser-bundle/maint-3.6] Stop checking HTTPS-Everywhere's tag. We use the xpi.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit a5ccfbc333008607dee27d6d5a2d6c10e3720cb4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 16:05:02 2014 -0700 Stop checking HTTPS-Everywhere's tag. We use the xpi. --- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index bbae06f..7531589 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -51,7 +51,7 @@ echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs -echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs +#echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs echo "`cd tbb-windows-installer && git log --format=%H -1 $NSIS_TAG` tbb-windows-installer.git" >> bundle.inputs echo "`cd $INPUTS_DIR && git log --format=%H -1` gitian-builder.git" >> bundle.inputs echo "`cd $WRAPPER_DIR && git log --format=%H -1` tor-browser-bundle.git" >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 324a27a..9814440 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -96,11 +96,11 @@ torbutton torbutton.gpg $TORBUTTON_TAG zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG -https-everywhere https-everywhere.gpg $HTTPSE_TAG pyptlib pyptlib.gpg $PYPTLIB_TAG obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG EOF +#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit"

1 0

[tor-browser-bundle/maint-3.6] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit b139e04c388230ba3aef98376b3d69b7aa3f30e0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:55:40 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index be5c9d9..32c4139 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -248,13 +248,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index e700ad3..25bafb0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4906e1c..d7d3dc7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,6 +27,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index c76acde..346a5d1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e19ebdc..335000b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -28,6 +28,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Switch to build candidates directory for fetching Firefox langpacks.
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 2da330af506d344e97b8d192a512c4c7df4a663e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:52:08 2014 -0700 Switch to build candidates directory for fetching Firefox langpacks. This will allow us to build earlier, and also make our build hashes reproducible in the event of a minor langpack hash change we decide to ignore. --- gitian/fetch-inputs.sh | 6 +++--- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.beta | 1 + gitian/versions.nightly | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 086085c..ad82ddf 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -227,13 +227,13 @@ cd langpacks-$FIREFOX_LANG_VER for i in $BUNDLE_LOCALES do cd linux-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd win32-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. cd mac-langpacks - wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$FIREFOX_LANG_VER/…" + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" cd .. done diff --git a/gitian/versions b/gitian/versions index 20c7e73..9be200c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 52d0b9b..ec52a45 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.beta b/gitian/versions.beta index dbb50d8..c35ad6c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f2ef57c..0cf5d0b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,6 +30,7 @@ GITIAN_TAG=tor-browser-builder-3.x-6 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.8.3 PYTHON_VER=2.7.5

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 4825026471678728d5aa085717e301fc6551fe2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug #12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 5248730..3e5580d 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -85,6 +85,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, nsIAuthModule *module = (nsIAuthModule *) *continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (module) return NS_OK; diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index d25c1de..6882803 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -239,6 +239,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

[tor-browser/tor-browser-24.7.0esr-3.x-1] Bug #12974: Disable NTLM and Negotiate HTTP Auth
by mikeperry＠torproject.org 27 Aug '14

27 Aug '14

commit 9f4106c53e432599c084d38b7509692ccf42c5e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 27 15:19:10 2014 -0700 Bug #12974: Disable NTLM and Negotiate HTTP Auth This is technically an embargoed Mozilla bug, so I probably shouldn't provide too many details. Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I doubt very many (or any of them) actually need it. The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421 --- extensions/auth/nsHttpNegotiateAuth.cpp | 4 ++++ netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp b/extensions/auth/nsHttpNegotiateAuth.cpp index 5248730..3e5580d 100644 --- a/extensions/auth/nsHttpNegotiateAuth.cpp +++ b/extensions/auth/nsHttpNegotiateAuth.cpp @@ -85,6 +85,10 @@ nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel *authChannel, nsIAuthModule *module = (nsIAuthModule *) *continuationState; *identityInvalid = false; + + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + if (module) return NS_OK; diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp b/netwerk/protocol/http/nsHttpNTLMAuth.cpp index d25c1de..6882803 100644 --- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp +++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp @@ -239,6 +239,9 @@ nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel *channel, *identityInvalid = false; + /* Always fail Negotiate auth for Tor Browser. We don't need it. */ + return NS_ERROR_ABORT; + // Start a new auth sequence if the challenge is exactly "NTLM". // If native NTLM auth apis are available and enabled through prefs, // try to use them.

1 0

[tor-launcher/master] Bug 12444 fixup: use "Tor" instead of "tor" in feedback message.
by brade＠torproject.org 26 Aug '14

26 Aug '14

commit 4510c8e6057c17424313afe3077a5f7be4bc1085 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 26 10:40:11 2014 -0400 Bug 12444 fixup: use "Tor" instead of "tor" in feedback message. --- src/chrome/locale/en/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 20f6db2..02be756 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S -torlauncher.copiedNLogMessages=Copy complete. %S tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection

1 0

[tor-launcher/master] Bug 11405: Remove firewall prompt from wizard.
by brade＠torproject.org 26 Aug '14

26 Aug '14

commit 11467241203a65e71de97d91a24b15ffa5b976da Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 26 10:25:11 2014 -0400 Bug 11405: Remove firewall prompt from wizard. If the user sets a proxy but doesn't set a bridge, set ReachableAddresses to include only ports 80 and 443. --- src/chrome/content/network-settings-wizard.xul | 36 +-------- src/chrome/content/network-settings.js | 101 ++++++++++++++++-------- src/chrome/locale/en/network-settings.dtd | 7 +- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6682fdd..04251f9 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -54,7 +54,7 @@ </vbox> </wizardpage> - <wizardpage label=" " pageid="proxy" next="firewall" onextra2="onCopyLog();" + <wizardpage label=" " pageid="proxy" next="bridges" onextra2="onCopyLog();" onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardProxyNext(this);"> <vbox class="tbb-logo-box" align="start"> @@ -74,7 +74,7 @@ </hbox> </wizardpage> - <wizardpage pageid="proxyYES" next="firewall" onextra2="onCopyLog();" + <wizardpage pageid="proxyYES" next="bridges" onextra2="onCopyLog();" onpageadvanced="return (getAndValidateProxySettings() != null)"> <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> @@ -84,38 +84,6 @@ <groupbox id="proxySpecificSettings" /> </wizardpage> - <wizardpage pageid="firewall" next="bridges" onextra2="onCopyLog();" - onpageshow="showOrHideButton('next', true, true)" - onpageadvanced="return onWizardFirewallNext(this);"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator /> - <hbox> - <vbox flex="1"> - <label class="question">&torSettings.firewallQuestion;</label> - <radiogroup id="firewallRadioGroup"> - <radio id="firewallRadioYes" label="&torSettings.yes;" /> - <radio id="firewallRadioNo" label="&torSettings.no;" selected="true" /> - </radiogroup> - <description class="questionHelp">&torSettings.firewallHelp; - </description> - </vbox> - </hbox> - </wizardpage> - - <wizardpage pageid="firewallYES" next="bridges" onextra2="onCopyLog();" - onpageadvanced="return (getAndValidateFirewallSettings() != null)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator /> - <vbox> - <label class="instructions">&torSettings.enterFirewall;</label> - <groupbox id="firewallSpecificSettings" /> - </vbox> - </wizardpage> - <wizardpage pageid="bridges" onextra2="onCopyLog();" onpageshow="onWizardUseBridgesRadioChange(this)"> <vbox class="tbb-logo-box" align="start"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 518d16d..908e711 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -29,7 +29,6 @@ const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; const kWizardProxyRadioGroup = "proxyRadioGroup"; -const kWizardFirewallRadioGroup = "firewallRadioGroup"; const kWizardUseBridgesRadioGroup = "useBridgesRadioGroup"; const kUseProxyCheckbox = "useProxy"; @@ -251,19 +250,7 @@ function onWizardProxyNext(aWizPage) if (aWizPage) { var hasProxy = getElemValue("proxyRadioYes", false); - aWizPage.next = (hasProxy) ? "proxyYES" : "firewall"; - } - - return true; -} - - -function onWizardFirewallNext(aWizPage) -{ - if (aWizPage) - { - var hasFirewall = getElemValue("firewallRadioYes", false); - aWizPage.next = (hasFirewall) ? "firewallYES" : "bridges"; + aWizPage.next = (hasProxy) ? "proxyYES" : "bridges"; } return true; @@ -877,6 +864,9 @@ function initProxySettings() // Returns true if successful. function initFirewallSettings() { + if (getWizard()) + return true; // The wizard does not directly expose firewall settings. + var allowedPorts; var reply = gProtocolSvc.TorGetConfStr(kTorConfKeyReachableAddresses, null); if (!gProtocolSvc.TorCommandSucceeded(reply)) @@ -899,7 +889,6 @@ function initFirewallSettings() } var haveFirewall = (allowedPorts != undefined); - setYesNoRadioValue(kWizardFirewallRadioGroup, haveFirewall); setElemValue(kUseFirewallPortsCheckbox, haveFirewall); if (allowedPorts) setElemValue(kFirewallAllowedPorts, allowedPorts); @@ -991,7 +980,7 @@ function useSettings() { var settings = {}; settings[kTorConfKeyDisableNetwork] = false; - this.setConfAndReportErrors(settings, null); + setConfAndReportErrors(settings, null); gProtocolSvc.TorSendCommand("SAVECONF"); gTorProcessService.TorClearBootstrapError(); @@ -1026,7 +1015,7 @@ function applyProxySettings() if (!settings) return false; - return this.setConfAndReportErrors(settings, "proxyYES"); + return setConfAndReportErrors(settings, "proxyYES"); } @@ -1044,9 +1033,7 @@ function getAndValidateProxySettings() settings[kTorConfKeyHTTPSProxyAuthenticator] = null; var proxyType, proxyAddrPort, proxyUsername, proxyPassword; - var useProxy = (getWizard()) ? getYesNoRadioValue(kWizardProxyRadioGroup) - : getElemValue(kUseProxyCheckbox, false); - if (useProxy) + if (isProxyConfigured()) { proxyAddrPort = createColonStr(getElemValue(kProxyAddr, null), getElemValue(kProxyPort, null)); @@ -1089,7 +1076,14 @@ function getAndValidateProxySettings() } return settings; -} // applyProxySettings +} // getAndValidateProxySettings + + +function isProxyConfigured() +{ + return (getWizard()) ? getYesNoRadioValue(kWizardProxyRadioGroup) + : getElemValue(kUseProxyCheckbox, false); +} function reportValidationError(aStrKey) @@ -1101,15 +1095,17 @@ function reportValidationError(aStrKey) // Returns true if settings were successfully applied. function applyFirewallSettings() { - var settings = getAndValidateFirewallSettings(); + var settings = (getWizard()) ? getAutoFirewallSettings() + : getAndValidateFirewallSettings(); if (!settings) return false; - return this.setConfAndReportErrors(settings, "firewallYES"); + return setConfAndReportErrors(settings, null); } // Return a settings object if successful and null if not. +// Not used for the wizard. function getAndValidateFirewallSettings() { // TODO: validate user-entered data. See Vidalia's NetworkPage::save() @@ -1117,14 +1113,47 @@ function getAndValidateFirewallSettings() var settings = {}; settings[kTorConfKeyReachableAddresses] = null; - var useFirewallPorts = (getWizard()) - ? getYesNoRadioValue(kWizardFirewallRadioGroup) - : getElemValue(kUseFirewallPortsCheckbox, false); - var allowedPorts = getElemValue(kFirewallAllowedPorts, null); - if (useFirewallPorts && allowedPorts) + var allowedPorts = null; + if (getElemValue(kUseFirewallPortsCheckbox, false)) + allowedPorts = getElemValue(kFirewallAllowedPorts, null); + + return constructFirewallSettings(allowedPorts); +} + + +// Return a settings object if successful and null if not. +// Only used for the wizard. +function getAutoFirewallSettings() +{ + // In the wizard, we automatically set firewall ports (ReachableAddresses) to + // 80 and 443 if and only if the user has configured a proxy but no bridges. + // Rationale (from ticket #11405): + // - Many proxies restrict which ports they will proxy for, so we want to + // use a small set of ports in that case. + // + // - In most other situations, tor will quickly find a bridge or guard on + // port 443, so there is no need to limit which port may be used. + // + // - People whose set of reachable ports are really esoteric will need to + // be very patient or they will need to edit torrc manually... but that + // is OK since we expect that situation to be very rare. + var allowedPorts = null; + if (isProxyConfigured() && !isBridgeConfigured()) + allowedPorts = "80,443"; + + return constructFirewallSettings(allowedPorts); +} + + +function constructFirewallSettings(aAllowedPorts) +{ + var settings = {}; + settings[kTorConfKeyReachableAddresses] = null; + + if (aAllowedPorts) { var portsConfStr; - var portsArray = allowedPorts.split(','); + var portsArray = aAllowedPorts.split(','); for (var i = 0; i < portsArray.length; ++i) { var s = portsArray[i].trim(); @@ -1188,7 +1217,7 @@ function applyBridgeSettings() if (!settings) return false; - return this.setConfAndReportErrors(settings, "bridgeSettings"); + return setConfAndReportErrors(settings, "bridgeSettings"); } @@ -1199,9 +1228,7 @@ function getAndValidateBridgeSettings() settings[kTorConfKeyUseBridges] = null; settings[kTorConfKeyBridgeList] = null; - var useBridges = (getWizard()) ? getElemValue("bridgesRadioYes", false) - : getElemValue(kUseBridgesCheckbox, false); - + var useBridges = isBridgeConfigured(); var defaultBridgeType; var bridgeList; if (useBridges) @@ -1246,6 +1273,13 @@ function getAndValidateBridgeSettings() } +function isBridgeConfigured() +{ + return (getWizard()) ? getElemValue("bridgesRadioYes", false) + : getElemValue(kUseBridgesCheckbox, false); +} + + // Returns an array or null. function parseAndValidateBridges(aStr) { @@ -1271,6 +1305,7 @@ function parseAndValidateBridges(aStr) // Returns true if successful. +// aShowOnErrorPanelID is only used when displaying the wizard. function setConfAndReportErrors(aSettingsObj, aShowOnErrorPanelID) { var errObj = {}; diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index aa54f3e..3661088 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> +<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">

1 0

[tor-browser-bundle/master] Bug 12920: Don't apply patch for #11200 to master.
by gk＠torproject.org 25 Aug '14

25 Aug '14

commit 8a552ff03c226c3d1f5fa3ae0b4950cc03c0f678 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 25 15:28:14 2014 +0000 Bug 12920: Don't apply patch for #11200 to master. On the tor master branch #11200 is already fixed. Applying the patch again breaks the nightly builds. --- gitian/descriptors/linux/gitian-tor.yml | 5 ++++- gitian/descriptors/mac/gitian-tor.yml | 5 ++++- gitian/descriptors/windows/gitian-tor.yml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index c741cf2..277a8e4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -81,9 +81,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index e708ef8..7a75287 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -78,9 +78,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index f1b9d7d..bc70839 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -78,9 +78,12 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch - else + elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; + then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch + else + git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bumping OpenSSL without its hash does not fly.
by gk＠torproject.org 22 Aug '14

22 Aug '14

commit b7d6214618b62f59bc943b6c62e4b65d84e31342 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 22 20:34:09 2014 +0000 Bumping OpenSSL without its hash does not fly. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c65cf22..f2ef57c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -72,7 +72,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-launcher/master] Bug 12895: add @riseup.net to Bridge Relay Help
by brade＠torproject.org 22 Aug '14

22 Aug '14

commit c1a09372770adb8a3f7085f69eca2fecae7c1107 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 22 10:33:02 2014 -0400 Bug 12895: add @riseup.net to Bridge Relay Help --- src/chrome/content/network-settings-overlay.xul | 3 ++- src/chrome/locale/en/network-settings.dtd | 3 ++- src/chrome/skin/network-settings.css | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index c9a6a82..03171ec 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -116,7 +116,8 @@ </html:li> <html:li> <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> - <html:div>&torsettings.bridgeHelp3;</html:div> + <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> + <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> <html:li> <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index f46473e..aa54f3e 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -59,6 +59,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 60f1ef2..e4142d4 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -17,15 +17,15 @@ dialog.os-windows { } wizard { - width: 43em; - height: 34em; + width: 45em; + height: 35em; font: -moz-dialog; padding-top: 0px; } wizard.os-windows { - width: 45em; - height: 39em; + width: 46em; + height: 41em; } .wizard-page-box {

1 0