- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 52fc03cd74b5f99269698c57a2cc8a5117deaf4c Author: Jonathan Kew <jkew(a)mozilla.com> Date: Sat Feb 1 09:24:58 2014 +0000 Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk --- gfx/cairo/cairo/src/cairo-dwrite-font.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp index bc97e11..f234421 100644 --- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp +++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp @@ -1052,10 +1052,12 @@ _cairo_dwrite_load_truetype_table(void *scaled_font, return CAIRO_INT_STATUS_UNSUPPORTED; } - *length = size; - if (buffer) { - memcpy(buffer, data, size); + if (buffer && *length && (UINT32)offset < size) { + size = MIN(size - (UINT32)offset, *length); + memcpy(buffer, (const char*)data + offset, size); } + *length = size; + if (tableContext) { face->dwriteface->ReleaseFontTable(tableContext); }

1 0

[tor-browser/esr24] Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 37f96f3d265b9ecb54e86014e57a48f07f202e40 Author: Benoit Jacob <bjacob(a)mozilla.com> Date: Thu Jan 23 17:34:04 2014 -0500 Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru --- layout/mathml/nsMathMLmencloseFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp index 8897585..bb7899e 100644 --- a/layout/mathml/nsMathMLmencloseFrame.cpp +++ b/layout/mathml/nsMathMLmencloseFrame.cpp @@ -804,7 +804,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder, rect.TopRight() + gfxPoint(std::min(e / 2.0, -w + .4*h), h + .4*w), rect.TopRight() }; - gfxCtx->Polygon(p, sizeof(p)); + gfxCtx->Polygon(p, MOZ_ARRAY_LENGTH(p)); gfxCtx->Fill(); } break;

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-centos6-hp-017 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0ce2b0bbace71ad353808dd25e6f7804e4b5af72 Author: ffxbld <none@none> Date: Sat Feb 8 03:09:41 2014 -0800 No bug, Automated blocklist update from host bld-centos6-hp-017 - a=blocklist-update --- browser/app/blocklist.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 7f06413..361ea15 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1391123284000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1391730565000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -538,6 +538,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i550" id="colmer(a)yopmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> <versionRange minVersion="1.2" maxVersion="1.2"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">

1 0

[tor-browser/esr24] Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0109abd08387a67efbda9a4d02c44f1c177efb8c Author: Ralph Giles <giles(a)mozilla.com> Date: Fri Jan 31 13:50:45 2014 -0800 Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru We were assuming 8-bit WAVE files were mono-only, but this is not necessarily the case. --- content/media/wave/WaveReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/media/wave/WaveReader.cpp b/content/media/wave/WaveReader.cpp index 28aec46..ce71ea6 100644 --- a/content/media/wave/WaveReader.cpp +++ b/content/media/wave/WaveReader.cpp @@ -424,7 +424,7 @@ WaveReader::LoadFormatChunk(uint32_t aChunkSize) // Make sure metadata is fairly sane. The rate check is fairly arbitrary, // but the channels check is intentionally limited to mono or stereo // because that's what the audio backend currently supports. - unsigned int actualFrameSize = sampleFormat == 8 ? 1 : 2 * channels; + unsigned int actualFrameSize = (sampleFormat == 8 ? 1 : 2) * channels; if (rate < 100 || rate > 96000 || channels < 1 || channels > MAX_CHANNELS || (frameSize != 1 && frameSize != 2 && frameSize != 4) ||

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Backport two integer overflow patches.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b19c32010424180d9e524503c90eb05344d39bd0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 18:30:06 2014 -0700 fixup! Backport two integer overflow patches. These are in the mozilla namespace. --- image/src/imgFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index 33d1b3a..0e2ef3f 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -55,7 +55,7 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + mozilla::CheckedInt32 requiredBytes = mozilla::CheckedInt32(aWidth) * mozilla::CheckedInt32(aHeight) * 4; if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false;

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Backport two integer overflow patches.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit b1f011d993b4a00db2cb50c49dea38ec5188fdb0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 16:04:57 2014 -0700 Backport two integer overflow patches. https://hg.mozilla.org/mozilla-central/rev/14ad832ecbcd https://hg.mozilla.org/mozilla-central/rev/c00387255d25 https://bugzilla.mozilla.org/show_bug.cgi?id=922603 https://bugzilla.mozilla.org/show_bug.cgi?id=811122 --- image/src/imgFrame.cpp | 10 +++------- js/src/vm/Interpreter-inl.h | 8 ++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index c1b4022..33d1b3a 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -19,6 +19,7 @@ static bool gDisableOptimize = false; #include "cairo.h" #include "GeckoProfiler.h" #include "mozilla/Likely.h" +#include "mozilla/CheckedInt.h" #if defined(XP_WIN) @@ -54,13 +55,8 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - int32_t tmp = aWidth * aHeight; - if (MOZ_UNLIKELY(tmp / aHeight != aWidth)) { - NS_WARNING("width or height too large"); - return false; - } - tmp = tmp * 4; - if (MOZ_UNLIKELY(tmp / 4 != aWidth * aHeight)) { + CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false; } diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h index b5818e4..0a665d1 100644 --- a/js/src/vm/Interpreter-inl.h +++ b/js/src/vm/Interpreter-inl.h @@ -368,13 +368,9 @@ AddOperation(JSContext *cx, HandleScript script, jsbytecode *pc, { if (lhs.isInt32() && rhs.isInt32()) { int32_t l = lhs.toInt32(), r = rhs.toInt32(); - int32_t sum = l + r; - if (JS_UNLIKELY(bool((l ^ sum) & (r ^ sum) & 0x80000000))) { - res->setDouble(double(l) + double(r)); + double d = double(l) + double(r); + if (!res->setNumber(d)) types::TypeScript::MonitorOverflow(cx, script, pc); - } else { - res->setInt32(sum); - } return true; }

1 0

[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] Use the *4.x-2 branch for the updater related code.
by gk＠torproject.org 28 Aug '14

28 Aug '14

commit 248c2e7bcff5d9f7df95fb1fa7a53bce88f49938 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 28 10:37:30 2014 +0000 Use the *4.x-2 branch for the updater related code. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7025d37..38f7863 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

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